diff --git a/BUILD.bazel b/BUILD.bazel index 35d49133d..c0c56f631 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -76,7 +76,6 @@ filegroup( "//pkg/client/listers/certmanager/v1:all-srcs", "//pkg/controller:all-srcs", "//pkg/ctl:all-srcs", - "//pkg/feature:all-srcs", "//pkg/issuer:all-srcs", "//pkg/logs:all-srcs", "//pkg/metrics:all-srcs", diff --git a/cmd/controller/app/BUILD.bazel b/cmd/controller/app/BUILD.bazel index d376127a1..b07b81805 100644 --- a/cmd/controller/app/BUILD.bazel +++ b/cmd/controller/app/BUILD.bazel @@ -11,6 +11,7 @@ go_library( deps = [ "//cmd/controller/app/options:go_default_library", "//cmd/util:go_default_library", + "//internal/controller/feature:go_default_library", "//pkg/acme/accounts:go_default_library", "//pkg/client/clientset/versioned:go_default_library", "//pkg/client/clientset/versioned/scheme:go_default_library", @@ -23,7 +24,6 @@ go_library( "//pkg/controller/certificates/trigger:go_default_library", "//pkg/controller/clusterissuers:go_default_library", "//pkg/controller/issuers:go_default_library", - "//pkg/feature:go_default_library", "//pkg/issuer/acme:go_default_library", "//pkg/issuer/acme/dns/util:go_default_library", "//pkg/issuer/ca:go_default_library", diff --git a/cmd/controller/app/controller.go b/cmd/controller/app/controller.go index d795a6132..39be1e69b 100644 --- a/cmd/controller/app/controller.go +++ b/cmd/controller/app/controller.go @@ -47,13 +47,13 @@ import ( "github.com/jetstack/cert-manager/cmd/controller/app/options" cmdutil "github.com/jetstack/cert-manager/cmd/util" + "github.com/jetstack/cert-manager/internal/controller/feature" "github.com/jetstack/cert-manager/pkg/acme/accounts" clientset "github.com/jetstack/cert-manager/pkg/client/clientset/versioned" intscheme "github.com/jetstack/cert-manager/pkg/client/clientset/versioned/scheme" informers "github.com/jetstack/cert-manager/pkg/client/informers/externalversions" "github.com/jetstack/cert-manager/pkg/controller" "github.com/jetstack/cert-manager/pkg/controller/clusterissuers" - "github.com/jetstack/cert-manager/pkg/feature" dnsutil "github.com/jetstack/cert-manager/pkg/issuer/acme/dns/util" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/metrics" diff --git a/cmd/controller/app/options/BUILD.bazel b/cmd/controller/app/options/BUILD.bazel index a43d9a798..62528906b 100644 --- a/cmd/controller/app/options/BUILD.bazel +++ b/cmd/controller/app/options/BUILD.bazel @@ -7,6 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/util:go_default_library", + "//internal/controller/feature:go_default_library", "//pkg/apis/certmanager:go_default_library", "//pkg/controller/acmechallenges:go_default_library", "//pkg/controller/acmeorders:go_default_library", @@ -32,7 +33,6 @@ go_library( "//pkg/controller/certificatesigningrequests/venafi:go_default_library", "//pkg/controller/clusterissuers:go_default_library", "//pkg/controller/issuers:go_default_library", - "//pkg/feature:go_default_library", "//pkg/logs:go_default_library", "//pkg/util:go_default_library", "//pkg/util/feature:go_default_library", diff --git a/cmd/controller/app/options/options.go b/cmd/controller/app/options/options.go index e233c6413..c4e793823 100644 --- a/cmd/controller/app/options/options.go +++ b/cmd/controller/app/options/options.go @@ -26,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" cmdutil "github.com/jetstack/cert-manager/cmd/util" + "github.com/jetstack/cert-manager/internal/controller/feature" cm "github.com/jetstack/cert-manager/pkg/apis/certmanager" challengescontroller "github.com/jetstack/cert-manager/pkg/controller/acmechallenges" orderscontroller "github.com/jetstack/cert-manager/pkg/controller/acmeorders" @@ -51,7 +52,6 @@ import ( csrvenaficontroller "github.com/jetstack/cert-manager/pkg/controller/certificatesigningrequests/venafi" clusterissuerscontroller "github.com/jetstack/cert-manager/pkg/controller/clusterissuers" issuerscontroller "github.com/jetstack/cert-manager/pkg/controller/issuers" - "github.com/jetstack/cert-manager/pkg/feature" logf "github.com/jetstack/cert-manager/pkg/logs" "github.com/jetstack/cert-manager/pkg/util" utilfeature "github.com/jetstack/cert-manager/pkg/util/feature" diff --git a/internal/BUILD.bazel b/internal/BUILD.bazel index 76f2f0861..cbb19b1f6 100644 --- a/internal/BUILD.bazel +++ b/internal/BUILD.bazel @@ -15,6 +15,7 @@ filegroup( "//internal/apis/certmanager:all-srcs", "//internal/apis/config/webhook:all-srcs", "//internal/apis/meta:all-srcs", + "//internal/controller/feature:all-srcs", "//internal/ingress:all-srcs", "//internal/test/paths:all-srcs", "//internal/vault:all-srcs", diff --git a/pkg/feature/BUILD.bazel b/internal/controller/feature/BUILD.bazel similarity index 88% rename from pkg/feature/BUILD.bazel rename to internal/controller/feature/BUILD.bazel index 4528c3fb2..90d0d78a7 100644 --- a/pkg/feature/BUILD.bazel +++ b/internal/controller/feature/BUILD.bazel @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["features.go"], - importpath = "github.com/jetstack/cert-manager/pkg/feature", + importpath = "github.com/jetstack/cert-manager/internal/controller/feature", visibility = ["//visibility:public"], deps = [ "//pkg/util/feature:go_default_library", diff --git a/pkg/feature/features.go b/internal/controller/feature/features.go similarity index 100% rename from pkg/feature/features.go rename to internal/controller/feature/features.go diff --git a/pkg/controller/acmechallenges/BUILD.bazel b/pkg/controller/acmechallenges/BUILD.bazel index 0b2741bc1..5ca85902d 100644 --- a/pkg/controller/acmechallenges/BUILD.bazel +++ b/pkg/controller/acmechallenges/BUILD.bazel @@ -10,6 +10,7 @@ go_library( importpath = "github.com/jetstack/cert-manager/pkg/controller/acmechallenges", visibility = ["//visibility:public"], deps = [ + "//internal/controller/feature:go_default_library", "//internal/ingress:go_default_library", "//pkg/acme:go_default_library", "//pkg/acme/accounts:go_default_library", @@ -21,7 +22,6 @@ go_library( "//pkg/client/listers/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/acmechallenges/scheduler:go_default_library", - "//pkg/feature:go_default_library", "//pkg/issuer:go_default_library", "//pkg/issuer/acme/dns:go_default_library", "//pkg/issuer/acme/dns/util:go_default_library", diff --git a/pkg/controller/acmechallenges/sync.go b/pkg/controller/acmechallenges/sync.go index ce6efabd9..b321fa402 100644 --- a/pkg/controller/acmechallenges/sync.go +++ b/pkg/controller/acmechallenges/sync.go @@ -27,12 +27,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilerrors "k8s.io/apimachinery/pkg/util/errors" + "github.com/jetstack/cert-manager/internal/controller/feature" "github.com/jetstack/cert-manager/pkg/acme" acmecl "github.com/jetstack/cert-manager/pkg/acme/client" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" - "github.com/jetstack/cert-manager/pkg/feature" dnsutil "github.com/jetstack/cert-manager/pkg/issuer/acme/dns/util" logf "github.com/jetstack/cert-manager/pkg/logs" utilfeature "github.com/jetstack/cert-manager/pkg/util/feature" diff --git a/test/e2e/suite/conformance/certificatesigningrequests/BUILD.bazel b/test/e2e/suite/conformance/certificatesigningrequests/BUILD.bazel index 2e79d68c1..01ddcab62 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/BUILD.bazel +++ b/test/e2e/suite/conformance/certificatesigningrequests/BUILD.bazel @@ -9,8 +9,8 @@ go_library( importpath = "github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificatesigningrequests", visibility = ["//visibility:public"], deps = [ + "//internal/controller/feature:go_default_library", "//pkg/apis/experimental/v1alpha1:go_default_library", - "//pkg/feature:go_default_library", "//pkg/util:go_default_library", "//pkg/util/feature:go_default_library", "//test/e2e/framework:go_default_library", diff --git a/test/e2e/suite/conformance/certificatesigningrequests/suite.go b/test/e2e/suite/conformance/certificatesigningrequests/suite.go index da3acae3c..cd2ecdc7b 100644 --- a/test/e2e/suite/conformance/certificatesigningrequests/suite.go +++ b/test/e2e/suite/conformance/certificatesigningrequests/suite.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo" certificatesv1 "k8s.io/api/certificates/v1" - "github.com/jetstack/cert-manager/pkg/feature" + "github.com/jetstack/cert-manager/internal/controller/feature" utilfeature "github.com/jetstack/cert-manager/pkg/util/feature" "github.com/jetstack/cert-manager/test/e2e/framework" "github.com/jetstack/cert-manager/test/e2e/framework/helper/featureset"