Merge remote-tracking branch 'upstream/main'

Signed-off-by: Sebas <[email protected]>

charts/opensearch-dashboards/CHANGELOG.md

@@ -12,6 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 ### Security
+---
+## [1.0.7]
+### Added
+- Add `extraVolumes` and `extraVolumeMounts`.
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ---
 ## [1.0.6]
 ### Added
@@ -56,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
-[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.5...HEAD
+[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.6...HEAD
+[1.0.6]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.5...opensearch-1.0.6
 [1.0.5]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.4...opensearch-1.0.5
 [1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4
 [1.0.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.1...opensearch-dashboards-1.0.2

charts/opensearch-dashboards/Chart.yaml

@@ -15,7 +15,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.6
+version: 1.0.7
 
 # 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

charts/opensearch-dashboards/templates/deployment.yaml

@@ -48,6 +48,16 @@ spec:
           configMap:
             name: {{ template "opensearch-dashboards.fullname" . }}-config
         {{- end }}
+        {{- if .Values.extraVolumes }}
+        # Currently some extra blocks accept strings
+        # to continue with backwards compatibility this is being kept
+        # whilst also allowing for yaml to be specified too.
+        {{- if eq "string" (printf "%T" .Values.extraVolumes) }}
+{{ tpl .Values.extraVolumes . | indent 8 }}
+        {{- else }}
+{{ toYaml .Values.extraVolumes | indent 8 }}
+        {{- end }}
+        {{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
@@ -146,6 +156,16 @@ spec:
             mountPath: /usr/share/opensearch-dashboards/config/{{ $path }}
             subPath: {{ $path }}
           {{- end }}
+          {{- if .Values.extraVolumeMounts }}
+          # Currently some extra blocks accept strings
+          # to continue with backwards compatibility this is being kept
+          # whilst also allowing for yaml to be specified too.
+          {{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
+{{ tpl .Values.extraVolumeMounts . | indent 10 }}
+         {{- else }}
+{{ toYaml .Values.extraVolumeMounts | indent 10 }}
+          {{- end }}
+          {{- end }}
       {{- if .Values.extraContainers }}
       # Currently some extra blocks accept strings
       # to continue with backwards compatibility this is being kept

charts/opensearch-dashboards/values.yaml

@@ -44,6 +44,15 @@ extraEnvs: []
 
 envFrom: []
 
+extraVolumes: []
+  # - name: extras
+  #   emptyDir: {}
+
+extraVolumeMounts: []
+  # - name: extras
+  #   mountPath: /usr/share/extras
+  #   readOnly: true
+
 extraInitContainers: ""
 
 extraContainers: ""

charts/opensearch/CHANGELOG.md

@@ -13,6 +13,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 ---
+## [1.4.0]
+### Changed
+- Changed support for any kind of configuration type. Including `log4j2.properties` file. Added example.
+### BREAKING CHANGE
+- `.Values.config` items must now be interpreted as a string. Existing items must now be updated from YAML to string:
+
+Change from YAML:
+```yaml
+config:
+  opensearch.yml:
+    cluster.name: opensearch-cluster
+```
+
+Change to YAML multiline string:
+```yaml
+config:
+  opensearch.yml: |
+    cluster.name: opensearch-cluster
+```
+---
+## [1.3.1]
+### Added
+- Added image definition for `fsgroup-volume` initContainer to `values.yaml`.
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+---
 ## [1.3.0]
 ### Added
 ### Changed

charts/opensearch/Chart.yaml

@@ -15,7 +15,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.3.0
+version: 1.4.0
 
 # 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

charts/opensearch/ci/ci-rbac-enabled-values.yaml

@@ -28,7 +28,7 @@ global:
 opensearchHome: /usr/share/opensearch
 # such as opensearch.yml and log4j2.properties
 config:
-  opensearch.yml:
+  opensearch.yml: |
     cluster.name: opensearch-cluster
 
     # Bind to all interfaces because we don't know what IP address Docker will assign to us.

charts/opensearch/ci/ci-values.yaml

@@ -28,7 +28,7 @@ global:
 opensearchHome: /usr/share/opensearch
 # such as opensearch.yml and log4j2.properties
 config:
-  opensearch.yml:
+  opensearch.yml: |
     cluster.name: opensearch-cluster
 
     # Bind to all interfaces because we don't know what IP address Docker will assign to us.

charts/opensearch/templates/configmap.yaml

@@ -1,3 +1,4 @@
+{{- $root := . }}
 {{- if .Values.config }}
 apiVersion: v1
 kind: ConfigMap
@@ -8,6 +9,6 @@ metadata:
 data:
 {{- range $configName, $configYaml := .Values.config }}
   {{ $configName }}: |
-    {{- toYaml $configYaml | nindent 4 }}
+    {{- tpl $configYaml $root | nindent 4 }}
 {{- end -}}
 {{- end -}}

charts/opensearch/templates/statefulset.yaml

@@ -213,7 +213,7 @@ spec:
       initContainers:
 {{- if and .Values.persistence.enabled .Values.persistence.enableInitChown }}
       - name: fsgroup-volume
-        image: "{{ template "opensearch.dockerRegistry" . }}busybox:latest"
+        image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.persistence.image | default "busybox" }}:{{ .Values.persistence.imageTag | default "latest" }}"
         command: ['sh', '-c']
         args:
           - 'chown -R 1000:1000 /usr/share/opensearch/data'

charts/opensearch/values.yaml

@@ -28,7 +28,20 @@ global:
 opensearchHome: /usr/share/opensearch
 # such as opensearch.yml and log4j2.properties
 config:
-  opensearch.yml:
+  # Values must be YAML literal style scalar / YAML multiline string.
+  # <filename>: |
+  #   <formatted-value(s)>
+  # log4j2.properties: |
+  #   status = error
+  #
+  #   appender.console.type = Console
+  #   appender.console.name = console
+  #   appender.console.layout.type = PatternLayout
+  #   appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+  #
+  #   rootLogger.level = info
+  #   rootLogger.appenderRef.console.ref = console
+  opensearch.yml: |
     cluster.name: opensearch-cluster
 
     # Bind to all interfaces because we don't know what IP address Docker will assign to us.
@@ -173,6 +186,10 @@ persistence:
   enabled: true
   # Set to false to disable the `fsgroup-volume` initContainer that will update permissions on the persistent disk.
   enableInitChown: true
+  # override image, which is busybox by default
+  # image: busybox
+  # override image tag, which is latest by default
+  # imageTag:
   labels:
     # Add default labels for the volumeClaimTemplate of the StatefulSet
     enabled: false