Merge pull request #19 from SmartColumbusOS/helm-3-upgrade

Helm 3 Upgrade
UrbanOS-Examples · May 13, 2021 · 0cfe80f · 0cfe80f
2 parents 06782c0 + 247c8eb
commit 0cfe80f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -50,7 +50,6 @@ def deployTo(args = [:]) {
         sh("""#!/bin/bash
             set -xe
 
-            helm init --client-only
             helm upgrade --install kapsch-cmcc-publisher-${location} chart/ \
                 --namespace=vendor-resources \
                 --values=kapsch-cmcc-publisher-base.yaml \

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -19,11 +19,6 @@ spec:
   concurrencyPolicy: Replace
   successfulJobsHistoryLimit: 0
   failedJobsHistoryLimit: 1
-  replicas: {{ $.Values.replicaCount }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: kapsch-cmcc-publisher-{{ $.Values.location }}-{{ $suffix }}
-      app.kubernetes.io/instance: {{ $.Release.Name }}
   jobTemplate:
     spec:
       template:
@@ -80,10 +75,15 @@ metadata:
   name: "{{ $.Values.location }}-unit-placeholder"
 spec:
   replicas: {{ sub $totalUnits $maxUnits }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: kapsch-cmcc-publisher-{{ $.Values.location }}-placeholder
+      app.kubernetes.io/instance: {{ $.Release.Name }}
   template:
     metadata:
       labels:
-        app: "{{ $.Values.location }}-unit-placeholder"
+        app.kubernetes.io/name: kapsch-cmcc-publisher-{{ $.Values.location }}-placeholder
+        app.kubernetes.io/instance: {{ $.Release.Name }}
     spec:
       containers:
       - name: "{{ $.Values.location }}-unit-placeholder"