From b15ae7067627ba273aeb61af83998420d28f666b Mon Sep 17 00:00:00 2001 From: thr Date: Tue, 17 Sep 2024 16:44:44 +0200 Subject: [PATCH] ConfigMap support implementation added --- developerportal/helm/README.md.gotmpl | 2 +- .../helm/templates/configmaps-extra.yaml | 46 +++++++++++++++++++ mywebmethodsserver/helm/README.md.gotmpl | 2 +- .../helm/templates/configmaps-extra.yaml | 46 +++++++++++++++++++ 4 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 developerportal/helm/templates/configmaps-extra.yaml create mode 100644 mywebmethodsserver/helm/templates/configmaps-extra.yaml diff --git a/developerportal/helm/README.md.gotmpl b/developerportal/helm/README.md.gotmpl index ab75747..e20d62a 100644 --- a/developerportal/helm/README.md.gotmpl +++ b/developerportal/helm/README.md.gotmpl @@ -48,6 +48,6 @@ helm install webmethods/developerportal devportal | `1.0.0` | Initial release | | `1.0.1` | Supports wM version 11.0. Validate `devportal.port` value in `values.yaml` if you want to use wM image version 11.0. | | `1.0.2` | `tpl` function support in `affinity` value added. `topologySpreadConstraints` support added. | -| `1.0.3` | `priorityClassName` support added. Error is corrected on using value `useDefaultAffinityRule == true`. Now, the release name is used in condition with `app.kubernetes.io/instance`. `affinity` and `topologySpreadConstraints` support added for Elasticsearch. | +| `1.0.3` | `priorityClassName` support added. Error is corrected on using value `useDefaultAffinityRule == true`. Now, the release name is used in condition with `app.kubernetes.io/instance`. `affinity` and `topologySpreadConstraints` support added for Elasticsearch. Implementation of `extraConfigMaps` added. | {{ template "chart.valuesSection" . }} diff --git a/developerportal/helm/templates/configmaps-extra.yaml b/developerportal/helm/templates/configmaps-extra.yaml new file mode 100644 index 0000000..5976220 --- /dev/null +++ b/developerportal/helm/templates/configmaps-extra.yaml @@ -0,0 +1,46 @@ +{{ range .Values.extraConfigMaps }} +--- +# /* +# * Copyright (c) 2023 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: {{ .name }} + labels: + {{- include "common.labels.standard" $ | nindent 4 }} + {{- with $.Values.extraLabels }} + {{ toYaml . | nindent 4 }} + {{- end }} +{{- if .binaryData }} +binaryData: + {{- range $key, $val := .binaryData }} + {{ $key }}: {{ $val | b64enc }} + {{- end }} +{{- else }} +data: + {{- range $key, $val := .data }} + {{ $key }}: |- + {{- if kindIs "string" $val }} + {{ tpl $val $ | nindent 4 }} + {{- else }} + {{ toYaml $val | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} +{{- end }} diff --git a/mywebmethodsserver/helm/README.md.gotmpl b/mywebmethodsserver/helm/README.md.gotmpl index ec9dcfa..34e201e 100644 --- a/mywebmethodsserver/helm/README.md.gotmpl +++ b/mywebmethodsserver/helm/README.md.gotmpl @@ -49,6 +49,6 @@ helm install wm-mws mywebmethodsserver | `1.0.2` | `storage.enabled` added in `values.yaml`. For backward reason is this value set to `true` as default. `false` doesn't create and mount any PV. (You can test this feature if you don't want to deploy any own MWS application. MWS is more stateless and has only the database as stateful dependency.) | | `1.0.2` | `containerName` added in `values.yaml`. Default is the Chart name. (Use `helm repo update` to get latest Helm Chart version.) | | `1.0.3` | `tpl` function support in `affinity` value added. `topologySpreadConstraints` support added. | -| `1.0.4` | `priorityClassName` support added. | +| `1.0.4` | `priorityClassName` support added. Implementation of `extraConfigMaps` added. | {{ template "chart.valuesSection" . }} diff --git a/mywebmethodsserver/helm/templates/configmaps-extra.yaml b/mywebmethodsserver/helm/templates/configmaps-extra.yaml new file mode 100644 index 0000000..5976220 --- /dev/null +++ b/mywebmethodsserver/helm/templates/configmaps-extra.yaml @@ -0,0 +1,46 @@ +{{ range .Values.extraConfigMaps }} +--- +# /* +# * Copyright (c) 2023 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: {{ .name }} + labels: + {{- include "common.labels.standard" $ | nindent 4 }} + {{- with $.Values.extraLabels }} + {{ toYaml . | nindent 4 }} + {{- end }} +{{- if .binaryData }} +binaryData: + {{- range $key, $val := .binaryData }} + {{ $key }}: {{ $val | b64enc }} + {{- end }} +{{- else }} +data: + {{- range $key, $val := .data }} + {{ $key }}: |- + {{- if kindIs "string" $val }} + {{ tpl $val $ | nindent 4 }} + {{- else }} + {{ toYaml $val | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} +{{- end }}