From 84cafa7f0b65832c719a09569fd992d1d34e11ff Mon Sep 17 00:00:00 2001 From: Aron Kaufmann <100943793+AronKa-SAG@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:24:27 +0200 Subject: [PATCH] fixed values name for secretKeyRef in Metering (#91) * renamed trustStorePasswordFromSecret for alignment * version 1.0.2 common version 1.2.6 apigw --- apigateway/helm/Chart.yaml | 2 +- apigateway/helm/README.md | 8 ++++---- apigateway/helm/values.yaml | 2 +- common/helm/Chart.yaml | 2 +- common/helm/templates/_metering.tpl | 8 +++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apigateway/helm/Chart.yaml b/apigateway/helm/Chart.yaml index 67fb9de..d50370e 100644 --- a/apigateway/helm/Chart.yaml +++ b/apigateway/helm/Chart.yaml @@ -33,7 +33,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.2.5 +version: 1.2.6 # 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 diff --git a/apigateway/helm/README.md b/apigateway/helm/README.md index 2fdff3c..e2c8f45 100644 --- a/apigateway/helm/README.md +++ b/apigateway/helm/README.md @@ -361,10 +361,10 @@ Sub-folder `examples` contains some *values* examples for more use-cases. To use | 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 | +| 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 | | 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`. | | nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml index fdeac77..5c514c6 100644 --- a/apigateway/helm/values.yaml +++ b/apigateway/helm/values.yaml @@ -495,7 +495,7 @@ metering: # -- 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: + trustStorePasswordFromSecret: # -- enable secretKeyRef instead of providing password directly enabled: false # -- Name of the referenced secret diff --git a/common/helm/Chart.yaml b/common/helm/Chart.yaml index 96bf832..55ffd77 100644 --- a/common/helm/Chart.yaml +++ b/common/helm/Chart.yaml @@ -38,4 +38,4 @@ name: common sources: - https://github.com/softwareag/webmethods-helm-charts type: library -version: 1.0.1 \ No newline at end of file +version: 1.0.2 \ No newline at end of file diff --git a/common/helm/templates/_metering.tpl b/common/helm/templates/_metering.tpl index 33264fa..23cb96b 100644 --- a/common/helm/templates/_metering.tpl +++ b/common/helm/templates/_metering.tpl @@ -27,15 +27,13 @@ Usage: value: "{{ .Values.metering.logLevel }}" - name: "METERING_TRUSTSTORE_FILE" value: "{{ .Values.metering.trustStoreFile }}" -{{- if .Values.metering.truststorePasswordFromSecret.enabled -}} - name: "METERING_TRUSTSTORE_PASSWORD" +{{- if .Values.metering.trustStorePasswordFromSecret.enabled -}} valueFrom: secretKeyRef: - name: {{ .Values.metering.truststorePasswordFromSecret.secretName }} - key: {{ .Values.metering.truststorePasswordFromSecret.secretKey }} + name: "{{ .Values.metering.trustStorePasswordFromSecret.secretName }}" + key: "{{ .Values.metering.trustStorePasswordFromSecret.secretKey }}" {{- else -}} -- name: "METERING_TRUSTSTORE_PASSWORD" value: "{{ .Values.metering.trustStorePassword }}" {{- end -}} -{{- end -}} {{- end }} \ No newline at end of file