Prefix optional component helm artifacts with korifi-

fixes #3740 Co-authored-by: Yusmen Zabanov <[email protected]> Co-authored-by: Georgi Sabev <[email protected]>
cloudfoundry · Jan 22, 2025 · b06de4e · b06de4e
1 parent 5d6eb14
commit b06de4e
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 114 deletions.
diff --git a/helm/korifi/job-task-runner/deployment.yaml b/helm/korifi/job-task-runner/deployment.yaml
@@ -2,14 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: job-task-runner
-  name: job-task-runner-controller-manager
+    app: korifi-job-task-runner
+  name: korifi-job-task-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.jobTaskRunner.replicas }}
   selector:
     matchLabels:
-      app: job-task-runner
+      app: korifi-job-task-runner
   template:
     metadata:
       annotations:
@@ -18,7 +18,7 @@ spec:
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
       labels:
-        app: job-task-runner
+        app: korifi-job-task-runner
     spec:
       containers:
       - name: manager
@@ -58,7 +58,7 @@ spec:
         {{- .Values.jobTaskRunner.resources | toYaml | nindent 10 }}
         {{- include "korifi.securityContext" . | indent 8 }}
       {{- include "korifi.podSecurityContext" . | indent 6 }}
-      serviceAccountName: job-task-runner-controller-manager
+      serviceAccountName: korifi-job-task-runner-controller-manager
 {{- if .Values.jobTaskRunner.nodeSelector }}
       nodeSelector:
       {{ toYaml .Values.jobTaskRunner.nodeSelector | indent 8 }}

diff --git a/helm/korifi/job-task-runner/rbac.yaml b/helm/korifi/job-task-runner/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: job-task-runner-controller-manager
+  name: korifi-job-task-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 imagePullSecrets:
 {{- range .Values.systemImagePullSecrets }}
@@ -12,26 +12,26 @@ imagePullSecrets:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: job-task-runner-leader-election-rolebinding
+  name: korifi-job-task-runner-leader-election-rolebinding
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: korifi-controllers-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: job-task-runner-controller-manager
+  name: korifi-job-task-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: job-task-runner-manager-rolebinding
+  name: korifi-job-task-runner-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: korifi-job-task-runner-taskworkload-manager-role
 subjects:
 - kind: ServiceAccount
-  name: job-task-runner-controller-manager
+  name: korifi-job-task-runner-controller-manager
   namespace: {{ .Release.Namespace }}
diff --git a/helm/korifi/job-task-runner/service.yaml b/helm/korifi/job-task-runner/service.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: job-task-runner-debug-port
+  name: korifi-job-task-runner-debug-port
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
@@ -13,6 +13,6 @@ spec:
       protocol: TCP
       targetPort: 40000
   selector:
-    app: job-task-runner
+    app: korifi-job-task-runner
   type: NodePort
 {{- end }}
diff --git a/helm/korifi/kpack-image-builder/cert.yaml b/helm/korifi/kpack-image-builder/cert.yaml
@@ -1,13 +1,13 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: kpack-image-builder-serving-cert
+  name: korifi-kpack-image-builder-serving-cert
   namespace: {{ .Release.Namespace }}
 spec:
   dnsNames:
-  - kpack-image-builder-webhook-service.{{ .Release.Namespace }}.svc
-  - kpack-image-builder-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
+  - korifi-kpack-image-builder-webhook-service.{{ .Release.Namespace }}.svc
+  - korifi-kpack-image-builder-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: selfsigned-issuer
-  secretName: kpack-image-builder-webhook-cert
+  secretName: korifi-kpack-image-builder-webhook-cert
diff --git a/helm/korifi/kpack-image-builder/configmap.yaml b/helm/korifi/kpack-image-builder/configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kpack-image-builder-config
+  name: korifi-kpack-image-builder-config
   namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |-

diff --git a/helm/korifi/kpack-image-builder/deployment.yaml b/helm/korifi/kpack-image-builder/deployment.yaml
@@ -2,14 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: kpack-image-builder
-  name: kpack-image-builder-controller-manager
+    app: korifi-kpack-image-builder
+  name: korifi-kpack-image-builder-controller-manager
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.kpackImageBuilder.replicas | default 1}}
   selector:
     matchLabels:
-      app: kpack-image-builder
+      app: korifi-kpack-image-builder
   template:
     metadata:
       annotations:
@@ -19,7 +19,7 @@ spec:
         prometheus.io/scrape: "true"
         checksum/config: {{ tpl ($.Files.Get "controllers/configmap.yaml") $ | sha256sum }}
       labels:
-        app: kpack-image-builder
+        app: korifi-kpack-image-builder
     spec:
       containers:
       - name: manager
@@ -38,12 +38,12 @@ spec:
         - "--"
         - "--health-probe-bind-address=:8081"
         - "--leader-elect"
-        - "--config=/etc/kpack-image-builder-config"
+        - "--config=/etc/korifi-kpack-image-builder-config"
 {{- else }}
         args:
         - --health-probe-bind-address=:8081
         - --leader-elect
-        - --config=/etc/kpack-image-builder-config
+        - --config=/etc/korifi-kpack-image-builder-config
 {{- end }}
         livenessProbe:
           httpGet:
@@ -71,11 +71,11 @@ spec:
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: cert
           readOnly: true
-        - mountPath: /etc/kpack-image-builder-config
-          name: kpack-image-builder-config
+        - mountPath: /etc/korifi-kpack-image-builder-config
+          name: korifi-kpack-image-builder-config
           readOnly: true
       {{- include "korifi.podSecurityContext" . | indent 6 }}
-      serviceAccountName: kpack-image-builder-controller-manager
+      serviceAccountName: korifi-kpack-image-builder-controller-manager
 {{- if .Values.kpackImageBuilder.nodeSelector }}
       nodeSelector:
       {{ toYaml .Values.kpackImageBuilder.nodeSelector | indent 8 }}
@@ -89,7 +89,7 @@ spec:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: kpack-image-builder-webhook-cert
+          secretName: korifi-kpack-image-builder-webhook-cert
       - configMap:
-          name: kpack-image-builder-config
-        name: kpack-image-builder-config
+          name: korifi-kpack-image-builder-config
+        name: korifi-kpack-image-builder-config
diff --git a/helm/korifi/kpack-image-builder/manifests.yaml b/helm/korifi/kpack-image-builder/manifests.yaml
@@ -4,14 +4,14 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: korifi-kpack-image-builder-mutating-webhook-configuration
   annotations:
-    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/kpack-image-builder-serving-cert'
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/korifi-kpack-image-builder-serving-cert'
 webhooks:
   - admissionReviewVersions:
       - v1
       - v1beta1
     clientConfig:
       service:
-        name: kpack-image-builder-webhook-service
+        name: korifi-kpack-image-builder-webhook-service
         namespace: '{{ .Release.Namespace }}'
         path: /mutate-korifi-cloudfoundry-org-v1alpha1-kpack-image-builder-finalizer
     failurePolicy: Fail

diff --git a/helm/korifi/kpack-image-builder/rbac.yaml b/helm/korifi/kpack-image-builder/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: kpack-image-builder-controller-manager
+  name: korifi-kpack-image-builder-controller-manager
   namespace: {{ .Release.Namespace }}
   {{- if .Values.eksContainerRegistryRoleARN }}
   annotations:
@@ -16,26 +16,26 @@ imagePullSecrets:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: kpack-image-builder-leader-election-rolebinding
+  name: korifi-kpack-image-builder-leader-election-rolebinding
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: korifi-controllers-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: kpack-image-builder-controller-manager
+  name: korifi-kpack-image-builder-controller-manager
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: kpack-image-builder-manager-rolebinding
+  name: korifi-kpack-image-builder-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: korifi-kpack-build-manager-role
 subjects:
 - kind: ServiceAccount
-  name: kpack-image-builder-controller-manager
+  name: korifi-kpack-image-builder-controller-manager
   namespace: {{ .Release.Namespace }}
diff --git a/helm/korifi/kpack-image-builder/service.yaml b/helm/korifi/kpack-image-builder/service.yaml
@@ -1,20 +1,20 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kpack-image-builder-webhook-service
+  name: korifi-kpack-image-builder-webhook-service
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - port: 443
     targetPort: 9443
   selector:
-    app: kpack-image-builder
+    app: korifi-kpack-image-builder
 ---
 {{- if .Values.debug }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: kpack-image-builder-debug-port
+  name: korifi-kpack-image-builder-debug-port
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
@@ -24,6 +24,6 @@ spec:
       protocol: TCP
       targetPort: 40000
   selector:
-    app: kpack-image-builder
+    app: korifi-kpack-image-builder
   type: NodePort
 {{- end }}
diff --git a/helm/korifi/statefulset-runner/deployment.yaml b/helm/korifi/statefulset-runner/deployment.yaml
@@ -2,14 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: statefulset-runner
-  name: statefulset-runner-controller-manager
+    app: korifi-statefulset-runner
+  name: korifi-statefulset-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.statefulsetRunner.replicas }}
   selector:
     matchLabels:
-      app: statefulset-runner
+      app: korifi-statefulset-runner
   template:
     metadata:
       annotations:
@@ -18,7 +18,7 @@ spec:
         prometheus.io/port: "8080"
         prometheus.io/scrape: "true"
       labels:
-        app: statefulset-runner
+        app: korifi-statefulset-runner
     spec:
       containers:
       - name: manager
@@ -56,7 +56,7 @@ spec:
         {{- .Values.statefulsetRunner.resources | toYaml | nindent 10 }}
         {{- include "korifi.securityContext" . | indent 8 }}
       {{- include "korifi.podSecurityContext" . | indent 6 }}
-      serviceAccountName: statefulset-runner-controller-manager
+      serviceAccountName: korifi-statefulset-runner-controller-manager
 {{- if .Values.statefulsetRunner.nodeSelector }}
       nodeSelector:
       {{ toYaml .Values.statefulsetRunner.nodeSelector | indent 8 }}

diff --git a/helm/korifi/statefulset-runner/post-install-runnerinfo.yaml b/helm/korifi/statefulset-runner/post-install-runnerinfo.yaml
@@ -23,7 +23,7 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
-      serviceAccountName: statefulset-runner-controller-manager
+      serviceAccountName: korifi-statefulset-runner-controller-manager
       restartPolicy: Never
       {{- include "korifi.podSecurityContext" . | indent 6 }}
       containers:

diff --git a/helm/korifi/statefulset-runner/rbac.yaml b/helm/korifi/statefulset-runner/rbac.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: statefulset-runner-controller-manager
+  name: korifi-statefulset-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 imagePullSecrets:
 {{- range .Values.systemImagePullSecrets }}
@@ -11,26 +11,26 @@ imagePullSecrets:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: statefulset-runner-leader-election-rolebinding
+  name: korifi-statefulset-runner-leader-election-rolebinding
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: korifi-controllers-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: statefulset-runner-controller-manager
+  name: korifi-statefulset-runner-controller-manager
   namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: statefulset-runner-manager-rolebinding
+  name: korifi-statefulset-runner-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: korifi-statefulset-runner-appworkload-manager-role
 subjects:
 - kind: ServiceAccount
-  name: statefulset-runner-controller-manager
+  name: korifi-statefulset-runner-controller-manager
   namespace: {{ .Release.Namespace }}
diff --git a/helm/korifi/statefulset-runner/service.yaml b/helm/korifi/statefulset-runner/service.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: statefulset-runner-debug-port
+  name: korifi-statefulset-runner-debug-port
   namespace: {{ .Release.Namespace }}
 spec:
   ports:
@@ -13,6 +13,6 @@ spec:
       protocol: TCP
       targetPort: 40000
   selector:
-    app: statefulset-runner
+    app: korifi-statefulset-runner
   type: NodePort
 {{- end }}
diff --git a/job-task-runner/PROJECT b/job-task-runner/PROJECT