Merge pull request #796 from arooshap/new-charts

Making changes to cm.

helm/crabcache/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.6
+version: 0.1.8
 
 # 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

helm/crabcache/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: crabcache-filebeat-config
+  name: '{{ include "crabcache.fullname" . }}-filebeat-config'
   namespace: crab
   labels:
     k8s-app: filebeat
@@ -27,10 +27,10 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: crabcache
+  name: {{ include "crabcache.fullname" . }}
+  namespace: crab
   labels:
     app: crabcache
-  namespace: crab
 data:
   setup-certs-and-run.sh: |
     #!/bin/bash

helm/crabcache/templates/deployment.yaml

@@ -128,7 +128,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: crabcache
+          name: {{ include "crabcache.fullname" .}}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: crabcache-storage
         persistentVolumeClaim:
@@ -150,7 +150,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: crabcache-filebeat-config
+          name: {{ include "crabcache.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

helm/crabserver/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.1
+version: 0.1.2
 
 # 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

helm/crabserver/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: crabserver-filebeat-config
+  name: '{{ include "crabserver.fullname" . }}-filebeat-config'
   namespace: crab
   labels:
     k8s-app: filebeat
@@ -28,7 +28,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: crabserver
+  name: {{ include "crabserver.fullname" . }}
   labels:
     app: crabserver
   namespace: crab

helm/crabserver/templates/deployment.yaml

@@ -134,7 +134,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: crabserver
+          name: {{ include "crabserver.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -153,7 +153,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: crabserver-filebeat-config
+          name: {{ include "crabserver.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

helm/das-mongo-exporter/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.1
+version: 0.1.2
 
 # 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

helm/das-mongo/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.1
+version: 0.1.2
 
 # 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

helm/das-server/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.1
+version: 0.1.2
 
 # 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

helm/das-server/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: das-server-filebeat-config
+  name: '{{ include "das-server.fullname" . }}-filebeat-config'
   namespace: das
   labels:
     k8s-app: filebeat
@@ -29,7 +29,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: das-server-promtail
+  name: {{ include "das-server.fullname" . }}
   labels:
     app: das-server-promtail
   namespace: das

helm/das-server/templates/deployment.yaml

@@ -148,7 +148,7 @@ spec:
           claimName: logs-cephfs-claim-das
       - name: promtail-secrets
         configMap:
-          name: das-server-promtail
+          name: {{ include "das-server.fullname" . }}-promtail 
       - name: varlog
         hostPath:
           path: /var/log
@@ -158,7 +158,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: das-server-filebeat-config
+          name: {{ include "das-server.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}       
       {{- end }}

helm/dbs-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.1
+version: 0.1.2
 
 # 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

helm/dbs-global-r/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-global-r-filebeat-config
+  name: '{{ include "dbs-global-r.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-global-r
+  name: {{ include "dbs-global-r.fullname" . }}
   labels:
     app: dbs-global-r
   namespace: dbs

helm/dbs-global-r/templates/deployment.yaml

@@ -128,7 +128,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-global-r
+          name: {{ include "dbs-global-r.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -147,7 +147,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-global-r-filebeat-config
+          name: {{ include "dbs-global-r.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}       
 {{- end }}

helm/dbs-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.1
+version: 0.1.2
 
 # 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

helm/dbs-global-w/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-global-w-filebeat-config
+  name: '{{ include "dbs-global-w.fullname" .}}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-global-w
+  name: {{ include "dbs-global-w.fullname" . }}
   labels:
     app: dbs-global-w
   namespace: dbs

helm/dbs-global-w/templates/deployment.yaml

@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-global-w
+          name: {{ include "dbs-global-w.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-global-w-filebeat-config
+          name: {{ include "dbs-global-w.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

helm/dbs-migrate/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.1
+version: 0.1.2
 
 # 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

helm/dbs-migrate/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-migrate-filebeat-config
+  name: '{{ include "dbs-migrate.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-migrate
+  name: {{ include "dbs-migrate.fullname" . }}
   labels:
     app: dbs-migrate
   namespace: dbs

helm/dbs-migrate/templates/deployment.yaml

@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-migrate
+          name: {{ include "dbs-migrate.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-migrate-filebeat-config
+          name: {{ include "dbs-migrate.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

helm/dbs-migrate/templates/service.yaml

@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: dbs-migrate
+  name: {{ include "dbs-migrate.fullname" . }}
   namespace: dbs
 spec:
   selector:

helm/dbs-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.1
+version: 0.1.2
 
 # 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

helm/dbs-phys03-r/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-phys03-r-filebeat-config
+  name: '{{ include "dbs-phys03-r.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,7 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-phys03-r
+  name: {{ include "dbs-phys03-r.fullname" . }}
   labels:
     app: dbs-phys03-r
   namespace: dbs

helm/dbs-phys03-r/templates/deployment.yaml

@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-phys03-r
+          name: {{ include "dbs-phys03-r.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-phys03-r-filebeat-config
+          name: {{ include "dbs-phys03-r.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}

helm/dbs-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.1
+version: 0.1.2
 
 # 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

helm/dbs-phys03-w/templates/configMap.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: dbs-phys03-w-filebeat-config
+  name: '{{ include "dbs-phys03-w.fullname" . }}-filebeat-config'
   namespace: dbs
   labels:
     k8s-app: filebeat
@@ -27,7 +27,8 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: dbs-phys03-w
+  name: {{ include "dbs-phys03-w.fullname" . }}
+  namespace: dbs
   labels:
     app: dbs-phys03-w
   namespace: dbs

helm/dbs-phys03-w/templates/deployment.yaml

@@ -132,7 +132,7 @@ spec:
             path: /etc/grid-security
       - name: setup-certs-and-run
         configMap:
-          name: dbs-phys03-w
+          name: {{ include "dbs-phys03-w.fullname" . }}
 {{- if or .Values.environment.prod .Values.environment.preprod }}
       - name: logs
         persistentVolumeClaim:
@@ -151,7 +151,7 @@ spec:
       - name: config
         configMap:
           defaultMode: 0640
-          name: dbs-phys03-w-filebeat-config
+          name: {{ include "dbs-phys03-w.fullname" . }}-filebeat-config
       - name: data
         emptyDir: {}
 {{- end }}