diff --git a/cmd/webhook/app/webhook.go b/cmd/webhook/app/webhook.go index c216914ef..85149fa6c 100644 --- a/cmd/webhook/app/webhook.go +++ b/cmd/webhook/app/webhook.go @@ -33,7 +33,7 @@ import ( "github.com/cert-manager/cert-manager/pkg/util" utilfeature "github.com/cert-manager/cert-manager/pkg/util/feature" "github.com/cert-manager/cert-manager/pkg/webhook/configfile" - "github.com/cert-manager/cert-manager/webhook-binary/app/options" + "github.com/cert-manager/cert-manager/pkg/webhook/options" ) const componentWebhook = "webhook" diff --git a/cmd/webhook/app/webhook_test.go b/cmd/webhook/app/webhook_test.go index 5a76d4741..77cc4d809 100644 --- a/cmd/webhook/app/webhook_test.go +++ b/cmd/webhook/app/webhook_test.go @@ -19,7 +19,7 @@ package app import ( "testing" - "github.com/cert-manager/cert-manager/webhook-binary/app/options" + "github.com/cert-manager/cert-manager/pkg/webhook/options" ) // Test to ensure flags take precedence over config options. diff --git a/cmd/webhook/go.mod b/cmd/webhook/go.mod index 4e3b35595..fd9a8f2f4 100644 --- a/cmd/webhook/go.mod +++ b/cmd/webhook/go.mod @@ -6,12 +6,9 @@ replace github.com/cert-manager/cert-manager => ../../ require ( github.com/cert-manager/cert-manager v0.0.0-00010101000000-000000000000 - github.com/go-logr/logr v1.2.4 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 - k8s.io/apimachinery v0.27.1 k8s.io/component-base v0.27.1 - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 ) require ( @@ -25,6 +22,7 @@ require ( github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-ldap/ldap/v3 v3.4.4 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/zapr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect @@ -83,11 +81,13 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/api v0.27.1 // indirect k8s.io/apiextensions-apiserver v0.27.1 // indirect + k8s.io/apimachinery v0.27.1 // indirect k8s.io/apiserver v0.27.1 // indirect k8s.io/client-go v0.27.1 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/kube-aggregator v0.27.1 // indirect k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect sigs.k8s.io/gateway-api v0.6.2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/cmd/webhook/app/options/options.go b/pkg/webhook/options/options.go similarity index 100% rename from cmd/webhook/app/options/options.go rename to pkg/webhook/options/options.go diff --git a/test/integration/LICENSES b/test/integration/LICENSES index f356e19fb..25ad90f56 100644 --- a/test/integration/LICENSES +++ b/test/integration/LICENSES @@ -12,7 +12,6 @@ github.com/cenkalti/backoff/v4,https://github.com/cenkalti/backoff/blob/v4.2.1/L github.com/cert-manager/cert-manager,https://github.com/cert-manager/cert-manager/blob/HEAD/LICENSE,Apache-2.0 github.com/cert-manager/cert-manager/cmctl-binary,https://github.com/cert-manager/cert-manager/blob/HEAD/cmctl-binary/LICENSE,Apache-2.0 github.com/cert-manager/cert-manager/integration-tests,https://github.com/cert-manager/cert-manager/blob/HEAD/integration-tests/LICENSE,Apache-2.0 -github.com/cert-manager/cert-manager/webhook-binary/app,https://github.com/cert-manager/cert-manager/blob/HEAD/webhook-binary/LICENSE,Apache-2.0 github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.2.0/LICENSE.txt,MIT github.com/chai2010/gettext-go,https://github.com/chai2010/gettext-go/blob/v1.0.2/LICENSE,BSD-3-Clause github.com/containerd/containerd,https://github.com/containerd/containerd/blob/v1.7.0/LICENSE,Apache-2.0 diff --git a/test/integration/framework/apiserver.go b/test/integration/framework/apiserver.go index 494eb1508..3df2a0bd9 100644 --- a/test/integration/framework/apiserver.go +++ b/test/integration/framework/apiserver.go @@ -43,7 +43,7 @@ import ( "github.com/cert-manager/cert-manager/pkg/api" "github.com/cert-manager/cert-manager/pkg/webhook/handlers" "github.com/cert-manager/cert-manager/test/apiserver" - webhooktesting "github.com/cert-manager/cert-manager/webhook-binary/app/testing" + webhooktesting "github.com/cert-manager/cert-manager/test/webhook" ) type StopFunc func() diff --git a/test/integration/go.mod b/test/integration/go.mod index d2f4c578d..906e950c4 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -14,7 +14,6 @@ replace sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime require ( github.com/cert-manager/cert-manager v0.0.0-00010101000000-000000000000 github.com/cert-manager/cert-manager/cmctl-binary v0.0.0-00010101000000-000000000000 - github.com/cert-manager/cert-manager/webhook-binary v0.0.0-00010101000000-000000000000 github.com/go-logr/logr v1.2.4 github.com/miekg/dns v1.1.50 github.com/munnerz/crd-schema-fuzz v1.0.0 diff --git a/cmd/webhook/app/testing/testwebhook.go b/test/webhook/testwebhook.go similarity index 98% rename from cmd/webhook/app/testing/testwebhook.go rename to test/webhook/testwebhook.go index 2577211f9..32a3ee6ea 100644 --- a/cmd/webhook/app/testing/testwebhook.go +++ b/test/webhook/testwebhook.go @@ -38,8 +38,8 @@ import ( "github.com/cert-manager/cert-manager/internal/webhook" "github.com/cert-manager/cert-manager/pkg/util/pki" + "github.com/cert-manager/cert-manager/pkg/webhook/options" "github.com/cert-manager/cert-manager/pkg/webhook/server" - "github.com/cert-manager/cert-manager/webhook-binary/app/options" ) type StopFunc func()