replace go.mod replace statements with require statements

Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
This commit is contained in:
Tim Ramlot 2023-05-12 14:38:32 +02:00
parent 2ba39e9ebc
commit d14ffca049
No known key found for this signature in database
GPG Key ID: 47428728E0C2878D
5 changed files with 7 additions and 23 deletions

View File

@ -4,9 +4,6 @@ go 1.20
replace github.com/cert-manager/cert-manager => ../../
// remove this once controller-runtime v0.15.0 is released
replace sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
require (
github.com/cert-manager/cert-manager v0.0.0-00010101000000-000000000000
github.com/go-logr/logr v1.2.4
@ -17,7 +14,7 @@ require (
k8s.io/apimachinery v0.27.1
k8s.io/client-go v0.27.1
k8s.io/component-base v0.27.1
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
)
require (

View File

@ -2,9 +2,6 @@ module github.com/cert-manager/cert-manager/cmd/ctl
go 1.20
// remove this once controller-runtime v0.15.0 is released
replace sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
// Note on cert-manager versioning:
// Because cmctl and the core cert-manager module live in the same repository, but cmctl depends on a specific
// cert-manager version (rather than using replace statements or a go.work file), there's a need to be able
@ -29,7 +26,7 @@ require (
k8s.io/klog/v2 v2.90.1
k8s.io/kubectl v0.27.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
sigs.k8s.io/yaml v1.3.0
)

10
go.mod
View File

@ -6,12 +6,8 @@ go 1.20
// please place any replace statements here at the top for visibility and add a
// comment to it as to when it can be removed
replace (
// remove this once https://github.com/jetstack/vcert/pull/3 is merged upstream
github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230127103832-3aa3dfd6613d
// remove this once controller-runtime v0.15.0 is released
sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
)
// remove this once https://github.com/jetstack/vcert/pull/3 is merged upstream
replace github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230127103832-3aa3dfd6613d
require (
github.com/Azure/azure-sdk-for-go v67.3.0+incompatible
@ -55,7 +51,7 @@ require (
k8s.io/kube-aggregator v0.27.1
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
sigs.k8s.io/controller-tools v0.12.0
sigs.k8s.io/gateway-api v0.6.2
sigs.k8s.io/structured-merge-diff/v4 v4.2.3

View File

@ -2,9 +2,6 @@ module github.com/cert-manager/cert-manager/e2e-tests
go 1.20
// remove this once controller-runtime v0.15.0 is released
replace sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
require (
github.com/cert-manager/cert-manager v0.0.0-00010101000000-000000000000
github.com/cloudflare/cloudflare-go v0.58.1
@ -16,7 +13,7 @@ require (
k8s.io/client-go v0.27.1
k8s.io/kube-aggregator v0.27.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
sigs.k8s.io/gateway-api v0.6.2
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
)

View File

@ -8,9 +8,6 @@ replace github.com/cert-manager/cert-manager/cmd/ctl => ../../cmd/ctl/
replace github.com/cert-manager/cert-manager/webhook-binary => ../../cmd/webhook/
// remove this once controller-runtime v0.15.0 is released
replace sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
require (
github.com/cert-manager/cert-manager v1.12.0-beta.1.0.20230510114354-4959b1ce1a71
github.com/cert-manager/cert-manager/cmd/ctl v0.0.0-00010101000000-000000000000
@ -30,7 +27,7 @@ require (
k8s.io/component-base v0.27.1
k8s.io/kubectl v0.27.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/controller-runtime v0.15.0-alpha.0.0.20230511044310-c2e3d6d6350e
)
require (