diff --git a/charts/gardener-extension-admission-cilium/charts/application/templates/_helpers.tpl b/charts/gardener-extension-admission-cilium/charts/application/templates/_helpers.tpl index ab354407f..ce24bf65d 100644 --- a/charts/gardener-extension-admission-cilium/charts/application/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/gardener-extension-admission-cilium/charts/runtime/templates/_helpers.tpl b/charts/gardener-extension-admission-cilium/charts/runtime/templates/_helpers.tpl index ab354407f..ce24bf65d 100644 --- a/charts/gardener-extension-admission-cilium/charts/runtime/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml b/charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml index 68308a630..7f4c3ee2f 100644 --- a/charts/gardener-extension-admission-cilium/charts/runtime/templates/poddisruptionbudget.yaml +++ b/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" . }} diff --git a/charts/gardener-extension-admission-cilium/templates/_helpers.tpl b/charts/gardener-extension-admission-cilium/templates/_helpers.tpl index ab354407f..ce24bf65d 100644 --- a/charts/gardener-extension-admission-cilium/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/gardener-extension-networking-cilium/templates/_helpers.tpl b/charts/gardener-extension-networking-cilium/templates/_helpers.tpl index 966c42415..bbdadd851 100644 --- a/charts/gardener-extension-networking-cilium/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/gardener-extension-networking-cilium/templates/poddisruptionbudget.yaml b/charts/gardener-extension-networking-cilium/templates/poddisruptionbudget.yaml index 4aaaf12b7..b59d48cde 100644 --- a/charts/gardener-extension-networking-cilium/templates/poddisruptionbudget.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/agent/templates/clusterrole.yaml b/charts/internal/cilium/charts/agent/templates/clusterrole.yaml index 5f5bdbdbb..b1d836a17 100644 --- a/charts/internal/cilium/charts/agent/templates/clusterrole.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/agent/templates/clusterrolebinding.yaml b/charts/internal/cilium/charts/agent/templates/clusterrolebinding.yaml index 25fdb41d5..fc899e74e 100644 --- a/charts/internal/cilium/charts/agent/templates/clusterrolebinding.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/agent/templates/daemonset.yaml b/charts/internal/cilium/charts/agent/templates/daemonset.yaml index 9d6f12b14..22d2bda41 100644 --- a/charts/internal/cilium/charts/agent/templates/daemonset.yaml +++ b/charts/internal/cilium/charts/agent/templates/daemonset.yaml @@ -1,4 +1,4 @@ -apiVersion: {{ include "daemonsetversion" . }} +apiVersion: apps/v1 kind: DaemonSet metadata: name: cilium diff --git a/charts/internal/cilium/charts/hubble-relay/templates/clusterrole.yaml b/charts/internal/cilium/charts/hubble-relay/templates/clusterrole.yaml index 59950c045..7841aa5c7 100644 --- a/charts/internal/cilium/charts/hubble-relay/templates/clusterrole.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/hubble-relay/templates/clusterrolebinding.yaml b/charts/internal/cilium/charts/hubble-relay/templates/clusterrolebinding.yaml index 9be99dc0b..2eae23c81 100644 --- a/charts/internal/cilium/charts/hubble-relay/templates/clusterrolebinding.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/hubble-relay/templates/deployment.yaml b/charts/internal/cilium/charts/hubble-relay/templates/deployment.yaml index 63a078c55..42e61247a 100644 --- a/charts/internal/cilium/charts/hubble-relay/templates/deployment.yaml +++ b/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 }} diff --git a/charts/internal/cilium/charts/hubble-ui/templates/clusterrole.yaml b/charts/internal/cilium/charts/hubble-ui/templates/clusterrole.yaml index 5770df69d..9a849697b 100644 --- a/charts/internal/cilium/charts/hubble-ui/templates/clusterrole.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml b/charts/internal/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml index 5ca7926b9..55eed09b5 100644 --- a/charts/internal/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/hubble-ui/templates/deployment.yaml b/charts/internal/cilium/charts/hubble-ui/templates/deployment.yaml index fa0b52fbc..80efce0ae 100644 --- a/charts/internal/cilium/charts/hubble-ui/templates/deployment.yaml +++ b/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 }} diff --git a/charts/internal/cilium/charts/hubble-ui/templates/ingress.yaml b/charts/internal/cilium/charts/hubble-ui/templates/ingress.yaml index 6a0bb1cd8..afe2fed99 100644 --- a/charts/internal/cilium/charts/hubble-ui/templates/ingress.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/operator/templates/clusterrole.yaml b/charts/internal/cilium/charts/operator/templates/clusterrole.yaml index ab0883c3c..8cd53e923 100644 --- a/charts/internal/cilium/charts/operator/templates/clusterrole.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/operator/templates/clusterrolebinding.yaml b/charts/internal/cilium/charts/operator/templates/clusterrolebinding.yaml index 9e1ed0dc7..986479b49 100644 --- a/charts/internal/cilium/charts/operator/templates/clusterrolebinding.yaml +++ b/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 diff --git a/charts/internal/cilium/charts/operator/templates/deployment.yaml b/charts/internal/cilium/charts/operator/templates/deployment.yaml index 000ac4e0e..4a29b3d95 100644 --- a/charts/internal/cilium/charts/operator/templates/deployment.yaml +++ b/charts/internal/cilium/charts/operator/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: {{ include "deploymentversion" . }} +apiVersion: apps/v1 kind: Deployment metadata: name: cilium-operator diff --git a/charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml b/charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml index df6678e44..15ae61630 100644 --- a/charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml +++ b/charts/internal/cilium/charts/operator/templates/poddisruptionbudget.yaml @@ -1,4 +1,4 @@ -apiVersion: {{ include "poddisruptionbudgetversion" . }} +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: cilium-operator diff --git a/charts/utils-templates/templates/_versions.tpl b/charts/utils-templates/templates/_versions.tpl deleted file mode 100644 index 7869a93d2..000000000 --- a/charts/utils-templates/templates/_versions.tpl +++ /dev/null @@ -1,75 +0,0 @@ -{{- define "kubeletcomponentconfigversion" -}} -kubelet.config.k8s.io/v1beta1 -{{- end -}} - -{{- define "schedulercomponentconfigversion" -}} -kubescheduler.config.k8s.io/v1alpha1 -{{- end -}} - -{{- define "proxycomponentconfigversion" -}} -kubeproxy.config.k8s.io/v1alpha1 -{{- end -}} - -{{- define "apiserverversion" -}} -apiserver.k8s.io/v1alpha1 -{{- end -}} - -{{- define "auditkubernetesversion" -}} -audit.k8s.io/v1 -{{- end -}} - -{{- define "rbacversion" -}} -rbac.authorization.k8s.io/v1 -{{- end -}} - -{{- define "deploymentversion" -}} -apps/v1 -{{- end -}} - -{{- define "daemonsetversion" -}} -apps/v1 -{{- end -}} - -{{- define "statefulsetversion" -}} -apps/v1 -{{- end -}} - -{{- define "apiserviceversion" -}} -apiregistration.k8s.io/v1 -{{- end -}} - -{{- define "networkpolicyversion" -}} -networking.k8s.io/v1 -{{- end -}} - -{{- define "cronjobversion" -}} -batch/v1 -{{- end -}} - -{{- define "hpaversion" -}} -autoscaling/v2beta1 -{{- end -}} - -{{- define "webhookadmissionregistration" -}} -admissionregistration.k8s.io/v1beta1 -{{- end -}} - -{{- define "poddisruptionbudgetversion" -}} -policy/v1 -{{- end -}} - -{{- define "podsecuritypolicyversion" -}} -policy/v1beta1 -{{- end -}} - -{{- define "ingressversion" -}} -networking.k8s.io/v1beta1 -{{- end -}} - -{{- define "storageclassversion" -}} -storage.k8s.io/v1 -{{- end -}} - -{{- define "servicemonitoringversion" -}} -monitoring.coreos.com/v1 -{{- end -}}