Merge pull request #1280 from arooshap/helm-update

Some more changes to helm charts after the removal of helpers.tpl and some chart version upgrades to remove the persistent error messages.
dmwm · Dec 13, 2022 · 8f783e8 · 8f783e8
2 parents 4696b3a + 11ce5b6
commit 8f783e8
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 49 deletions.
diff --git a/helm/dbs2go-global-r/Chart.yaml b/helm/dbs2go-global-r/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/dbs2go-global-r/templates/deployment.yaml b/helm/dbs2go-global-r/templates/deployment.yaml
@@ -2,9 +2,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dbs2go-global-r.fullname" . }}
+  name: dbs2go-global-r
   labels:
-    {{- include "dbs2go-global-r.labels" . | nindent 4 }}
+    app: dbs2go-global-r
   namespace: dbs
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -16,23 +16,22 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "dbs2go-global-r.selectorLabels" . | nindent 6 }}
+      app: dbs2go-global-r
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "dbs2go-global-r.selectorLabels" . | nindent 8 }}
+        app: dbs2go-global-r
         env: k8s-{{.Values.environment}}
         job: dbs2go-global-r
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      #serviceAccountName: {{ include "dbs2go-global-r.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

diff --git a/helm/dbs2go-global-r/templates/service.yaml b/helm/dbs2go-global-r/templates/service.yaml
@@ -1,9 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "dbs2go-global-r.fullname" . }}
-  labels:
-    {{- include "dbs2go-global-r.labels" . | nindent 4 }}
+  name: dbs2go-global-r
+  namespace: dbs
 spec:
   selector:
     app: dbs2go-global-r

diff --git a/helm/dbs2go-global-w/Chart.yaml b/helm/dbs2go-global-w/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/dbs2go-global-w/templates/deployment.yaml b/helm/dbs2go-global-w/templates/deployment.yaml
@@ -2,9 +2,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dbs2go-global-w.fullname" . }}
+  name: dbs2go-global-w
   labels:
-    {{- include "dbs2go-global-w.labels" . | nindent 4 }}
+    app: dbs2go-global-w
   namespace: dbs
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -16,23 +16,22 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "dbs2go-global-w.selectorLabels" . | nindent 6 }}
+      app: dbs2go-global-w
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "dbs2go-global-w.selectorLabels" . | nindent 8 }}
+        app: dbs2go-global-w
         env: k8s-{{.Values.environment}}
         job: dbs2go-global-w
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "dbs2go-global-w.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

diff --git a/helm/dbs2go-global-w/templates/service.yaml b/helm/dbs2go-global-w/templates/service.yaml
@@ -1,9 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "dbs2go-global-w.fullname" . }}
-  labels:
-    {{- include "dbs2go-global-w.labels" . | nindent 4 }}
+  name: dbs2go-global-w
+  namespace: dbs
 spec:
   selector:
     app: dbs2go-global-w

diff --git a/helm/dbs2go-phys03-r/Chart.yaml b/helm/dbs2go-phys03-r/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/dbs2go-phys03-r/templates/deployment.yaml b/helm/dbs2go-phys03-r/templates/deployment.yaml
@@ -2,9 +2,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dbs2go-phys03-r.fullname" . }}
+  name: dbs2go-phys03-r
   labels:
-    {{- include "dbs2go-phys03-r.labels" . | nindent 4 }}
+    app: dbs2go-phys03-r
   namespace: dbs
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -16,23 +16,22 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "dbs2go-phys03-r.selectorLabels" . | nindent 6 }}
+      app: dbs2go-phys03-r
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "dbs2go-phys03-r.selectorLabels" . | nindent 8 }}
+        app: dbs2go-phys03-r
         env: k8s-{{.Values.environment}}
         job: dbs2go-phys03-r
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "dbs2go-phys03-r.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
@@ -108,6 +107,12 @@ spec:
       - name: proxy-secrets
         secret:
           secretName: proxy-secrets
+      - name: robot-secrets
+        secret:
+          secretName: robot-secrets
+      - name: hmac-secrets
+        secret:
+          secretName: hmac-secrets
       - name: secrets
         secret:
           secretName: dbs2go-phys03-r-secrets
@@ -117,18 +122,6 @@ spec:
       - name: token-secrets
         secret:
           secretName: token-secrets   
-      - name: robot-secrets
-        secret:
-          secretName: robot-secrets
-      - name: hmac-secrets
-        secret:
-          secretName: hmac-secrets
-      - name: etc-grid-security
-        hostPath:
-            path: /etc/grid-security
-      - name: setup-certs-and-run
-        configMap:
-          name: {{ include "dbs2go-phys03-r.fullname" . }}
       {{- if or (eq (toString $environment) "prod") (eq (toString $environment) "preprod") }}
       - name: logs
         persistentVolumeClaim:

diff --git a/helm/dbs2go-phys03-r/templates/service.yaml b/helm/dbs2go-phys03-r/templates/service.yaml
@@ -1,9 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "dbs2go-phys03-r.fullname" . }}
-  labels:
-    {{- include "dbs2go-phys03-r.labels" . | nindent 4 }}
+  name: dbs2go-phys03-r
+  namespace: dbs
 spec:
   selector:
     app: dbs2go-phys03-r

diff --git a/helm/dbs2go-phys03-w/Chart.yaml b/helm/dbs2go-phys03-w/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/helm/dbs2go-phys03-w/templates/deployment.yaml b/helm/dbs2go-phys03-w/templates/deployment.yaml
@@ -2,9 +2,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "dbs2go-phys03-w.fullname" . }}
+  name: dbs2go-phys03-w
   labels:
-    {{- include "dbs2go-phys03-w.labels" . | nindent 4 }}
+    app: dbs2go-phys03-w
   namespace: dbs
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -16,23 +16,22 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "dbs2go-phys03-w.selectorLabels" . | nindent 6 }}
+      app: dbs2go-phys03-w
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "dbs2go-phys03-w.selectorLabels" . | nindent 8 }}
+        app: dbs2go-phys03-w
         env: k8s-{{.Values.environment}}
         job: dbs2go-phys03-w
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "dbs2go-phys03-w.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

diff --git a/helm/dbs2go-phys03-w/templates/service.yaml b/helm/dbs2go-phys03-w/templates/service.yaml
@@ -1,9 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "dbs2go-phys03-w.fullname" . }}
-  labels:
-    {{- include "dbs2go-phys03-w.labels" . | nindent 4 }}
+  name: dbs2go-phys03-w
+  namespace: dbs
 spec:
   selector:
     app: dbs2go-phys03-w

diff --git a/helm/dbs2go/Chart.yaml b/helm/dbs2go/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to