extraLabels support

developerportal/helm/README.md

@@ -77,6 +77,7 @@ helm install webmethods/developerportal devportal
 | extraContainers | list | `[]` | Extra containers which should run in addition to the main container as a sidecar |
 | extraEnvs | object | `{}` | Exta environment properties to be passed on to the container |
 | extraInitContainers | list | `[]` | Extra init containers that are executed before starting the main container |
+| extraLabels | object | `{}` | Extra Labels |
 | extraVolumeMounts | list | `[]` | Extra volume mounts |
 | extraVolumes | list | `[]` | Exta volumes that should be mounted. |
 | fullnameOverride | string | `""` | Overwrites full workload name. As default, the workload name is release name + '-' + Chart name. |

developerportal/helm/templates/ingress.yaml

@@ -37,6 +37,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

developerportal/helm/templates/service.yaml

@@ -21,7 +21,10 @@ kind: Service
 metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
-    {{ include "common.labels.standard" . | nindent 6 }}
+    {{ include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   clusterIP: None
   ports:

developerportal/helm/templates/statefulset.yaml

@@ -21,7 +21,10 @@ kind: StatefulSet
 metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
-    {{ include "common.labels.standard" . | nindent 6 }}
+    {{ include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   podManagementPolicy: Parallel
   serviceName: {{ include "common.names.fullname" . }}-svc
@@ -34,6 +37,9 @@ spec:
     metadata:
       labels:
         {{- include "common.labels.standard" . | nindent 8 }}
+        {{- with .Values.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
       name: {{ include "common.names.fullname" . }}      
       annotations:
         {{- include "common.prometheus.annotations" (dict "port" .Values.prometheus.port "path" .Values.prometheus.path "scheme" .Values.prometheus.scheme "scrape" .Values.prometheus.scrape ) | nindent 8 }}

developerportal/helm/values.yaml

@@ -110,6 +110,9 @@ tolerations: []
 
 affinity: {}
 
+# -- Extra Labels
+extraLabels: {}
+
 # -- Exta environment properties to be passed on to the container
 extraEnvs: {}
 

microservicesruntime/helm/README.md

@@ -102,6 +102,7 @@ helm install wm-msr webmethods/microservicesruntime   \
 | extraContainers | list | `[]` | Extra containers which should run in addtion to the main container as a sidecar |
 | extraEnvs | list | `[]` | Exta environment properties to be passed on to the microservice runtime |
 | extraInitContainers | list | `[]` | Extra init containers that are executed before starting the main container |
+| extraLabels | object | `{}` | Extra Labels |
 | extraPorts | list | `[]` | Extra Ports to be defined, note: these ports need to be created  |
 | extraVolumeMounts | list | `[]` | Extra volume mounts |
 | extraVolumes | list | `[]` | Exta volumes that should be mounted. |
@@ -141,7 +142,7 @@ helm install wm-msr webmethods/microservicesruntime   \
 | microservicesruntime.httpsPortScheme | string | `"HTTPS"` | Defines scheme of runtime port  |
 | microservicesruntime.installDir | string | `"/opt/softwareag/IntegrationServer"` | Defines installation folder which was using on image creation |
 | microservicesruntime.javaCustomOpts | string | `nil` | list of custom java opts e.g. "-Dmy.prop1=value1" "-Dmy.prop2=value2" |
-| microservicesruntime.licenseConfigMap | string | `"microservicesruntime-license-key"` | Name of config map which contains the license key |
+| microservicesruntime.licenseConfigMap | string | `"microservicesruntime-license-key"` | Name of config map which contains the license key. If you ommit this, it defaults to the release name + microservicesruntime-license.  |
 | microservicesruntime.memoryHeap.max | string | `"512M"` | Maximum of heap memory |
 | microservicesruntime.memoryHeap.min | string | `"512M"` |  |
 | microservicesruntime.properties | object | `{}` | List of application properties which are added into config map in YAML format. See [Integration Server Configuration Variables](https://documentation.softwareag.com/webmethods/integration_server/pie10-15/webhelp/pie-webhelp/index.html#page/pie-webhelp%2Fre-configuration_variables_assets.html) |

microservicesruntime/helm/templates/configmap.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 
 data:
   applicationFile.properties: |

microservicesruntime/helm/templates/deployment.yaml

@@ -23,6 +23,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@@ -42,6 +45,9 @@ spec:
         {{- include "common.prometheus.annotations" (dict "port" .Values.service.port) | nindent 8 }}
       labels:
         {{- include "common.labels.matchLabels" . | nindent 8 }}
+        {{- with .Values.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

microservicesruntime/helm/templates/hpa.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

microservicesruntime/helm/templates/ingress.yaml

@@ -37,6 +37,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

microservicesruntime/helm/templates/job.yaml

@@ -20,6 +20,7 @@
 {{- $fullName := include "common.names.fullname" . -}}
 {{- $labels   := include "common.labels.standard" . -}}
 {{- $imagePullSecrets := .Values.imagePullSecrets -}}
+{{- $extraLabels      := .Values.extraLabels      -}}
 {{- $context := . }}
 
 {{- range $job := .Values.jobs }}
@@ -30,6 +31,9 @@ metadata:
   name: {{ $fullName }}-{{ $job.name }}
   labels:
     {{- $labels | nindent 4 }}
+    {{- with $extraLabels }}
+      {{- toYaml $extraLabels | nindent 4 }}
+    {{- end }}
   {{- with $job.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -43,6 +47,9 @@ spec:
           name: {{ $fullName }}-{{ $job.name }}
           labels:
             {{- $labels | nindent 12 }}
+            {{- with $extraLabels }}
+              {{- toYaml $extraLabels | nindent 12 }}
+            {{- end }}
         spec:
           {{- if hasKey $job "serviceAccount" }}
           {{- if hasKey $job.serviceAccount "name" }}
@@ -124,6 +131,9 @@ spec:
       name: {{ $fullName }}-{{ $job.name }}
       labels:
         {{- $labels | nindent 8 }}
+        {{- with $extraLabels }}
+          {{- toYaml $extraLabels | nindent 8 }}
+         {{- end }}
     spec:
       {{- if hasKey $job "serviceAccount" }}
       {{- if hasKey $job.serviceAccount "name" }}

microservicesruntime/helm/templates/license.yaml

@@ -25,6 +25,9 @@ metadata:
   name: {{ include "microservicesruntime.licenseConfigMapName"  . }}
   labels:  
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
     helm.sh/resource-policy: keep
 data:

microservicesruntime/helm/templates/nginx-configmap.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}-nginx
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 
 data:
   nginx.conf: |

microservicesruntime/helm/templates/nginx-deployment.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}-nginx
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 
 spec:
   replicas: 1
@@ -40,6 +43,9 @@ spec:
       creationTimestamp: null
       labels:
         {{- include "common.labels.standard" . | nindent 8 }}-nginx
+        {{- with .Values.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       containers:
       - name: nginx

microservicesruntime/helm/templates/nginx-svc.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}-nginx
   labels: 
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 
 spec:
   type: {{ .Values.service.type }}

microservicesruntime/helm/templates/pvc.yaml

@@ -25,6 +25,9 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.persistence.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

microservicesruntime/helm/templates/service.yaml

@@ -23,6 +23,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

microservicesruntime/helm/templates/serviceaccount.yaml

@@ -24,6 +24,9 @@ metadata:
   name: {{ include "common.names.serviceAccountName" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

microservicesruntime/helm/templates/servicemonitor.yaml

@@ -24,6 +24,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
   - targetPort: {{ .Values.microservicesruntime.adminPort }} 

microservicesruntime/helm/values.yaml

@@ -29,6 +29,9 @@ fullnameOverride: ""
 # -- The name of the main container, by default this will be msr-<release_name>
 containerName: 
 
+# -- Extra Labels
+extraLabels: {}
+
 # -- Exta volumes that should be mounted.
 extraVolumes: []
 # - name: extras

mywebmethodsserver/helm/README.md

@@ -52,6 +52,7 @@ helm install wm-mws microservicesruntime
 | extraContainers | string | `nil` | Extra containers which should run in addtion to the main container as a sidecar - name: do-something   image: busybox   command: ['do', 'something'] |
 | extraEnvs | object | `{}` | Exta environment properties to be passed on to the MyWebMethods Server |
 | extraInitContainers | list | `[]` | Extra init containers that are executed before starting the main container - name: do-something   image: busybox   command: ['do', 'something'] |
+| extraLabels | object | `{}` | Extra Labels |
 | extraVolumeClaimTemplates | list | `[]` | Exta volumes that should be mounted. Example:    - metadata:        name: shared-volume      spec:        accessModes: ["ReadWriteMany"]        storageClassName: nfs        resources:          requests:            storage: 10 |
 | extraVolumeMounts | list | `[]` | Extra volume mounts - name: extras   mountPath: /usr/share/extras   readOnly: true |
 | fullnameOverride | string | `""` | Overwrites full workload name. As default, the workload name is release name + '-' + Chart name. |

mywebmethodsserver/helm/templates/hpa.yaml

@@ -23,6 +23,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1

mywebmethodsserver/helm/templates/ingress.yaml

@@ -37,6 +37,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

mywebmethodsserver/helm/templates/service.yaml

@@ -22,6 +22,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

mywebmethodsserver/helm/templates/statefulset.yaml

@@ -22,6 +22,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
@@ -39,6 +42,9 @@ spec:
         {{- end }}
       labels:
         {{- include "common.labels.matchLabels" . | nindent 8 }}
+        {{- with .Values.extraLabels -}}
+        {{ toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

mywebmethodsserver/helm/values.yaml

@@ -19,6 +19,9 @@ fullnameOverride: ""
 serviceAccount:
   create: false
 
+# -- Extra Labels for API Gateway
+extraLabels: {}
+
 # -- Exta environment properties to be passed on to the MyWebMethods Server
 extraEnvs: {}
 

universalmessaging/helm/README.md

@@ -49,6 +49,7 @@ helm install um webmethods/universalmessaging
 | extraContainers | list | `[]` | Extra containers which should run in addition to the main container as a sidecar |
 | extraEnvs | object | `{}` | Exta environment properties to be passed on to the container |
 | extraInitContainers | list | `[]` | Extra init containers that are executed before starting the main container |
+| extraLabels | object | `{}` | Extra Labels |
 | extraVolumeMounts | list | `[]` | Extra volume mounts |
 | extraVolumes | list | `[]` | Exta volumes that should be mounted. |
 | fullnameOverride | string | `""` | Overwrites full workload name. As default, the workload name is release name + '-' + Chart name. |

universalmessaging/helm/templates/configmap.yaml

@@ -23,6 +23,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
 data:
 {{ if .Values.customServerConfig.content }}
   Custom_Server_Common.conf: |

universalmessaging/helm/templates/ingress.yaml

@@ -37,6 +37,9 @@ metadata:
   name: {{ $fullName }}
   labels:
     {{- include "common.labels.standard" . | nindent 4 }}
+    {{- with .Values.extraLabels -}}
+    {{ toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}