Add flag for remove prefix in every kubernetes resources #56 (#57)

* Add flag for remove prefix in every kubernetes resources #56
Improwised · Feb 22, 2024 · a1270f5 · a1270f5
1 parent e9e544f
commit a1270f5
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 28 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -28,18 +28,18 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3
+        uses: azure/setup-helm@v4.0.0
         with:
-          version: v3.11.1
+          version: v3.14.1
 
       - name: Adding bitnamirepo
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: "3.12.2"
           check-latest: true
 
       - name: Set up chart-testing
@@ -59,9 +59,9 @@ jobs:
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.9.0
         with:
-          version: "v0.17.0"
+          version: "v0.21.0"
           node_image: "kindest/node:v${{ matrix.k8s }}"
 
       - name: Run chart-testing (install)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,6 +28,6 @@ jobs:
           helm repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/charts/polymorphic-app/Chart.yaml b/charts/polymorphic-app/Chart.yaml
@@ -4,5 +4,5 @@ description: A Helm chart for deploying any custom applications, specifically po
 maintainers:
   - name: improwised
 type: application
-version: 1.2.8
+version: 1.3.0
 appVersion: 1.0.0
diff --git a/charts/polymorphic-app/templates/cronjob.yaml b/charts/polymorphic-app/templates/cronjob.yaml
@@ -3,10 +3,14 @@
 apiVersion: {{ include "cronjob.apiVersion" $ }}
 kind: CronJob
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}"
+{{- else}}
+  name: "{{ .name | default $.Values.cronJobTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}
+    app.kubernetes.io/component: "{{ .name | default $.Values.cronJobTemplate.name }}"
   annotations:
     linkerd.io/inject: disabled
 {{- with .annotations | default $.Values.cronJobTemplate.annotations }}
@@ -35,7 +39,11 @@ spec:
           {{- end }}
           restartPolicy: Never
           containers:
+          {{- if $.Values.prefixWithReleaseName.enabled }}
           - name: "{{ $.Release.Name }}-{{ .name | default $.Values.cronJobTemplate.name }}"
+          {{- else}}
+          - name: "{{ .name | default $.Values.cronJobTemplate.name }}"
+          {{- end }}
             {{- if .image }}
             image: "{{ .image.repository }}:{{ .image.tag }}"
             {{- else }}

diff --git a/charts/polymorphic-app/templates/job.yaml b/charts/polymorphic-app/templates/job.yaml
@@ -3,10 +3,14 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
+{{- else}}
+  name: "{{ .name | default $.Values.jobTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}
+    app.kubernetes.io/component: "{{ .name | default $.Values.jobTemplate.name }}"
   annotations:
     linkerd.io/inject: disabled
 {{- with .annotations | default $.Values.jobTemplate.annotations }}
@@ -17,7 +21,7 @@ spec:
     metadata:
       labels:
         {{- include "polymorphic-app.labels" $ | nindent 8 }}
-        app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}
+        app.kubernetes.io/component: "{{ .name | default $.Values.jobTemplate.name }}"
     spec:
       {{- if $.Values.jobTemplate.imagePullSecrets }}
       imagePullSecrets:
@@ -33,7 +37,11 @@ spec:
       {{- end }}
       restartPolicy: Never
       containers:
+      {{- if $.Values.prefixWithReleaseName.enabled }}
         - name: "{{ $.Release.Name }}-{{ .name | default $.Values.jobTemplate.name }}"
+      {{- else}}
+        - name: "{{ .name | default $.Values.jobTemplate.name }}"
+      {{- end }}
           {{- if .image }}
           image: "{{ .image.repository }}:{{ .image.tag }}"
           {{- else }}

diff --git a/charts/polymorphic-app/templates/service.yaml b/charts/polymorphic-app/templates/service.yaml
@@ -3,10 +3,14 @@
 apiVersion: {{ include "deployment.apiVersion" $ }}
 kind: {{ if eq .type "StatefulSet"}}StatefulSet{{- else }}Deployment{{- end }}
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+{{- else}}
+  name: "{{ .name | default $.Values.serviceTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
+    app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
 {{- with .annotations | default $.Values.serviceTemplate.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -22,17 +26,21 @@ spec:
   {{- end }}
   replicas: {{ .minReplicaCount  | default $.Values.serviceTemplate.minReplicaCount }}
   {{ if eq .type "StatefulSet"}}
+    {{- if $.Values.prefixWithReleaseName.enabled }}
   serviceName: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+    {{- else }}
+  serviceName: "{{ .name | default $.Values.serviceTemplate.name }}"
+    {{- end }}
   {{- end }}
   selector:
     matchLabels:
       {{- include "polymorphic-app.selectorLabels" $ | nindent 6 }}
-      app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+      app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
   template:
     metadata:
       labels:
         {{- include "polymorphic-app.labels" $ | nindent 8 }}
-        app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
+        app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
     spec:
       {{- if $.Values.serviceTemplate.imagePullSecrets }}
       imagePullSecrets:
@@ -54,7 +62,11 @@ spec:
       {{- end }}
       {{- end }}
       containers:
+      {{- if $.Values.prefixWithReleaseName.enabled }}
         - name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}"
+      {{- else}}
+        - name: "{{ .name | default $.Values.serviceTemplate.name }}"
+      {{- end }}
           {{- if .image }}
           image: "{{ .image.repository }}:{{ .image.tag }}"
           {{- else }}
@@ -177,7 +189,7 @@ spec:
               labelSelector:
                 matchLabels:
                   {{- include "polymorphic-app.labels" $ | nindent 18 }}
-                  app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+                  app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
     {{- with .affinity | default $.Values.serviceTemplate.affinity }}
 {{ toYaml . | indent 8 }}
     {{- end }}
@@ -196,20 +208,24 @@ spec:
       {{- if $.Values.serviceTemplate.volumeClaimTemplates }}
 {{ toYaml $.Values.serviceTemplate.volumeClaimTemplates | indent 8 }}
       {{- end }}
-{{- if .autoscaling | default $.Values.serviceTemplate.autoscaling }}
+{{- if and (.autoscaling | default $.Values.serviceTemplate.autoscaling) (ne .type "StatefulSet")}}
 ---
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+{{- else }}
+  name: "{{ .name | default $.Values.serviceTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
+    app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
-    kind: {{ if eq .type "StatefulSet"}}StatefulSet{{- else }}Deployment{{- end }}
-    name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+    kind: Deployment
+    name: "{{ .name | default $.Values.serviceTemplate.name }}"
   minReplicas: {{ .minReplicaCount | default $.Values.serviceTemplate.minReplicaCount }}
   maxReplicas: {{ .maxReplicaCount | default $.Values.serviceTemplate.maxReplicaCount }}
   metrics:
@@ -232,10 +248,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+{{- else}}
+  name: "{{ .name | default $.Values.serviceTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
+    app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
 {{- with (.service.annotations | default $.Values.serviceTemplate.service.annotations) }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -251,18 +271,22 @@ spec:
 {{- end }}
   selector:
     {{- include "polymorphic-app.selectorLabels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc
+    app.kubernetes.io/component: "{{ .name | default $.Values.serviceTemplate.name }}"
 {{- end }}
 
 
 {{- if and .ingress (.ingress.enabled | default $.Values.serviceTemplate.ingress.enabled) }}
 ---
+{{- $svcName := .name | default $.Values.serviceTemplate.name -}}
 {{- $fullName := printf "%s-%s-svc" $.Release.Name (.name | default $.Values.serviceTemplate.name) -}}
-
 apiVersion: {{ include "ingress.apiVersion" $ }}
 kind: Ingress
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.serviceTemplate.name }}-svc"
+{{- else}}
+  name: "{{ .name | default $.Values.serviceTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
   {{- with (.ingress.annotations | default $.Values.serviceTemplate.ingress.annotations) }}
@@ -291,7 +315,11 @@ spec:
         {{- range .paths }}
           - path: {{ .path }}
             pathType: {{ .pathType }}
+            {{- if $.Values.prefixWithReleaseName.enabled }}
             backend: {{- include "ingress.backend" (dict "serviceName" $fullName "servicePort" .servicePort "context" $)  | nindent 14 }}
+            {{- else}}
+            backend: {{- include "ingress.backend" (dict "serviceName" $svcName "servicePort" .servicePort "context" $)  | nindent 14 }}
+            {{- end }}
         {{- end }}
   {{- end }}
 {{- end }}

diff --git a/charts/polymorphic-app/templates/worker.yaml b/charts/polymorphic-app/templates/worker.yaml
@@ -3,10 +3,14 @@
 apiVersion: {{ include "deployment.apiVersion" $ }}
 kind: Deployment
 metadata:
+  {{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+  {{- else }}
+  name: "{{ .name | default $.Values.workerTemplate.name }}"
+  {{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
+    app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
 spec:
   strategy:
     type: RollingUpdate
@@ -17,12 +21,12 @@ spec:
   selector:
     matchLabels:
       {{- include "polymorphic-app.selectorLabels" $ | nindent 6 }}
-      app.kubernetes.io/component: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+      app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
   template:
     metadata:
       labels:
         {{- include "polymorphic-app.labels" $ | nindent 8 }}
-        app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
+        app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
     spec:
       {{- if $.Values.workerTemplate.imagePullSecrets }}
       imagePullSecrets:
@@ -38,7 +42,11 @@ spec:
       {{- end }}
       terminationGracePeriodSeconds: {{ .terminationGracePeriodSeconds | default $.Values.workerTemplate.terminationGracePeriodSeconds }}
       containers:
+        {{- if $.Values.prefixWithReleaseName.enabled }}
         - name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+        {{- else }}
+        - name: "{{ .name | default $.Values.workerTemplate.name }}"
+        {{- end }}
           {{- if .image }}
           image: "{{ .image.repository }}:{{ .image.tag }}"
           {{- else }}
@@ -175,15 +183,23 @@ spec:
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
+{{- if $.Values.prefixWithReleaseName.enabled }}
   name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+{{- else }}
+  name: "{{ .name | default $.Values.workerTemplate.name }}"
+{{- end }}
   labels:
     {{- include "polymorphic-app.labels" $ | nindent 4 }}
-    app.kubernetes.io/component: {{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}
+    app.kubernetes.io/component: "{{ .name | default $.Values.workerTemplate.name }}"
 spec:
   scaleTargetRef:
     apiVersion: apps/v1beta2
     kind: Deployment
+    {{- if $.Values.prefixWithReleaseName.enabled }}
     name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+    {{- else }}
+    name: "{{ .name | default $.Values.workerTemplate.name }}"
+    {{- end }}
   minReplicas: {{ .minReplicaCount | default $.Values.workerTemplate.minReplicaCount }}
   maxReplicas: {{ .maxReplicaCount | default $.Values.workerTemplate.maxReplicaCount }}
   metrics:
@@ -195,7 +211,7 @@ spec:
       target:
         apiVersion: apps/v1
         kind: Deployment
-        name: "{{ $.Release.Name }}-{{ .name | default $.Values.workerTemplate.name }}"
+        name: "{{ .name | default $.Values.workerTemplate.name }}"
       targetValue: 100
 {{- end }}
 {{- end }}
diff --git a/charts/polymorphic-app/values.yaml b/charts/polymorphic-app/values.yaml
@@ -4,7 +4,8 @@
 
 nameOverride: ""
 fullnameOverride: ""
-
+prefixWithReleaseName:
+  enabled: true
 image:
   repository:
   tag: