Feature add environment name to resources

.github/workflows/deploy-staging.yml

@@ -44,6 +44,6 @@ jobs:
       - name: Deploy chart to staging
         run: |
           helm upgrade -i --reuse-values multiwoven ./charts/multiwoven
-          kubectl rollout restart deployment/multiwoven-worker -n multiwoven
-          kubectl rollout restart deployment/multiwoven-server -n multiwoven
-          kubectl rollout restart deployment/multiwoven-ui -n multiwoven
+          kubectl rollout restart deployment ${{ vars.APP_ENV }}-multiwoven-worker -n multiwoven
+          kubectl rollout restart deployment ${{ vars.APP_ENV }}-multiwoven-server -n multiwoven
+          kubectl rollout restart deployment ${{ vars.APP_ENV }}-multiwoven-ui -n multiwoven

charts/multiwoven/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: multiwoven
 description: Open-source reverse ETL, an alternative to Hightouch, Census etc. 🔥
 type: application
-version: 0.27.0
-appVersion: "0.27.0"
+version: 0.28.0
+appVersion: "0.28.0"
 maintainers:
   - name: subintp
   - name: RafaelOAiSquared

charts/multiwoven/templates/multiwoven-config.yaml

@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "chart.fullname" . }}-config
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    io.kompose.service: {{ include "chart.fullname" . }}-config
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
   {{- include "chart.labels" . | nindent 4 }}
 data:
   ALLOWED_HOST: {{ .Values.multiwovenConfig.allowedHost | quote }}

charts/multiwoven/templates/multiwoven-ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "chart.fullname" . }}-ingress
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ingress
   namespace: {{ .Values.kubernetesNamespace }}
 
   labels:
@@ -32,7 +32,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: '{{ include "chart.fullname" . }}-ui'
+            name: '{{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui'
             port:
               number: {{ (index .Values.multiwovenUI.ports 0).port }}
   - host: {{ .Values.multiwovenConfig.apiHost }}
@@ -42,7 +42,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: '{{ include "chart.fullname" . }}-server'
+            name: '{{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server'
             port:
               number: {{ (index .Values.multiwovenServer.ports 0).port }}
 {{ if .Values.temporal.enabled }}
@@ -51,7 +51,7 @@ spec:
       paths:
       - backend:
           service:
-            name: '{{ include "chart.fullname" . }}-temporal-ui'
+            name: '{{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-temporal-ui'
             port:
               number: {{ (index .Values.temporalUi.ports 0).port }}
         path: /(.*)

charts/multiwoven/templates/multiwoven-postgresql-deployment.yaml

@@ -2,22 +2,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "chart.fullname" . }}-postgresql
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    io.kompose.service: {{ include "chart.fullname" . }}-postgresql
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
   {{- include "chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.multiwovenPostgresql.replicas }}
   selector:
     matchLabels:
-      io.kompose.service: {{ include "chart.fullname" . }}-postgresql
+      io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
     {{- include "chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
         io.kompose.network/multiwoven-server-default: "true"
-        io.kompose.service: {{ include "chart.fullname" . }}-postgresql
+        io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
       {{- include "chart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
@@ -26,12 +26,12 @@ spec:
           valueFrom:
             configMapKeyRef:
               key: DB_PASSWORD
-              name: {{ include "chart.fullname" . }}-config
+              name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
         - name: POSTGRES_USER
           valueFrom:
             configMapKeyRef:
               key: DB_USERNAME
-              name: {{ include "chart.fullname" . }}-config
+              name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
         - name: KUBERNETES_CLUSTER_DOMAIN
           value: {{ quote .Values.kubernetesClusterDomain }}
         image: {{ .Values.multiwovenPostgresql.multiwovenPostgresql.image.repository }}:{{ .Values.multiwovenPostgresql.multiwovenPostgresql.image.tag | default .Chart.AppVersion }}
@@ -40,7 +40,7 @@ spec:
           periodSeconds: 10
           tcpSocket:
             port: 5432
-        name: {{ include "chart.fullname" . }}-postgresql
+        name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
         ports:
         - containerPort: 5432
         readinessProbe:
@@ -52,9 +52,9 @@ spec:
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
           subPath: postgres
-          name: {{ include "chart.fullname" . }}-postgresql-pvc
+          name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql-pvc
       volumes:
-      - name: {{ include "chart.fullname" . }}-postgresql-pvc
+      - name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql-pvc
         persistentVolumeClaim:
-          claimName: {{ include "chart.fullname" . }}-postgresql-pvc
+          claimName: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql-pvc
 {{ end }}

charts/multiwoven/templates/multiwoven-postgresql-pvc.yaml

@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "chart.fullname" . }}-postgresql-pvc
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql-pvc
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    io.kompose.service: {{ include "chart.fullname" . }}-postgresql-pvc
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql-pvc
   {{- include "chart.labels" . | nindent 4 }}
 spec:
   accessModes:

charts/multiwoven/templates/multiwoven-postgresql-service.yaml

@@ -2,15 +2,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "chart.fullname" . }}-postgresql
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    io.kompose.service: {{ include "chart.fullname" . }}-postgresql
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
   {{- include "chart.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.multiwovenPostgresql.type }}
   selector:
-    io.kompose.service: {{ include "chart.fullname" . }}-postgresql
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-postgresql
   {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
 	{{- .Values.multiwovenPostgresql.ports | toYaml | nindent 2 -}}

charts/multiwoven/templates/multiwoven-server-deployment.yaml

@@ -1,24 +1,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "chart.fullname" . }}-server
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    app: {{ include "chart.fullname" . }}-server
-    io.kompose.service: {{ include "chart.fullname" . }}-server
+    app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   {{- include "chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.multiwovenServer.replicas }}
   selector:
     matchLabels:
-      app: {{ include "chart.fullname" . }}-server
-      io.kompose.service: {{ include "chart.fullname" . }}-server
+      app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
+      io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
     {{- include "chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "chart.fullname" . }}-server
-        io.kompose.service: {{ include "chart.fullname" . }}-server
+        app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
+        io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
       {{- include "chart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
@@ -27,15 +27,15 @@ spec:
           value: {{ quote .Values.kubernetesClusterDomain }}
         envFrom:
         - configMapRef:
-            name: {{ include "chart.fullname" . }}-config
+            name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
         image: {{ .Values.multiwovenServer.multiwovenServer.image.repository }}:{{ .Values.multiwovenServer.multiwovenServer.image.tag | default .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /
             port: {{ (index .Values.multiwovenServer.ports 0).port }}
           initialDelaySeconds: 15
           periodSeconds: 10
-        name: {{ include "chart.fullname" . }}-server
+        name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
         ports:
         - containerPort: {{ (index .Values.multiwovenServer.ports 0).port }}
         readinessProbe:

charts/multiwoven/templates/multiwoven-server-hpa.yaml

@@ -2,7 +2,7 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "chart.fullname" . }}-server-hpa
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server-hpa
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
     {{- include "chart.labels" . | nindent 4 }}
@@ -11,7 +11,7 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "chart.fullname" . }}-server
+    name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   minReplicas: {{ .Values.hpa.multiwovenServer.minReplicas }}
   maxReplicas: {{ .Values.hpa.multiwovenServer.maxReplicas }}
   behavior:

charts/multiwoven/templates/multiwoven-server-service.yaml

@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "chart.fullname" . }}-server
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   namespace: {{ .Values.kubernetesNamespace }}
 
   labels:
-    io.kompose.service:  {{ include "chart.fullname" . }}-server
+    io.kompose.service:  {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   {{- include "chart.labels" . | nindent 4 }}
   annotations:
     kompose.cmd: kompose convert
     kompose.version: 1.32.0 (HEAD)
 spec:
   type: {{ .Values.multiwovenServer.type }}
   selector:
-    io.kompose.service:  {{ include "chart.fullname" . }}-server
+    io.kompose.service:  {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-server
   {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
 	{{- .Values.multiwovenServer.ports | toYaml | nindent 2 -}}

charts/multiwoven/templates/multiwoven-ui-deployment.yaml

@@ -1,39 +1,39 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "chart.fullname" . }}-ui
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
-    app: {{ include "chart.fullname" . }}-ui
-    io.kompose.service: {{ include "chart.fullname" . }}-ui
+    app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
+    io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   {{- include "chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.multiwovenUI.replicas }}
   selector:
     matchLabels:
-      app: {{ include "chart.fullname" . }}-ui
-      io.kompose.service: {{ include "chart.fullname" . }}-ui
+      app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
+      io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
     {{- include "chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "chart.fullname" . }}-ui
-        io.kompose.service: {{ include "chart.fullname" . }}-ui
+        app: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
+        io.kompose.service: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
       {{- include "chart.selectorLabels" . | nindent 8 }}
     spec:
       containers:
       - env:
         envFrom:
         - configMapRef:
-            name: {{ include "chart.fullname" . }}-config
+            name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-config
         image: {{ .Values.multiwovenUI.multiwovenUI.image.repository }}:{{ .Values.multiwovenUI.multiwovenUI.image.tag | default .Chart.AppVersion }}
         livenessProbe:
           httpGet:
             path: /
             port: {{ (index .Values.multiwovenUI.ports 0).port }}
           initialDelaySeconds: 15
           periodSeconds: 10
-        name: {{ include "chart.fullname" . }}-ui
+        name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
         ports:
         - containerPort: {{ (index .Values.multiwovenUI.ports 0).port }}
         readinessProbe:

charts/multiwoven/templates/multiwoven-ui-hpa.yaml

@@ -2,7 +2,7 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "chart.fullname" . }}-ui-hpa
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui-hpa
   namespace: {{ .Values.kubernetesNamespace }}
   labels:
     {{- include "chart.labels" . | nindent 4 }}
@@ -11,7 +11,7 @@ spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "chart.fullname" . }}-ui
+    name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   minReplicas: {{ .Values.hpa.multiwovenUI.minReplicas }}
   maxReplicas: {{ .Values.hpa.multiwovenUI.maxReplicas }}
   behavior:

charts/multiwoven/templates/multiwoven-ui-service.yaml

@@ -1,19 +1,19 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "chart.fullname" . }}-ui
+  name: {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   namespace: {{ .Values.kubernetesNamespace }}
 
   labels:
-    io.kompose.service:  {{ include "chart.fullname" . }}-ui
+    io.kompose.service:  {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   {{- include "chart.labels" . | nindent 4 }}
   annotations:
     kompose.cmd: kompose convert
     kompose.version: 1.32.0 (HEAD)
 spec:
   type: {{ .Values.multiwovenUI.type }}
   selector:
-    io.kompose.service:  {{ include "chart.fullname" . }}-ui
+    io.kompose.service:  {{ .Values.multiwovenConfig.appEnv }}-{{ include "chart.fullname" . }}-ui
   {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
 	{{- .Values.multiwovenUI.ports | toYaml | nindent 2 -}}