chore(k8s): k8s deprecated api migration

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -1,17 +1,3 @@
-{{/*
-Set apiVersion based on .Capabilities.APIVersions
-*/}}
-{{- define "rbacAPIVersion" -}}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" -}}
-rbac.authorization.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" -}}
-rbac.authorization.k8s.io/v1alpha1
-{{- else -}}
-rbac.authorization.k8s.io/v1
-{{- end -}}
-{{- end -}}
-
-
 {{/* Generate controller deployment envs */}}
 {{- define "controller.envs" -}}
 {{ $redisNodeCount := .Values.redis.replicas | int }}

charts/controller/templates/controller-clusterrole.yaml

@@ -1,7 +1,6 @@
 {{- if (.Values.global.use_rbac) -}}
-{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
 kind: ClusterRole
-apiVersion: {{ template "rbacAPIVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: drycc:drycc-controller
   labels:
@@ -75,4 +74,3 @@ rules:
   resources: ["servicebindings"]
   verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
 {{- end -}}
-{{- end -}}

charts/controller/templates/controller-clusterrolebinding.yaml

@@ -1,7 +1,6 @@
 {{- if (.Values.global.use_rbac) -}}
-{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
 kind: ClusterRoleBinding
-apiVersion: {{ template "rbacAPIVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: drycc:drycc-controller
   labels:
@@ -16,4 +15,3 @@ subjects:
   name: drycc-controller
   namespace: {{ .Release.Namespace }}
 {{- end -}}
-{{- end -}}

charts/controller/templates/controller-cronjob-daily.yaml

@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: drycc-controller-cronjob-daily

charts/controller/templates/controller-cronjob-hourly.yaml

@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: drycc-controller-cronjob-daily

charts/controller/templates/controller-ingress.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: "controller-api-server"

rootfs/scheduler/resources/ingress.py

@@ -92,7 +92,7 @@ def manifest(self, api_version, ingress, ingress_class, namespace, **kwargs):
 
 class Ingress(Resource):
 
-    api_version = 'networking.k8s.io/v1beta1'
+    api_version = 'networking.k8s.io/v1'
     api_prefix = 'apis'
     short_name = 'ingress'
 

rootfs/scheduler/tests/test_ingress.py

@@ -36,7 +36,7 @@ def test_get_ingress(self):
         data = response.json()
 
         self.assertEqual(response.status_code, 200, data)
-        self.assertEqual(data['apiVersion'], 'networking.k8s.io/v1beta1')
+        self.assertEqual(data['apiVersion'], 'networking.k8s.io/v1')
         self.assertEqual(data['kind'], 'Ingress')
 
     def test_delete_failure(self):