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

Support of Helm Chart common version 1.0.3

developerportal/helm/Chart.yaml

@@ -46,7 +46,7 @@ dependencies:
   repository: "https://open-source.softwareag.com/webmethods-helm-charts/charts"
   tags:
     - softwareag-common
-  version: 1.x.x
+  version: 1.0.3
 - name: prometheus-elasticsearch-exporter
   repository: "https://prometheus-community.github.io/helm-charts"
   tags:

microservicesruntime/helm/Chart.yaml

@@ -25,7 +25,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.4
+version: 1.0.5
 
 # 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
@@ -38,4 +38,4 @@ dependencies:
   repository: "https://open-source.softwareag.com/webmethods-helm-charts/charts"
   tags:
     - softwareag-common
-  version: 1.x.x
+  version: 1.0.2

microservicesruntime/helm/README.md

@@ -109,6 +109,7 @@ helm install wm-msr webmethods/microservicesruntime   \
 | `1.0.2` | Added new option `microservicesruntime.licenseKeyProvided` to allow using images with trial or baked-in license key |
 | `1.0.3` | Make Liveness and Readiness Probes as per current default. Both can now also be overwritten in a custom values file `values.yaml`. |
 | `1.0.4` | Option in `values.yaml` to create a ServiceMonitor added. Some errors in Nginx external LB corrected |
+| `1.0.5` | Value `trustStorePasswordFromSecret` added in `values.yaml` to support common `1.0.2` |
 
 ## Values
 
@@ -161,6 +162,10 @@ helm install wm-msr webmethods/microservicesruntime   \
 | metering.serverUrl | string | `"https://metering.softwareag.cloud/api/measurements"` | The URL of the metering aggregator server REST API. |
 | metering.trustStoreFile | string | `nil` | The absolute path to the metering client truststore that is used for HTTPS connections. Add this value in any of the following cases: *If you use the Software AG Metering Server on premises (via HTTPS) and the certificates in the truststore do not match the certificates configured in Software AG Runtime (CTP). *If you use a metering proxy that terminates the SSL connection to the Metering Server in Software AG Cloud. |
 | metering.trustStorePassword | string | `nil` | The password for the metering client truststore. Configure this property only if you use a truststore. |
+| metering.trustStorePasswordFromSecret | object | `{"enabled":false,"secretKey":"","secretName":""}` | Configuration for secretKeyRef containing the password for the metering client truststore. Configure this property only if you use a truststore. Mutually exclusive with providing the password directly over metering.trustStorePassword. |
+| metering.trustStorePasswordFromSecret.enabled | bool | `false` | enable secretKeyRef instead of providing password directly |
+| metering.trustStorePasswordFromSecret.secretKey | string | `""` | Key containing the truststore password in the referenced secret |
+| metering.trustStorePasswordFromSecret.secretName | string | `""` | Name of the referenced secret |
 | microservicesruntime.diagnosticPort | int | `9999` | Defies diagnostic port |
 | microservicesruntime.httpPort | int | `5555` | Defines administration port |
 | microservicesruntime.httpPortScheme | string | `"HTTP"` | Defines scheme of administration port |

microservicesruntime/helm/README.md.gotmpl

@@ -109,5 +109,6 @@ helm install wm-msr webmethods/microservicesruntime   \
 | `1.0.2` | Added new option `microservicesruntime.licenseKeyProvided` to allow using images with trial or baked-in license key |
 | `1.0.3` | Make Liveness and Readiness Probes as per current default. Both can now also be overwritten in a custom values file `values.yaml`. |
 | `1.0.4` | Option in `values.yaml` to create a ServiceMonitor added. Some errors in Nginx external LB corrected |
+| `1.0.5` | Value `trustStorePasswordFromSecret` added in `values.yaml` to support common `1.0.2` |
 
 {{ template "chart.valuesSection" . }}

microservicesruntime/helm/values.yaml

@@ -331,6 +331,16 @@ metering:
   # -- The password for the metering client truststore.
   # Configure this property only if you use a truststore.
   trustStorePassword:
+  # -- Configuration for secretKeyRef containing the password for the metering client truststore.
+  # Configure this property only if you use a truststore.
+  # Mutually exclusive with providing the password directly over metering.trustStorePassword.
+  trustStorePasswordFromSecret:
+    # -- enable secretKeyRef instead of providing password directly
+    enabled: false
+    # -- Name of the referenced secret
+    secretName: ""
+    # -- Key containing the truststore password in the referenced secret
+    secretKey: ""
 
 # -- Define values for Prometheus Operator to scrap metrics via annotation or ServiceMonitor.
 prometheus:

mywebmethodsserver/helm/Chart.yaml

@@ -27,4 +27,4 @@ dependencies:
   repository: "https://open-source.softwareag.com/webmethods-helm-charts/charts"
   tags:
     - softwareag-common
-  version: 1.x.x
+  version: 1.0.3

terracottabigmemorymax/helm/Chart.yaml

@@ -45,4 +45,4 @@ dependencies:
   repository: "https://open-source.softwareag.com/webmethods-helm-charts/charts"
   tags:
     - softwareag-common
-  version: 1.x.x
+  version: 1.0.3

universalmessaging/helm/Chart.yaml

@@ -37,4 +37,4 @@ dependencies:
   repository: "https://open-source.softwareag.com/webmethods-helm-charts/charts"
   tags:
     - softwareag-common
-  version: 1.x.x
+  version: 1.0.3