Skip to content

Commit d72cf4c

Browse files
committed
HIVE-3132: Switch to Admission v1
v1beta1 has been deprecated, and the last k8s that didn't support v1 (1.16, I think) has been "out of support", for long enough that we should be safe to move fully to v1 now.
1 parent 8296ffc commit d72cf4c

31 files changed

Lines changed: 465 additions & 465 deletions

config/hiveadmission/clusterdeployment-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: clusterdeploymentvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/clusterimageset-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: clusterimagesetvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/clusterpool-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: clusterpoolvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/clusterprovision-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: clusterprovisionvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/dnszones-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
webhooks:
88
- name: dnszonevalidators.admission.hive.openshift.io
99
admissionReviewVersions:
10-
- v1beta1
10+
- v1
1111
clientConfig:
1212
service:
1313
# reach the webhook via the registered aggregated API

config/hiveadmission/machinepool-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: machinepoolvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/selectorsyncset-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: selectorsyncsetvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

config/hiveadmission/syncset-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
webhooks:
77
- name: syncsetvalidators.admission.hive.openshift.io
88
admissionReviewVersions:
9-
- v1beta1
9+
- v1
1010
clientConfig:
1111
service:
1212
# reach the webhook via the registered aggregated API

pkg/operator/assets/bindata.go

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

pkg/util/scheme/scheme.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
autoscalingv1beta1 "github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1beta1"
2626
"github.com/openshift/hive/apis"
2727
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
28-
admissionv1beta1 "k8s.io/api/admission/v1beta1"
28+
admissionv1 "k8s.io/api/admission/v1"
2929
rbacv1 "k8s.io/api/rbac/v1"
3030
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3131
crv1alpha1 "k8s.io/cluster-registry/pkg/apis/clusterregistry/v1alpha1"
@@ -43,7 +43,7 @@ var hive_scheme *runtime.Scheme
4343
func init() {
4444
hive_scheme = runtime.NewScheme()
4545
admissionregistrationv1.AddToScheme(hive_scheme)
46-
admissionv1beta1.AddToScheme(hive_scheme)
46+
admissionv1.AddToScheme(hive_scheme)
4747
apis.AddToScheme(hive_scheme)
4848
apiextv1.AddToScheme(hive_scheme)
4949
appsv1.AddToScheme(hive_scheme)

0 commit comments

Comments
 (0)