Fixes to mojaloop-simulator helm charts to align to best practices an…

…d fix upgrade issues https://github.com/helm/charts/blob/master/REVIEW_GUIDELINES.md#for-deployments-statefulsets-daemonsets-appsv1beta2
mojaloop · Jun 17, 2021 · 1b8c0bb · 1b8c0bb
1 parent 3494643
commit 1b8c0bb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/mojaloop-simulator/Chart.yaml b/mojaloop-simulator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 description: "Helm Chart for the Mojaloop (SDK-based) Simulator"
 name: mojaloop-simulator
-version: 11.4.0
+version: 12.0.0
 appVersion: "sdk-scheme-adapter: v11.17.1; mojaloop-simulator: v11.4.3"
diff --git a/mojaloop-simulator/templates/config-jws-public-keys.yaml b/mojaloop-simulator/templates/config-jws-public-keys.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "mojaloop-simulator.prefix" . }}jws-public-keys
   labels:
-    app.kubernetes.io/name: {{ include "mojaloop-simulator.prefix" . }}jws-public-keys
+    app.kubernetes.io/name: sim-jws-public-keys
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 data:
   {{- range $name, $customConfig := .Values.simulators }}

diff --git a/mojaloop-simulator/templates/config-rules.yaml b/mojaloop-simulator/templates/config-rules.yaml
@@ -6,7 +6,7 @@ kind: ConfigMap
 metadata:
   name: {{ $fullName }}-rules
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-rules
+    app.kubernetes.io/name: sim-{{ $name }}-rules
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 data:
   rules.json: {{ $config.config.backend.rules | quote }}

diff --git a/mojaloop-simulator/templates/deployment.yaml b/mojaloop-simulator/templates/deployment.yaml
@@ -9,18 +9,18 @@ kind: Deployment
 metadata:
   name: {{ $fullName }}-scheme-adapter
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
+    app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
   replicas: {{ $config.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
-      {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }}
+      app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
+      app.kubernetes.io/instance: {{ $releaseName }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
+        app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
         {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }}
     spec:
       volumes:
@@ -134,18 +134,18 @@ kind: Deployment
 metadata:
   name: {{ $fullName }}-backend
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-backend
+    app.kubernetes.io/name: sim-{{ $name }}-backend
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
   replicas: {{ $config.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ $fullName }}-backend
-      {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }}
+      app.kubernetes.io/name: sim-{{ $name }}-backend
+      app.kubernetes.io/instance: {{ $releaseName }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ $fullName }}-backend
+        app.kubernetes.io/name: sim-{{ $name }}-backend
         {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }}
     spec:
       initContainers:
@@ -219,18 +219,18 @@ kind: Deployment
 metadata:
   name: {{ $fullName }}-cache
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-cache
+    app.kubernetes.io/name: sim-{{ $name }}-cache
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
   replicas: {{ $config.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ $fullName }}-cache
-      {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }}
+      app.kubernetes.io/name: sim-{{ $name }}-cache
+      app.kubernetes.io/instance: {{ $releaseName }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ $fullName }}-cache
+        app.kubernetes.io/name: sim-{{ $name }}-cache
         {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }}
     spec:
       initContainers:

diff --git a/mojaloop-simulator/templates/horizontalpodautoscaler.yaml b/mojaloop-simulator/templates/horizontalpodautoscaler.yaml
@@ -7,7 +7,7 @@ kind: HorizontalPodAutoscaler
 metadata:
   name: {{ $fullName }}-scheme-adapter
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
+    app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
   scaleTargetRef:

diff --git a/mojaloop-simulator/templates/secret.yaml b/mojaloop-simulator/templates/secret.yaml
@@ -8,7 +8,7 @@ kind: Secret
 metadata:
   name: {{ $fullName }}-jws-priv-key
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-jws-priv-key
+    app.kubernetes.io/name: sim-{{ $name }}-jws-priv-key
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 data:
   # Note that due to a bug with helm 2.9.1 the `required` function in combination with a missing
@@ -25,7 +25,7 @@ kind: Secret
 metadata:
   name: {{ $fullName }}-tls-creds
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-tls-creds
+    app.kubernetes.io/name: sim-{{ $name }}-tls-creds
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 data:
   {{- $defaultCert := genSignedCert (printf "%s-scheme-adapter" $fullName) nil nil 3650 $ca }}

diff --git a/mojaloop-simulator/templates/service.yaml b/mojaloop-simulator/templates/service.yaml
@@ -6,7 +6,7 @@ kind: Service
 metadata:
   name: {{ $fullName }}-backend
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-backend
+    app.kubernetes.io/name: sim-{{ $name }}-backend
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
    type: ClusterIP
@@ -24,15 +24,15 @@ spec:
        name: testapi
        targetPort: testapi
    selector:
-      app.kubernetes.io/name: {{ $fullName }}-backend
+      app.kubernetes.io/name: sim-{{ $name }}-backend
       app.kubernetes.io/instance: {{ $.Release.Name }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ $fullName }}-scheme-adapter
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
+    app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
    type: ClusterIP
@@ -52,7 +52,7 @@ spec:
        targetPort: testapi
      {{- end }}
    selector:
-      app.kubernetes.io/name: {{ $fullName }}-scheme-adapter
+      app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter
       app.kubernetes.io/instance: {{ $.Release.Name }}
 ---
 {{- if $config.config.cache.enabled }}
@@ -61,7 +61,7 @@ kind: Service
 metadata:
   name: {{ $fullName }}-cache
   labels:
-    app.kubernetes.io/name: {{ $fullName }}-cache
+    app.kubernetes.io/name: sim-{{ $name }}-cache
     {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }}
 spec:
    type: ClusterIP
@@ -71,7 +71,7 @@ spec:
        name: redis
        targetPort: redis
    selector:
-      app.kubernetes.io/name: {{ $fullName }}-cache
+      app.kubernetes.io/name: sim-{{ $name }}-cache
       app.kubernetes.io/instance: {{ $.Release.Name }}
 {{- end }}
 ---