Merge pull request #49 from SoftwareAG/dev-msr-thr

Make license file handling equal to MSR

microservicesruntime/helm/README.md

@@ -72,7 +72,7 @@ helm install wm-msr webmethods/microservicesruntime   \
 ... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ...
 
 ```shell
---set-file=licensekey=<your path and filename to Microservices Runtime license file> \
+--set-file=license=<your path and filename to Microservices Runtime license file> \
 ```
 
 ... set your own image pull secret if you didn't create the default `regcred` ...

microservicesruntime/helm/README.md.gotmpl

@@ -72,7 +72,7 @@ helm install wm-msr webmethods/microservicesruntime   \
 ... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ...
 
 ```shell
---set-file=licensekey=<your path and filename to Microservices Runtime license file> \
+--set-file=license=<your path and filename to Microservices Runtime license file> \
 ```
 
 ... set your own image pull secret if you didn't create the default `regcred` ... 

universalmessaging/helm/Chart.yaml

@@ -24,7 +24,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: 1.0.2
+version: 1.0.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

universalmessaging/helm/README.md

@@ -19,7 +19,7 @@ Universal Messaging requires a license file. These license is supposed to be pro
 Hence before running `helm install` create the configmap:
 
 ```
-kubectl create configmap universalmessaging-licence-key --from-file=licence.xml=<your path and filename to Universal Messaging license file>
+kubectl create configmap universalmessaging-license-key --from-file=licensekey=<your path and filename to Universal Messaging license file>
 ```
 
 Optionally you can also provide the license directly when installing your release (see also below).
@@ -43,7 +43,7 @@ helm install um webmethods/universalmessaging
 ... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ...
 
 ```shell
---set-file=licensekey=<your path and filename to Universal Messaging license file> \
+--set-file=license=<your path and filename to Universal Messaging license file> \
 ```
 
 ... set your own image pull secret if you didn't create the default `regcred` ...
@@ -59,6 +59,7 @@ helm install um webmethods/universalmessaging
 | `1.0.0` | Initial release |
 | `1.0.1` | Update JMX Exporter configuration file from latest [UM Git repository](https://github.com/SoftwareAG/universalmessaging-prometheus-jmx-exporter-config). Bugfix: Mount configuration files into container. Nginx added. |
 | `1.0.2` | Change startup, liveness and readiness probes. All configuration settings are in `values.yaml`. Now, The probes are using `httpGet` instead of `runUMTool.sh` utility. |
+| `1.0.3` | Make license file handling same as MSR |
 
 ## Values
 
@@ -92,7 +93,7 @@ helm install um webmethods/universalmessaging
 | ingress.hosts[0].paths[0].port | int | `9000` | Port of service |
 | ingress.tls | list | `[]` | TLS of Ingress |
 | license | string | `""` | Import the content as license key and create a ConfigMap named by `licenseConfigMap` value. You can copy/past the content of your provided license key file here.   |
-| licenseConfigMap | string | `"universalmessaging-licence-key"` | Name of the licence config map |
+| licenseConfigMap | string | `"universalmessaging-license-key"` | Name of the licence config map |
 | lifecycle | object | `{}` | lifecycle hooks to execute on preStop / postStart,... |
 | livenessProbe | object | `{"failureThreshold":3,"httpGet":{"path":"/health/","port":9000},"initialDelaySeconds":0,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":30}` | Configure liveness probe |
 | nameOverride | string | `""` | Overwrites Chart name of release name in workload name. As default, the workload name is release name + '-' + Chart name. The workload name is at the end release name + '-' + value of `nameOverride`. |

universalmessaging/helm/README.md.gotmpl

@@ -19,7 +19,7 @@ Universal Messaging requires a license file. These license is supposed to be pro
 Hence before running `helm install` create the configmap:
 
 ```
-kubectl create configmap universalmessaging-licence-key --from-file=licence.xml=<your path and filename to Universal Messaging license file>
+kubectl create configmap universalmessaging-license-key --from-file=licensekey=<your path and filename to Universal Messaging license file>
 ```
 
 Optionally you can also provide the license directly when installing your release (see also below).
@@ -43,7 +43,7 @@ helm install um webmethods/universalmessaging
 ... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ...
 
 ```shell
---set-file=licensekey=<your path and filename to Universal Messaging license file> \
+--set-file=license=<your path and filename to Universal Messaging license file> \
 ```
 
 ... set your own image pull secret if you didn't create the default `regcred` ... 
@@ -59,5 +59,6 @@ helm install um webmethods/universalmessaging
 | `1.0.0` | Initial release |
 | `1.0.1` | Update JMX Exporter configuration file from latest [UM Git repository](https://github.com/SoftwareAG/universalmessaging-prometheus-jmx-exporter-config). Bugfix: Mount configuration files into container. Nginx added. |
 | `1.0.2` | Change startup, liveness and readiness probes. All configuration settings are in `values.yaml`. Now, The probes are using `httpGet` instead of `runUMTool.sh` utility. |
+| `1.0.3` | Make license file handling same as MSR |
 
 {{ template "chart.valuesSection" . }}

universalmessaging/helm/templates/license.yaml

@@ -31,6 +31,6 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
 data:
-  licence.xml:
+  licensekey:
     {{ .Values.license | toYaml | nindent 4 }}
 {{- end }}

universalmessaging/helm/templates/statefulset.yaml

@@ -58,6 +58,9 @@ spec:
           configMap:
             name: {{ .Values.licenseConfigMap }}            
             defaultMode: 420
+            items:
+            - key:  licensekey
+              path: licenseKey.xml
         - name: jmx-exporter-config
           configMap:
             name: {{ include "common.names.fullname" . }}
@@ -105,7 +108,8 @@ spec:
           - name: configuration
             mountPath: /opt/softwareag/common/conf
           - name: licence-xml
-            mountPath: /opt/softwareag/UniversalMessaging/server/umserver/licence/
+            mountPath: /opt/softwareag/UniversalMessaging/server/umserver/licence/licence.xml
+            subPath:   licence.xml
           - name: jmx-exporter-config
             mountPath: /opt/softwareag/UniversalMessaging/server/umserver/bin/jmx_sag_um_exporter.yaml
             subPath:   jmx_sag_um_exporter.yaml

universalmessaging/helm/values.yaml

@@ -15,7 +15,7 @@ image:
   tag: "10.15"
 
 # -- Name of the licence config map
-licenseConfigMap: "universalmessaging-licence-key"
+licenseConfigMap: "universalmessaging-license-key"
 
 # -- Image pull secret reference. By default looks for `regcred`.
 imagePullSecrets: