From adc8e935e1af6f069728feb3a099ffb7efc73b24 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 11:09:41 +0100 Subject: [PATCH 01/11] change to EN --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfb8d16..c7250ce 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Each chart has a README for *how to use* and lists some prerequisites. ## Chart Versions -Per default, Helm uses the latest version on release installation. If you have successfully installed a webMethods release, you should notice the current used Chart version. Therefore, on further release installation oder upgrades (with `helm upgrade --install`) you should use the `--version X.Y.Z` to guarantee that the same is installed everywhere. +Per default, Helm uses the latest version on release installation. If you have successfully installed a webMethods release, you should notice the current used Chart version. Therefore, on further release installation or upgrades (with `helm upgrade --install`) you should use the `--version X.Y.Z` to guarantee that the same is installed everywhere. ## Utilities From 90763f871eff056e81a63319e4087bc926aa75c9 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 14:50:07 +0100 Subject: [PATCH 02/11] 'imagePullSecrets[0].name --- microservicesruntime/helm/README.md.gotmpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/microservicesruntime/helm/README.md.gotmpl b/microservicesruntime/helm/README.md.gotmpl index 2f9428c..e44fca8 100644 --- a/microservicesruntime/helm/README.md.gotmpl +++ b/microservicesruntime/helm/README.md.gotmpl @@ -63,12 +63,18 @@ Install release with pulling image and setting secret (to pull image) ... helm install wm-msr webmethods/microservicesruntime \ ``` -... (optionally) provide the license key at installation time (can be ommitted for upgrade later) +... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ... ```shell --set-file=licensekey= ``` +... set your own image pull secret if you didn't create the default `regcred` ... + +```shell +--set "imagePullSecrets[0].name=your-registry-credentials" +``` + ... Ingress is enabled per default. Define Ingress service host ... ```shell From df2c201aa6f21fa23e0ab3682210641a8c2855c3 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 14:51:00 +0100 Subject: [PATCH 03/11] 'imagePullSecrets[0].name and updating helm/README.me from values.yaml --- microservicesruntime/helm/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/microservicesruntime/helm/README.md b/microservicesruntime/helm/README.md index 1a4d131..6a17167 100644 --- a/microservicesruntime/helm/README.md +++ b/microservicesruntime/helm/README.md @@ -63,12 +63,18 @@ Install release with pulling image and setting secret (to pull image) ... helm install wm-msr webmethods/microservicesruntime \ ``` -... (optionally) provide the license key at installation time (can be ommitted for upgrade later) +... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ... ```shell --set-file=licensekey= ``` +... set your own image pull secret if you didn't create the default `regcred` ... + +```shell +--set "imagePullSecrets[0].name=your-registry-credentials" +``` + ... Ingress is enabled per default. Define Ingress service host ... ```shell From 82e3d2717e3aa8b48c8c5327cd98014da69737c1 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 16:34:40 +0100 Subject: [PATCH 04/11] install LK at installation time support --- .../helm/templates/license.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 universalmessaging/helm/templates/license.yaml diff --git a/universalmessaging/helm/templates/license.yaml b/universalmessaging/helm/templates/license.yaml new file mode 100644 index 0000000..7a41e4b --- /dev/null +++ b/universalmessaging/helm/templates/license.yaml @@ -0,0 +1,36 @@ +{{ if .Values.license }} +--- +# /* +# * Copyright (c) 2021 Software AG, Darmstadt, Germany and/or its licensors +# * +# * SPDX-License-Identifier: Apache-2.0 +# * +# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# * +# * http://www.apache.org/licenses/LICENSE-2.0 +# * +# * Unless required by applicable law or agreed to in writing, software +# * distributed under the License is distributed on an "AS IS" BASIS, +# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# * See the License for the specific language governing permissions and +# * limitations under the License. +# * +# */ + +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Values.licenseConfigMap }} + labels: + {{- include "common.labels.standard" . | nindent 4 }} + {{- with .Values.extraLabels -}} + {{ toYaml . | nindent 4 }} + {{- end }} + annotations: + helm.sh/resource-policy: keep +data: + licensekey: + {{ .Values.license | toYaml | nindent 4 }} +{{- end }} \ No newline at end of file From 5bff3bb8a3e9c574e096a3eed94b59f90389431f Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 16:35:33 +0100 Subject: [PATCH 05/11] 'license' and usage docu increased --- universalmessaging/helm/README.md.gotmpl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/universalmessaging/helm/README.md.gotmpl b/universalmessaging/helm/README.md.gotmpl index 3b65066..5b2d5f9 100644 --- a/universalmessaging/helm/README.md.gotmpl +++ b/universalmessaging/helm/README.md.gotmpl @@ -22,6 +22,8 @@ Hence before running `helm install` create the configmap: kubectl create configmap universalmessaging-licence-key --from-file=licence.xml= ``` +Optionally you can also provide the license directly when installing your release (see also below). + ## Examples for Use-cases Sub-folder `examples` contains some *values* examples for more use-cases. To use the use-case, adapt and add the provided `values.yaml` to your values. @@ -38,6 +40,18 @@ Install release helm install um webmethods/universalmessaging ``` +... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ... + +```shell +--set-file=licensekey= +``` + +... set your own image pull secret if you didn't create the default `regcred` ... + +```shell +--set "imagePullSecrets[0].name=your-registry-credentials" +``` + ## Version History | Version | Changes and Description | From aba6a156ebb401a9708678fc902ed4a9198e4b92 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 16:35:46 +0100 Subject: [PATCH 06/11] 'license' and usage docu increased and updating helm/README.me from values.yaml --- universalmessaging/helm/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/universalmessaging/helm/README.md b/universalmessaging/helm/README.md index 2f50ef9..44c8926 100644 --- a/universalmessaging/helm/README.md +++ b/universalmessaging/helm/README.md @@ -22,6 +22,8 @@ Hence before running `helm install` create the configmap: kubectl create configmap universalmessaging-licence-key --from-file=licence.xml= ``` +Optionally you can also provide the license directly when installing your release (see also below). + ## Examples for Use-cases Sub-folder `examples` contains some *values* examples for more use-cases. To use the use-case, adapt and add the provided `values.yaml` to your values. @@ -38,6 +40,18 @@ Install release helm install um webmethods/universalmessaging ``` +... (optionally) provide the license key at installation time (can be ommitted for upgrade later) ... + +```shell +--set-file=licensekey= +``` + +... set your own image pull secret if you didn't create the default `regcred` ... + +```shell +--set "imagePullSecrets[0].name=your-registry-credentials" +``` + ## Version History | Version | Changes and Description | From 7f23f3824676602961e0accfdc5459d6abe685fe Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 17:38:35 +0100 Subject: [PATCH 07/11] Unix continue char added --- microservicesruntime/helm/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microservicesruntime/helm/README.md b/microservicesruntime/helm/README.md index 6a17167..2ff4737 100644 --- a/microservicesruntime/helm/README.md +++ b/microservicesruntime/helm/README.md @@ -66,13 +66,13 @@ 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=licensekey= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... ```shell ---set "imagePullSecrets[0].name=your-registry-credentials" +--set "imagePullSecrets[0].name=your-registry-credentials" \ ``` ... Ingress is enabled per default. Define Ingress service host ... From 440b236b1da487e512545f8060d8d860f80ede0d Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 17:41:23 +0100 Subject: [PATCH 08/11] shell continues char added --- microservicesruntime/helm/README.md.gotmpl | 4 ++-- universalmessaging/helm/README.md.gotmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/microservicesruntime/helm/README.md.gotmpl b/microservicesruntime/helm/README.md.gotmpl index e44fca8..1694d57 100644 --- a/microservicesruntime/helm/README.md.gotmpl +++ b/microservicesruntime/helm/README.md.gotmpl @@ -66,13 +66,13 @@ 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=licensekey= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... ```shell ---set "imagePullSecrets[0].name=your-registry-credentials" +--set "imagePullSecrets[0].name=your-registry-credentials" \ ``` ... Ingress is enabled per default. Define Ingress service host ... diff --git a/universalmessaging/helm/README.md.gotmpl b/universalmessaging/helm/README.md.gotmpl index 5b2d5f9..40c10c3 100644 --- a/universalmessaging/helm/README.md.gotmpl +++ b/universalmessaging/helm/README.md.gotmpl @@ -43,13 +43,13 @@ 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=licensekey= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... ```shell ---set "imagePullSecrets[0].name=your-registry-credentials" +--set "imagePullSecrets[0].name=your-registry-credentials" \ ``` ## Version History From caea4d6105dd2b44b5a9f83c0dbddac5ae49e8b7 Mon Sep 17 00:00:00 2001 From: thr Date: Mon, 11 Dec 2023 17:41:55 +0100 Subject: [PATCH 09/11] shell continues char added and updating helm/README.me from values.yaml --- universalmessaging/helm/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/universalmessaging/helm/README.md b/universalmessaging/helm/README.md index 44c8926..98f54dd 100644 --- a/universalmessaging/helm/README.md +++ b/universalmessaging/helm/README.md @@ -43,13 +43,13 @@ 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=licensekey= \ ``` ... set your own image pull secret if you didn't create the default `regcred` ... ```shell ---set "imagePullSecrets[0].name=your-registry-credentials" +--set "imagePullSecrets[0].name=your-registry-credentials" \ ``` ## Version History From 5c50720f16934007636f612b13126fa3b7767601 Mon Sep 17 00:00:00 2001 From: thr Date: Tue, 12 Dec 2023 13:18:38 +0100 Subject: [PATCH 10/11] job name must be small char --- microservicesruntime/examples/process-engine/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservicesruntime/examples/process-engine/values.yaml b/microservicesruntime/examples/process-engine/values.yaml index 1b64100..1920ea9 100644 --- a/microservicesruntime/examples/process-engine/values.yaml +++ b/microservicesruntime/examples/process-engine/values.yaml @@ -172,7 +172,7 @@ microservicesruntime: jobs: # -- Create PE topics in UM on Helm post-install hook -- name: deploy-PE-assets-to-um +- name: deploy-pe-assets-to-um annotations: "helm.sh/hook": post-install "helm.sh/hook-weight": "0" From fc513a8d459b8af71c9a1d422d56b7907583a91e Mon Sep 17 00:00:00 2001 From: thr Date: Tue, 12 Dec 2023 17:12:51 +0100 Subject: [PATCH 11/11] using POST a JSON document to synch --- microservicesruntime/examples/msr-push-doc-types/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microservicesruntime/examples/msr-push-doc-types/values.yaml b/microservicesruntime/examples/msr-push-doc-types/values.yaml index 8785fc9..a84de2a 100644 --- a/microservicesruntime/examples/msr-push-doc-types/values.yaml +++ b/microservicesruntime/examples/msr-push-doc-types/values.yaml @@ -34,5 +34,5 @@ jobs: for dt in ${pusdDTs}; do echo Pushing [${dt}] ...; - curl -s -u "Administrator:${ADMIN_PASSWORD}" -H "Content-Type: application/json" "${DEPLOYMENT}:5555/invoke/pub.publish:syncToProvider?documentTypes[0]=${dt}" | jq '.'; + curl -X POST -s -u "Administrator:${ADMIN_PASSWORD}" -H "Content-Type: application/json" "${DEPLOYMENT}:5555/invoke/pub.publish:syncToProvider" -d "{ \"documentTypes\": [\"${dt}\"] }" | jq '.'; done; \ No newline at end of file