Drop version tpl files

charts/gardener-extension-admission-cilium/charts/application/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-admission-cilium/charts/runtime/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "name" . }}

charts/gardener-extension-admission-cilium/templates/_helpers.tpl

@@ -21,7 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .repository .tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}

charts/gardener-extension-networking-cilium/templates/_helpers.tpl

@@ -21,11 +21,3 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- printf "%s:%s" .Values.image.repository .Values.image.tag }}
   {{- end }}
 {{- end }}
-
-{{- define "deploymentversion" -}}
-apps/v1
-{{- end -}}
-
-{{- define "poddisruptionbudgetversion" -}}
-policy/v1
-{{- end -}}

charts/gardener-extension-networking-cilium/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: gardener-extension-networking-cilium

charts/internal/cilium/charts/agent/templates/clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: cilium

charts/internal/cilium/charts/agent/templates/clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: cilium

charts/internal/cilium/charts/agent/templates/daemonset.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "daemonsetversion" . }}
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: cilium

charts/internal/cilium/charts/hubble-relay/templates/clusterrole.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-relay
@@ -20,7 +20,7 @@ rules:
       - list
       - watch
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-generate-certs

charts/internal/cilium/charts/hubble-relay/templates/clusterrolebinding.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-relay
@@ -14,7 +14,7 @@ subjects:
   name: hubble-relay
   namespace: {{ .Release.Namespace }}
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-generate-certs

charts/internal/cilium/charts/hubble-relay/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "deploymentversion" .}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Chart.Name }}

charts/internal/cilium/charts/hubble-ui/templates/clusterrole.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/hubble-ui/templates/deployment.yaml

@@ -1,5 +1,5 @@
 ---
-apiVersion: {{ include "deploymentversion" .}}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Chart.Name }}

charts/internal/cilium/charts/hubble-ui/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: {{ include "ingressversion" . }}
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: hubble-ui

charts/internal/cilium/charts/operator/templates/clusterrole.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: cilium-operator

charts/internal/cilium/charts/operator/templates/clusterrolebinding.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "rbacversion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: cilium-operator

charts/internal/cilium/charts/operator/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "deploymentversion" . }}
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cilium-operator

charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml

@@ -1,4 +1,4 @@
-apiVersion: {{ include "poddisruptionbudgetversion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: cilium-operator