Fix patch files

giantswarm · Mar 13, 2024 · 058726e · 058726e
1 parent 58a9f17
commit 058726e
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/config/kustomize/patches/common-labels.yaml b/config/kustomize/patches/common-labels.yaml
@@ -4,8 +4,8 @@ kind: LabelTransformer
 metadata:
   name: common-labels
 labels:
-  app.giantswarm.io/branch: "{{ .Values.project.branch }}"
-  app.giantswarm.io/commit: "{{ .Values.project.commit }}"
+  application.giantswarm.io/branch: "{{ .Values.project.branch }}"
+  application.giantswarm.io/commit: "{{ .Values.project.commit }}"
   app.kubernetes.io/managed-by: "{{ .Release.Service }}"
   app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
   helm.sh/chart: "{{ .Chart.Name }}"

diff --git a/helm/cluster-api-ipam-provider-in-cluster/files/globalinclusterippools.yaml b/helm/cluster-api-ipam-provider-in-cluster/files/globalinclusterippools.yaml
@@ -5,12 +5,12 @@ metadata:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
     controller-gen.kubebuilder.io/version: v0.7.0
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: globalinclusterippools.ipam.cluster.x-k8s.io

diff --git a/helm/cluster-api-ipam-provider-in-cluster/files/inclusterippools.yaml b/helm/cluster-api-ipam-provider-in-cluster/files/inclusterippools.yaml
@@ -5,12 +5,12 @@ metadata:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
     controller-gen.kubebuilder.io/version: v0.7.0
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: inclusterippools.ipam.cluster.x-k8s.io

diff --git a/...8s.io_v1_mutatingwebhookconfiguration_caip-in-cluster-mutating-webhook-configuration.yaml b/...8s.io_v1_mutatingwebhookconfiguration_caip-in-cluster-mutating-webhook-configuration.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-mutating-webhook-configuration

diff --git a/...o_v1_validatingwebhookconfiguration_caip-in-cluster-validating-webhook-configuration.yaml b/...o_v1_validatingwebhookconfiguration_caip-in-cluster-validating-webhook-configuration.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/caip-in-cluster-serving-cert'
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-validating-webhook-configuration

diff --git a/...-provider-in-cluster/templates/apps_v1_deployment_caip-in-cluster-controller-manager.yaml b/...-provider-in-cluster/templates/apps_v1_deployment_caip-in-cluster-controller-manager.yaml
@@ -3,12 +3,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     control-plane: controller-manager
     helm.sh/chart: '{{ .Chart.Name }}'

diff --git a/...der-in-cluster/templates/cert-manager.io_v1_certificate_caip-in-cluster-serving-cert.yaml b/...der-in-cluster/templates/cert-manager.io_v1_certificate_caip-in-cluster-serving-cert.yaml
@@ -3,12 +3,12 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-serving-cert

diff --git a/...ster/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-manager-role.yaml b/...ster/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-manager-role.yaml
@@ -4,12 +4,12 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-manager-role

diff --git a/...er/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-metrics-reader.yaml b/...er/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-metrics-reader.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-metrics-reader

diff --git a/...luster/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-proxy-role.yaml b/...luster/templates/rbac.authorization.k8s.io_v1_clusterrole_caip-in-cluster-proxy-role.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-proxy-role

diff --git a/.../rbac.authorization.k8s.io_v1_clusterrolebinding_caip-in-cluster-manager-rolebinding.yaml b/.../rbac.authorization.k8s.io_v1_clusterrolebinding_caip-in-cluster-manager-rolebinding.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-manager-rolebinding

diff --git a/...es/rbac.authorization.k8s.io_v1_clusterrolebinding_caip-in-cluster-proxy-rolebinding.yaml b/...es/rbac.authorization.k8s.io_v1_clusterrolebinding_caip-in-cluster-proxy-rolebinding.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-proxy-rolebinding

diff --git a/...ter/templates/rbac.authorization.k8s.io_v1_role_caip-in-cluster-leader-election-role.yaml b/...ter/templates/rbac.authorization.k8s.io_v1_role_caip-in-cluster-leader-election-role.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-leader-election-role

diff --git a/...rbac.authorization.k8s.io_v1_rolebinding_caip-in-cluster-leader-election-rolebinding.yaml b/...rbac.authorization.k8s.io_v1_rolebinding_caip-in-cluster-leader-election-rolebinding.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-leader-election-rolebinding

diff --git a/...r-api-ipam-provider-in-cluster/templates/v1_configmap_caip-in-cluster-manager-config.yaml b/...r-api-ipam-provider-in-cluster/templates/v1_configmap_caip-in-cluster-manager-config.yaml
@@ -16,12 +16,12 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-manager-config

diff --git a/...r-in-cluster/templates/v1_service_caip-in-cluster-controller-manager-metrics-service.yaml b/...r-in-cluster/templates/v1_service_caip-in-cluster-controller-manager-metrics-service.yaml
@@ -3,12 +3,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     control-plane: controller-manager
     helm.sh/chart: '{{ .Chart.Name }}'

diff --git a/...er-api-ipam-provider-in-cluster/templates/v1_service_caip-in-cluster-webhook-service.yaml b/...er-api-ipam-provider-in-cluster/templates/v1_service_caip-in-cluster-webhook-service.yaml
@@ -3,12 +3,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-webhook-service

diff --git a/...m-provider-in-cluster/templates/v1_serviceaccount_caip-in-cluster-controller-manager.yaml b/...m-provider-in-cluster/templates/v1_serviceaccount_caip-in-cluster-controller-manager.yaml
@@ -3,12 +3,12 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
-    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ .Chart.Name }}'
     app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
+    application.giantswarm.io/branch: '{{ .Values.project.branch }}'
+    application.giantswarm.io/commit: '{{ .Values.project.commit }}'
     cluster.x-k8s.io/provider: ipam-in-cluster
     helm.sh/chart: '{{ .Chart.Name }}'
   name: caip-in-cluster-controller-manager