From c5e2184a4a11a26561dda83595a10775fce24aff Mon Sep 17 00:00:00 2001 From: joshvanl Date: Thu, 29 Apr 2021 11:49:29 +0100 Subject: [PATCH] Moves /pkg/internal/apis/istio to /pkg/internal/istio Signed-off-by: joshvanl --- pkg/controller/acmechallenges/BUILD.bazel | 2 +- pkg/controller/acmechallenges/controller.go | 2 +- pkg/internal/BUILD.bazel | 2 +- pkg/internal/{apis => }/istio/BUILD.bazel | 4 ++-- pkg/internal/{apis => }/istio/istio.go | 0 pkg/internal/{apis => }/istio/istio_deepcopy.gen.go | 0 pkg/issuer/acme/http/BUILD.bazel | 3 ++- pkg/issuer/acme/http/http.go | 2 +- pkg/issuer/acme/http/istio.go | 2 +- pkg/issuer/acme/http/istio_test.go | 2 +- pkg/util/istio/BUILD.bazel | 2 +- pkg/util/istio/istio.go | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) rename pkg/internal/{apis => }/istio/BUILD.bazel (94%) rename pkg/internal/{apis => }/istio/istio.go (100%) rename pkg/internal/{apis => }/istio/istio_deepcopy.gen.go (100%) diff --git a/pkg/controller/acmechallenges/BUILD.bazel b/pkg/controller/acmechallenges/BUILD.bazel index 3bd970ab0..cf0236df1 100644 --- a/pkg/controller/acmechallenges/BUILD.bazel +++ b/pkg/controller/acmechallenges/BUILD.bazel @@ -21,7 +21,7 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/acmechallenges/scheduler:go_default_library", "//pkg/feature:go_default_library", - "//pkg/internal/apis/istio:go_default_library", + "//pkg/internal/istio: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/controller.go b/pkg/controller/acmechallenges/controller.go index d959a7495..29932c61c 100644 --- a/pkg/controller/acmechallenges/controller.go +++ b/pkg/controller/acmechallenges/controller.go @@ -35,7 +35,7 @@ import ( cmlisters "github.com/jetstack/cert-manager/pkg/client/listers/certmanager/v1" controllerpkg "github.com/jetstack/cert-manager/pkg/controller" "github.com/jetstack/cert-manager/pkg/controller/acmechallenges/scheduler" - "github.com/jetstack/cert-manager/pkg/internal/apis/istio" + "github.com/jetstack/cert-manager/pkg/internal/istio" "github.com/jetstack/cert-manager/pkg/issuer" "github.com/jetstack/cert-manager/pkg/issuer/acme/dns" "github.com/jetstack/cert-manager/pkg/issuer/acme/http" diff --git a/pkg/internal/BUILD.bazel b/pkg/internal/BUILD.bazel index d59c0df8f..d9a3e06ac 100644 --- a/pkg/internal/BUILD.bazel +++ b/pkg/internal/BUILD.bazel @@ -13,8 +13,8 @@ filegroup( "//pkg/internal/api/validation:all-srcs", "//pkg/internal/apis/acme:all-srcs", "//pkg/internal/apis/certmanager:all-srcs", - "//pkg/internal/apis/istio:all-srcs", "//pkg/internal/apis/meta:all-srcs", + "//pkg/internal/istio:all-srcs", "//pkg/internal/vault:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/internal/apis/istio/BUILD.bazel b/pkg/internal/istio/BUILD.bazel similarity index 94% rename from pkg/internal/apis/istio/BUILD.bazel rename to pkg/internal/istio/BUILD.bazel index c740a0259..12b84b2f4 100644 --- a/pkg/internal/apis/istio/BUILD.bazel +++ b/pkg/internal/istio/BUILD.bazel @@ -6,8 +6,8 @@ go_library( "istio.go", "istio_deepcopy.gen.go", ], - importpath = "github.com/jetstack/cert-manager/pkg/internal/apis/istio", - visibility = ["//:__subpackages__"], + importpath = "github.com/jetstack/cert-manager/pkg/internal/istio", + visibility = ["//pkg:__subpackages__"], deps = [ "@io_istio_api//meta/v1alpha1:go_default_library", "@io_istio_api//networking/v1beta1:go_default_library", diff --git a/pkg/internal/apis/istio/istio.go b/pkg/internal/istio/istio.go similarity index 100% rename from pkg/internal/apis/istio/istio.go rename to pkg/internal/istio/istio.go diff --git a/pkg/internal/apis/istio/istio_deepcopy.gen.go b/pkg/internal/istio/istio_deepcopy.gen.go similarity index 100% rename from pkg/internal/apis/istio/istio_deepcopy.gen.go rename to pkg/internal/istio/istio_deepcopy.gen.go diff --git a/pkg/issuer/acme/http/BUILD.bazel b/pkg/issuer/acme/http/BUILD.bazel index fcbe2be7f..3d829d078 100644 --- a/pkg/issuer/acme/http/BUILD.bazel +++ b/pkg/issuer/acme/http/BUILD.bazel @@ -15,7 +15,7 @@ go_library( "//pkg/apis/acme/v1:go_default_library", "//pkg/apis/certmanager/v1:go_default_library", "//pkg/controller:go_default_library", - "//pkg/internal/apis/istio:go_default_library", + "//pkg/internal/istio:go_default_library", "//pkg/issuer/acme/http/solver:go_default_library", "//pkg/logs:go_default_library", "//pkg/util:go_default_library", @@ -49,6 +49,7 @@ go_test( deps = [ "//pkg/apis/acme/v1:go_default_library", "//pkg/controller/test:go_default_library", + "//pkg/internal/istio:go_default_library", "//test/unit/gen:go_default_library", "@io_k8s_api//core/v1:go_default_library", "@io_k8s_api//networking/v1beta1:go_default_library", diff --git a/pkg/issuer/acme/http/http.go b/pkg/issuer/acme/http/http.go index 933881711..3565db9db 100644 --- a/pkg/issuer/acme/http/http.go +++ b/pkg/issuer/acme/http/http.go @@ -39,7 +39,7 @@ import ( cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" v1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" "github.com/jetstack/cert-manager/pkg/controller" - "github.com/jetstack/cert-manager/pkg/internal/apis/istio" + "github.com/jetstack/cert-manager/pkg/internal/istio" "github.com/jetstack/cert-manager/pkg/issuer/acme/http/solver" logf "github.com/jetstack/cert-manager/pkg/logs" pkgutil "github.com/jetstack/cert-manager/pkg/util" diff --git a/pkg/issuer/acme/http/istio.go b/pkg/issuer/acme/http/istio.go index a2ae955b8..c551747ae 100644 --- a/pkg/issuer/acme/http/istio.go +++ b/pkg/issuer/acme/http/istio.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" - "github.com/jetstack/cert-manager/pkg/internal/apis/istio" + "github.com/jetstack/cert-manager/pkg/internal/istio" logf "github.com/jetstack/cert-manager/pkg/logs" ) diff --git a/pkg/issuer/acme/http/istio_test.go b/pkg/issuer/acme/http/istio_test.go index 276a2daac..43b262e9f 100644 --- a/pkg/issuer/acme/http/istio_test.go +++ b/pkg/issuer/acme/http/istio_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" cmacme "github.com/jetstack/cert-manager/pkg/apis/acme/v1" - "github.com/jetstack/cert-manager/pkg/internal/apis/istio" + "github.com/jetstack/cert-manager/pkg/internal/istio" ) func TestEnsureIstio(t *testing.T) { diff --git a/pkg/util/istio/BUILD.bazel b/pkg/util/istio/BUILD.bazel index dcfed9151..c8db9aa5b 100644 --- a/pkg/util/istio/BUILD.bazel +++ b/pkg/util/istio/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/controller:go_default_library", - "//pkg/internal/apis/istio:go_default_library", + "//pkg/internal/istio:go_default_library", "@io_k8s_apimachinery//pkg/api/errors:go_default_library", "@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library", ], diff --git a/pkg/util/istio/istio.go b/pkg/util/istio/istio.go index 0e8322e87..f03c08bca 100644 --- a/pkg/util/istio/istio.go +++ b/pkg/util/istio/istio.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/jetstack/cert-manager/pkg/controller" - "github.com/jetstack/cert-manager/pkg/internal/apis/istio" + "github.com/jetstack/cert-manager/pkg/internal/istio" ) func IsInstalled(ctx *controller.Context) (bool, error) {