chore(k8s): k8s deprecated api migration

Author: duanhongyi

charts/monitor/templates/_helpers.tmpl

@@ -1,8 +1,7 @@
 {{- if (.Values.global.use_rbac) -}}
-{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
 # Define global role with the default system:aggregate-to-view cluster role and the two rules we just created
 kind: ClusterRole
-apiVersion: {{ template "rbacAPIVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: drycc:drycc-monitor
 aggregationRule:
@@ -13,4 +12,3 @@ aggregationRule:
         rbac.authorization.k8s.io/aggregate-to-view: "true"
 rules: [] # Rules are automatically filled in by the controller manager.
 {{- end -}}
-{{- end -}}

charts/monitor/templates/monitor-clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: "drycc-monitor-grafana"
@@ -17,14 +17,17 @@ spec:
   - host: drycc-monitor-grafana.{{ .Values.global.platform_domain }}
     http:
       paths:
-      {{- if eq .Values.global.ingress_class "gce" "alb" }}
-      - path: /*
-      {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
-      - path: /
-      {{- end }}
+      - pathType: Prefix
+        {{- if eq .Values.global.ingress_class "gce" "alb" }}
+        path: /*
+        {{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
+        path: /
+        {{- end }}
         backend:
-          serviceName: drycc-monitor-grafana
-          servicePort: 80
+          service:
+            name: drycc-monitor-grafana
+            port: 
+              number: 80
   {{ if .Values.global.cert_manager_enabled }}
   tls:
     - secretName: drycc-monitor-grafana-auto-tls

charts/monitor/templates/monitor-grafana-ingress.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-monitor-telegraf
   labels:
@@ -16,4 +15,3 @@ rules:
     resources: ["pods", "persistentvolumes", "nodes", "nodes/proxy", "nodes/stats"]
     verbs: ["get", "list", "watch"]
 {{- end -}}
-{{- end -}}

charts/monitor/templates/monitor-telegraf-clusterrole.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-monitor-telegraf
   labels:
@@ -16,5 +15,4 @@ subjects:
   name: drycc-monitor-telegraf
   namespace: {{ .Release.Namespace }}
 {{- end -}}
-{{- end -}}