Skip to content

Commit

Permalink
[bitnami/opensearch] Fix plugins installation (#29586)
Browse files Browse the repository at this point in the history
  • Loading branch information
juan131 authored Sep 24, 2024
1 parent d92e7e9 commit 464c683
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 34 deletions.
9 changes: 7 additions & 2 deletions bitnami/opensearch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Changelog

## 1.3.3 (2024-09-24)
## 1.3.4 (2024-09-24)

* [bitnami/opensearch] Release 1.3.3 ([#29582](https://github.com/bitnami/charts/pull/29582))
* [bitnami/opensearch] Fix plugins installation ([#29586](https://github.com/bitnami/charts/pull/29586))

## <small>1.3.3 (2024-09-24)</small>

* [bitnami/opensearch] Release 1.3.3 (#29582) ([8e60928](https://github.com/bitnami/charts/commit/8e60928332d201716283187687dc129034816e41)), closes [#29582](https://github.com/bitnami/charts/issues/29582)
* [bitnami/opensearch] Replace links to open.co with opensearch.org (#29548) ([1f2ebcc](https://github.com/bitnami/charts/commit/1f2ebcc40481d284e2dc6b99c0716a34ca29dc8f)), closes [#29548](https://github.com/bitnami/charts/issues/29548)

## <small>1.3.2 (2024-09-17)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/opensearch/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ maintainers:
name: opensearch
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/opensearch
version: 1.3.3
version: 1.3.4
24 changes: 16 additions & 8 deletions bitnami/opensearch/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ Return the copy plugins init container definition
- name: copy-default-plugins
image: {{ include "opensearch.image" .context }}
imagePullPolicy: {{ .context.Values.image.pullPolicy | quote }}
{{- if $block.containerSecurityContext.enabled }}
securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" $block.containerSecurityContext "context" .context) | nindent 12 }}
{{- end }}
securityContext:
runAsUser: 0
{{- if $block.resources }}
resources: {{- toYaml $block.resources | nindent 12 }}
{{- else if ne $block.resourcesPreset "none" }}
Expand All @@ -71,18 +70,27 @@ Return the copy plugins init container definition
args:
- -ec
- |
#!/bin/bash

. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libfs.sh
. /opt/bitnami/scripts/opensearch-env.sh

mkdir -p /emptydir/app-conf-dir /emptydir/app-plugins-dir
info "Copying directories to empty dir"
# In order to not break plugins installation we need to make the conf directory
# writable, so we need to copy it to an empty dir volume
cp -r --preserve=mode /opt/bitnami/opensearch/config /emptydir/app-conf-dir

if ! is_dir_empty "$DB_DEFAULT_PLUGINS_DIR"; then
cp -nr "$DB_DEFAULT_PLUGINS_DIR"/* /plugins
info "Copying default plugins"
cp -nr "$DB_DEFAULT_PLUGINS_DIR"/* /emptydir/app-plugins-dir
fi

chown -R {{ $block.containerSecurityContext.runAsUser }}:{{ $block.podSecurityContext.fsGroup }} /emptydir/app-conf-dir /emptydir/app-plugins-dir

info "Copy operation completed"
volumeMounts:
- name: empty-dir
mountPath: /plugins
subPath: app-plugins-dir
mountPath: /emptydir
{{- end -}}

{{/*
Expand Down
6 changes: 2 additions & 4 deletions bitnami/opensearch/templates/coordinating/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,17 @@ spec:
{{- if .Values.coordinating.podSecurityContext.enabled }}
securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.coordinating.podSecurityContext "context" $) | nindent 8 }}
{{- end }}
{{- if or .Values.coordinating.initContainers .Values.sysctlImage.enabled }}
initContainers:
{{- if .Values.sysctlImage.enabled }}
{{- include "opensearch.sysctl.initContainer" . | nindent 8}}
{{- end }}
{{- include "opensearch.copy-default-plugins.initContainer" (dict "component" "coordinating" "context" $) | nindent 8 }}
{{- if .Values.coordinating.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.coordinating.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.coordinating.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- end }}
containers:
- name: opensearch
image: {{ include "opensearch.image" . }}
Expand Down
2 changes: 1 addition & 1 deletion bitnami/opensearch/templates/dashboards/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
initContainers:
{{- include "opensearch.dashboards.copy-default-plugins.initContainer" . | nindent 8 }}
{{- if .Values.dashboards.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboards.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboards.initContainers "context" $) | nindent 8 }}
{{- end }}
containers:
- name: {{ include "opensearch.dashboards.fullname" . }}
Expand Down
9 changes: 2 additions & 7 deletions bitnami/opensearch/templates/data/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ spec:
{{- if .Values.data.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.data.terminationGracePeriodSeconds }}
{{- end }}
{{- if or .Values.data.initContainers .Values.sysctlImage.enabled (and .Values.volumePermissions.enabled .Values.data.persistence.enabled) }}
initContainers:
{{- if .Values.sysctlImage.enabled }}
{{- include "opensearch.sysctl.initContainer" . | nindent 8}}
Expand All @@ -107,20 +106,16 @@ spec:
resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }}
{{- end }}
volumeMounts:
- name: empty-dir
mountPath: /tmp
subPath: tmp-dir
- name: data
mountPath: /bitnami/opensearch/data
{{- end }}
{{- include "opensearch.copy-default-plugins.initContainer" (dict "component" "data" "context" $) | nindent 8 }}
{{- if .Values.data.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.data.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.data.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- end }}
containers:
- name: opensearch
image: {{ include "opensearch.image" . }}
Expand Down
6 changes: 2 additions & 4 deletions bitnami/opensearch/templates/ingest/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,17 @@ spec:
{{- if .Values.ingest.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.ingest.terminationGracePeriodSeconds }}
{{- end }}
{{- if or .Values.ingest.initContainers .Values.sysctlImage.enabled }}
initContainers:
{{- if .Values.sysctlImage.enabled }}
{{- include "opensearch.sysctl.initContainer" . | nindent 8}}
{{- end }}
{{- include "opensearch.copy-default-plugins.initContainer" (dict "component" "ingest" "context" $) | nindent 8 }}
{{- if .Values.ingest.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingest.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingest.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- end }}
containers:
- name: opensearch
image: {{ include "opensearch.image" . }}
Expand Down
9 changes: 2 additions & 7 deletions bitnami/opensearch/templates/master/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ spec:
{{- if .Values.master.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.master.terminationGracePeriodSeconds }}
{{- end }}
{{- if or .Values.master.initContainers .Values.sysctlImage.enabled (and .Values.volumePermissions.enabled .Values.master.persistence.enabled) }}
initContainers:
{{- if .Values.sysctlImage.enabled }}
{{- include "opensearch.sysctl.initContainer" . | nindent 8 }}
Expand All @@ -107,20 +106,16 @@ spec:
resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }}
{{- end }}
volumeMounts:
- name: empty-dir
mountPath: /tmp
subPath: tmp-dir
- name: data
mountPath: /bitnami/opensearch/data
{{- end }}
{{- include "opensearch.copy-default-plugins.initContainer" (dict "component" "master" "context" $) | nindent 8 }}
{{- if .Values.master.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.master.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.master.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- end }}
containers:
- name: opensearch
image: {{ include "opensearch.image" . }}
Expand Down

0 comments on commit 464c683

Please sign in to comment.