Skip to content

Commit 076ecb4

Browse files
authored
Merge pull request cert-manager#1579 from munnerz/apireg-v1beta1
Use v1beta1 API version in cainjector controller
2 parents 6a39a86 + 8cad3bf commit 076ecb4

File tree

16 files changed

+337
-336
lines changed

16 files changed

+337
-336
lines changed

pkg/api/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ go_library(
1313
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
1414
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
1515
"//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
16-
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library",
16+
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
1717
],
1818
)
1919

pkg/api/scheme.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/runtime/serializer"
2424
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2525
kscheme "k8s.io/client-go/kubernetes/scheme"
26-
apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
26+
apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
2727

2828
certmanagerv1alpha1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha1"
2929
)
@@ -34,7 +34,7 @@ var ParameterCodec = runtime.NewParameterCodec(Scheme)
3434
var localSchemeBuilder = runtime.SchemeBuilder{
3535
certmanagerv1alpha1.AddToScheme,
3636
kscheme.AddToScheme,
37-
apiregv1.AddToScheme,
37+
apireg.AddToScheme,
3838
}
3939

4040
// AddToScheme adds all types of this clientset into the given scheme. This allows composition

pkg/controller/cainjector/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ go_library(
2222
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2323
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
2424
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
25-
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1:go_default_library",
25+
"//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
2626
"//vendor/sigs.k8s.io/controller-runtime:go_default_library",
2727
"//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
2828
"//vendor/sigs.k8s.io/controller-runtime/pkg/handler:go_default_library",

pkg/controller/cainjector/injectors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cainjector
1919
import (
2020
admissionreg "k8s.io/api/admissionregistration/v1beta1"
2121
"k8s.io/apimachinery/pkg/runtime"
22-
apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
22+
apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
2323
)
2424

2525
// this contains implementations of CertInjector (and dependents)

pkg/controller/cainjector/setup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
admissionreg "k8s.io/api/admissionregistration/v1beta1"
2323
corev1 "k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/runtime"
25-
apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
25+
apireg "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
2626
ctrl "sigs.k8s.io/controller-runtime"
2727
"sigs.k8s.io/controller-runtime/pkg/handler"
2828
"sigs.k8s.io/controller-runtime/pkg/source"

vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/zz_generated.conversion.go

Lines changed: 0 additions & 255 deletions
This file was deleted.

vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/BUILD.bazel renamed to vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/doc.go renamed to vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/doc.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)