From 8368a53853319bff05a05fcbeb3f561499782901 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:43:14 +0100 Subject: [PATCH 1/6] Make equal to MSR: correct 'license' --- universalmessaging/helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/universalmessaging/helm/values.yaml b/universalmessaging/helm/values.yaml index 339e78c..444f943 100644 --- a/universalmessaging/helm/values.yaml +++ b/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: From 33912f13bd094cae21f231e8ece3cfcf64e1f6a7 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:44:11 +0100 Subject: [PATCH 2/6] Make equal to MSR: correct configMap filename --- microservicesruntime/helm/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservicesruntime/helm/README.md.gotmpl b/microservicesruntime/helm/README.md.gotmpl index 95bd106..a6d046a 100644 --- a/microservicesruntime/helm/README.md.gotmpl +++ b/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= \ +--set-file=license= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... From bcc64d68e3af601224cce4405e0e38b8ba6d5a8d Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:47:15 +0100 Subject: [PATCH 3/6] Make equal to MSR --- universalmessaging/helm/README.md.gotmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/universalmessaging/helm/README.md.gotmpl b/universalmessaging/helm/README.md.gotmpl index b6302e5..1d38929 100644 --- a/universalmessaging/helm/README.md.gotmpl +++ b/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= +kubectl create configmap universalmessaging-license-key --from-file=licensekey= ``` 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= \ +--set-file=license= \ ``` ... 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" . }} From dfcd181138acf135a6c44040edabf471b9924e6d Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:51:48 +0100 Subject: [PATCH 4/6] Make it equal to MSR --- universalmessaging/helm/templates/license.yaml | 2 +- universalmessaging/helm/templates/statefulset.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/universalmessaging/helm/templates/license.yaml b/universalmessaging/helm/templates/license.yaml index 25b8f60..7a41e4b 100644 --- a/universalmessaging/helm/templates/license.yaml +++ b/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 }} \ No newline at end of file diff --git a/universalmessaging/helm/templates/statefulset.yaml b/universalmessaging/helm/templates/statefulset.yaml index 5cae527..1303176 100644 --- a/universalmessaging/helm/templates/statefulset.yaml +++ b/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 From 4c93124c8e0b0bc1130492fd870c4355842f8424 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:53:22 +0100 Subject: [PATCH 5/6] Make license handling equal to MSR --- universalmessaging/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/universalmessaging/helm/Chart.yaml b/universalmessaging/helm/Chart.yaml index d94df82..973d90c 100644 --- a/universalmessaging/helm/Chart.yaml +++ b/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 From 55783c5a3b8ddcb1f574f251c17f85adc4ff5262 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 26 Feb 2024 12:53:38 +0100 Subject: [PATCH 6/6] Make license handling equal to MSR and updating helm/README.me from values.yaml --- microservicesruntime/helm/README.md | 2 +- universalmessaging/helm/README.md | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/microservicesruntime/helm/README.md b/microservicesruntime/helm/README.md index 286d3d9..bcced01 100644 --- a/microservicesruntime/helm/README.md +++ b/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= \ +--set-file=license= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... diff --git a/universalmessaging/helm/README.md b/universalmessaging/helm/README.md index fe4fc03..18ea77d 100644 --- a/universalmessaging/helm/README.md +++ b/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= +kubectl create configmap universalmessaging-license-key --from-file=licensekey= ``` 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= \ +--set-file=license= \ ``` ... 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`. |