Ensure job names are <= 52 chars

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · Mar 26, 2024 · bc11729 · bc11729
1 parent d5fc038
commit bc11729
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/charts/cluster-auth-manager/templates/ocm-mc/crds.yaml b/charts/cluster-auth-manager/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "cluster-auth-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: cluster-auth-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cluster-auth-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: cluster-auth-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}
diff --git a/charts/cluster-gateway-manager/templates/ocm-mc/crds.yaml b/charts/cluster-gateway-manager/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "cluster-gateway-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: cluster-gateway-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cluster-gateway-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: cluster-gateway-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}
diff --git a/charts/cluster-proxy-manager/templates/ocm-mc/crds.yaml b/charts/cluster-proxy-manager/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "cluster-proxy-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: cluster-proxy-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: cluster-proxy-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: cluster-proxy-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}
diff --git a/charts/fluxcd-manager/templates/ocm-mc/crds.yaml b/charts/fluxcd-manager/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "fluxcd-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: fluxcd-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: fluxcd-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: fluxcd-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}
diff --git a/charts/managed-serviceaccount-manager/templates/ocm-mc/crds.yaml b/charts/managed-serviceaccount-manager/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "managed-serviceaccount-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: managed-serviceaccount-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: managed-serviceaccount-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: managed-serviceaccount-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}
diff --git a/charts/spoke-cluster-proxy/templates/ocm-mc/crds.yaml b/charts/spoke-cluster-proxy/templates/ocm-mc/crds.yaml
@@ -3,11 +3,12 @@
 
 {{ $content := toString $data }}
 {{ $crd := dig "spec" "names" "plural" "" ($content | fromYaml) }}
+{{ $job := printf "spoke-cluster-proxy-regcrd-%s" $crd | trunc 52 }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: spoke-cluster-proxy-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "0"
@@ -21,7 +22,7 @@ data:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: spoke-cluster-proxy-regcrd-{{ $crd }}
+  name: {{ $job }}
   namespace: {{ $.Release.Namespace }}
   annotations:
     "helm.sh/hook-weight": "1"
@@ -56,7 +57,7 @@ spec:
           secretName: {{ $.Values.kubeconfigSecretName }}
       - name: crd-volume
         configMap:
-          name: spoke-cluster-proxy-regcrd-{{ $crd }}
+          name: {{ $job }}
       restartPolicy: Never
 {{- end }}
 {{- end }}