Update chart version to v0.3.2 and refactor templates to use .Values.…

…name for consistency
RubxKube · Dec 14, 2024 · ae0b3b7 · ae0b3b7
1 parent 23858e5
commit ae0b3b7
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 20 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -5,7 +5,7 @@ maintainers:
  - name: QJOLY
    email: [email protected]
 name: common
-version: v0.3.1
+version: v0.3.2
 appVersion: "0"
 kubeVersion: ">= 1.18"
 home: https://github.com/RubxKube/common-charts

diff --git a/charts/common/templates/deployment.yaml b/charts/common/templates/deployment.yaml
@@ -2,27 +2,27 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.name }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
 spec:
   replicas: {{ .Values.deployment.minReplicas }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ .Values.name }}
   strategy:
   {{- toYaml .Values.deployment.strategy | nindent 4 }}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name }}
+        app: {{ .Values.name }}
     spec:
       {{- if .Values.image.repositorySettings.isPrivate }}
       imagePullSecrets:
         - name: "{{ .Values.image.repositorySettings.secretName }}"
       {{- end }}
       containers:
-        - name: {{ .Release.Name }}
+        - name: {{ .Values.name }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           {{- if .Values.deployment.port }}

diff --git a/charts/common/templates/hpa.yaml b/charts/common/templates/hpa.yaml
@@ -2,12 +2,12 @@
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.name }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ .Release.Name }}
+    name: {{ .Values.name }}
   minReplicas: {{ .Values.hpa.minReplicas }}
   maxReplicas: {{ .Values.hpa.maxReplicas }}
   metrics:

diff --git a/charts/common/templates/ingress.yaml b/charts/common/templates/ingress.yaml
@@ -2,9 +2,9 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.name }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
 {{- if .Values.ingress.annotations }}
   annotations:
   {{ toYaml .Values.ingress.annotations | indent 4 }}
@@ -21,7 +21,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: {{ .Release.Name }}
+            name: {{ .Values.name }}
             port:
               number: {{ .Values.app.containerPort }}
   {{- if .Values.ingress.tls.enabled }}

diff --git a/charts/common/templates/service.yaml b/charts/common/templates/service.yaml
@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.name }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
   {{- if .Values.service.extraLabels }}
     {{ .Values.service.extraLabels | toYaml | nindent 4 }}
   {{- end }}
 spec:
   selector:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
   ports:
   - targetPort: {{ .Values.deployment.port }}
     port: {{ .Values.service.servicePort }}

diff --git a/charts/common/templates/tests/test-connection.yaml b/charts/common/templates/tests/test-connection.yaml
@@ -2,34 +2,34 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: test-connection-wget-{{ .Release.Name }}
+  name: test-connection-wget-{{ .Values.name }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
   annotations:
     "helm.sh/hook": test
 spec:
   containers:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ .Release.Name }}:{{ .Values.service.servicePort }}']
+      args: ['{{ .Values.name }}:{{ .Values.service.servicePort }}']
   restartPolicy: Never
 {{ end }}
 {{- if (.Values.tests.curlHostHeader.enabled) }}
 ---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: test-connection-curl-{{ .Release.Name }}
+  name: test-connection-curl-{{ .Values.name }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ .Values.name }}
   annotations:
     "helm.sh/hook": test
 spec:
   containers:
     - name: curl
       image: curlimages/curl:7.70.0 
       command: ['curl']
-      args: ['{{ .Release.Name }}:{{ .Values.service.servicePort }}{{ .Values.tests.curlHostHeader.path }}', '-H', '"Host:{{ .Values.ingress.hostName }}:{{ .Values.service.servicePort }}"']
+      args: ['{{ .Values.name }}:{{ .Values.service.servicePort }}{{ .Values.tests.curlHostHeader.path }}', '-H', '"Host:{{ .Values.ingress.hostName }}:{{ .Values.service.servicePort }}"']
   restartPolicy: Never
 {{ end }}
diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -1,5 +1,11 @@
 define: &containerPort 80
 
+
+# Name of the application
+# Since this chart is a template, you can change the name of the application
+# by changing the value of the name variable
+name: "my-app"
+
 service:
   type: ClusterIP
   enabled: true