fix: Fix names

MakairaIO · Feb 19, 2025 · 6a386fc · 6a386fc
1 parent a0bd350
commit 6a386fc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/charts/demoshop/templates/cert-manager.yaml b/charts/demoshop/templates/cert-manager.yaml
@@ -1,12 +1,12 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: shop-cert
+  name: {{ include "demoshop.name" $ }}-cert
   namespace: {{ .Release.Namespace }}
   labels:
     {{ include "demoshop.labels" . | nindent 4 }}
 spec:
-  secretName: shop-tls
+  secretName: {{ include "demoshop.name" $ }}-tls
   issuerRef:
     name: letsencrypt
     kind: ClusterIssuer

diff --git a/charts/demoshop/templates/database-statefulset.yaml b/charts/demoshop/templates/database-statefulset.yaml
@@ -1,22 +1,22 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "demoshop.name" . }}-database
+  name: {{ include "demoshop.name" $ }}-database
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "demoshop.labels" . | nindent 4 }}
+    {{- include "demoshop.labels" $ | nindent 4 }}
 spec:
-  serviceName: {{ include "demoshop.name" . }}-database
+  serviceName: {{ include "demoshop.name" $ }}-database
   replicas: 1
   selector:
     matchLabels:
-        {{ include "demoshop.selectorLabels" . | nindent 8 }}
+        {{ include "demoshop.selectorLabels" $ | nindent 8 }}
   template:
     metadata:
       annotations:
-        checksum/pull-secret: {{ include (print $.Template.BasePath "/image-pull-secret.yaml") . | sha256sum }}
+        checksum/pull-secret: {{ include (print $.Template.BasePath "/image-pull-secret.yaml") $ | sha256sum }}
       labels:
-        {{ include "demoshop.labels" . | nindent 8 }}
+        {{ include "demoshop.labels" $ | nindent 8 }}
     spec:
       imagePullSecrets:
         {{- range $pullSecret := .Values.imagePullSecrets }}
@@ -41,11 +41,11 @@ spec:
           ports:
           - containerPort: 3306
           volumeMounts:
-          - name: {{ include "demoshop.name" . }}-database-storage
+          - name: {{ include "demoshop.name" $ }}-database-storage
             mountPath: /var/lib/mysql
   volumeClaimTemplates:
     - metadata:
-        name: {{ include "demoshop.name" . }}-database-storage
+        name: {{ include "demoshop.name" $ }}-database-storage
       spec:
         accessModes: [ "ReadWriteOnce" ]
         resources:

diff --git a/charts/demoshop/templates/ingress.yaml b/charts/demoshop/templates/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: shop-ingress
+  name: {{ include "demoshop.name" $ }}-ingress
   namespace: {{ .Release.Namespace }}
   labels:
     {{ include "demoshop.labels" $ | nindent 4 }}

diff --git a/charts/demoshop/templates/persistent-volume.yaml b/charts/demoshop/templates/persistent-volume.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "demoshop.name" . }}-assets-pvc
+  name: {{ include "demoshop.name" $ }}-assets-pvc
   namespace: {{ .Release.Namespace }}
 spec:
   accessModes:

diff --git a/charts/demoshop/templates/shop-configmap.yaml b/charts/demoshop/templates/shop-configmap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "demoshop.name" . }}-nginx-config
+  name: {{ include "demoshop.name" $ }}-nginx-config
   namespace: {{ .Release.Namespace }}
   labels:
-    {{ include "demoshop.labels" . | nindent 4 }}
+    {{ include "demoshop.labels" $ | nindent 4 }}
 data:
   default.conf: |-
     server {

diff --git a/charts/demoshop/templates/shop-deployment.yaml b/charts/demoshop/templates/shop-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "demoshop.name" . }}
+  name: {{ include "demoshop.name" $ }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{ include "demoshop.labels" $ | nindent 4 }}
@@ -13,8 +13,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/pull-secret: {{ include (print $.Template.BasePath "/image-pull-secret.yaml") . | sha256sum }}
-        checksum/config: {{ include (print $.Template.BasePath "/shop-configmap.yaml") . | sha256sum }}
+        checksum/pull-secret: {{ include (print $.Template.BasePath "/image-pull-secret.yaml") $ | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/shop-configmap.yaml") $ | sha256sum }}
       labels:
         {{ include "demoshop.labels" $ | nindent 8 }}
     spec:
@@ -85,9 +85,9 @@ spec:
       volumes:
         - name: nginx-config
           configMap:
-            name: {{ include "demoshop.name" . }}-nginx-config
+            name: {{ include "demoshop.name" $ }}-nginx-config
         {{- if and (.Values.shop.sharedAssets.enabled) (.Values.shop.sharedAssets.storageClass) }}
         - name: shared-assets
           persistentVolumeClaim:
-            claimName: {{ include "demoshop.name" . }}-assets-pvc
+            claimName: {{ include "demoshop.name" $ }}-assets-pvc
         {{- end }}
diff --git a/charts/demoshop/templates/shop-service.yaml b/charts/demoshop/templates/shop-service.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{ include "demoshop.labels" $ | nindent 4 }}
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   selector:
     {{ include "demoshop.selectorLabels" $ | nindent 6 }}
   ports: