Skip to content

Commit 35f24cb

Browse files
lunkan93lunkan93
committed
apps sc: upgrade opensearch to v2.19.4
1 parent 9b683b9 commit 35f24cb

File tree

8 files changed

+76
-23
lines changed

8 files changed

+76
-23
lines changed

‎helmfile.d/lists/images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ images:
8585
nodeLocalDns:
8686
image: registry.k8s.io/dns/k8s-dns-node-cache:1.25.0
8787
opensearch:
88-
image: docker.io/opensearchproject/opensearch:2.19.3
88+
image: docker.io/opensearchproject/opensearch:2.19.4
8989
dashboards: docker.io/opensearchproject/opensearch-dashboards:2.19.3
9090
configurerJob: ghcr.io/elastisys/curl-jq:1.0.0
9191
curatorCronjob: ghcr.io/elastisys/bitnami/elasticsearch-curator:5.8.4-debian-10-r235

‎helmfile.d/upstream/index.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ charts:
6868

6969
open-policy-agent-gatekeeper/gatekeeper: 3.20.1
7070

71-
opensearch-project/opensearch: 2.35.0
71+
opensearch-project/opensearch: 2.36.0
7272
opensearch-project/opensearch-dashboards: 2.31.0
7373

7474
projectcalico/tigera-operator: v3.26.4

‎helmfile.d/upstream/opensearch-project/opensearch/CHANGELOG.md‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Fixed
1515
### Security
1616
---
17+
## [2.36.0]
18+
### Added
19+
- Updated OpenSearch appVersion to 2.19.4
20+
### Changed
21+
### Deprecated
22+
### Removed
23+
### Fixed
24+
### Security
25+
---
26+
## [2.35.1]
27+
### Added
28+
### Changed
29+
### Deprecated
30+
### Removed
31+
### Fixed
32+
- Added missing security context to configfile and keystore init containers to support restricted Kubernetes environments
33+
### Security
34+
---
1735
## [2.35.0]
1836
### Added
1937
- Updated OpenSearch appVersion to 2.19.3
@@ -611,7 +629,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
611629
### Fixed
612630
### Security
613631

614-
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.35.0...HEAD
632+
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.36.0...HEAD
633+
[2.36.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.35.0...opensearch-2.36.0
634+
[2.35.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.35.0...opensearch-2.35.1
615635
[2.35.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.34.0...opensearch-2.35.0
616636
[2.34.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.33.0...opensearch-2.34.0
617637
[2.33.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-2.32.0...opensearch-2.33.0

‎helmfile.d/upstream/opensearch-project/opensearch/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 2.19.3
2+
appVersion: 2.19.4
33
description: A Helm chart for OpenSearch
44
home: https://opensearch.org
55
maintainers:
@@ -13,4 +13,4 @@ sources:
1313
- https://github.com/opensearch-project/opensearch
1414
- https://github.com/opensearch-project/helm-charts
1515
type: application
16-
version: 2.35.0
16+
version: 2.36.0

‎helmfile.d/upstream/opensearch-project/opensearch/templates/statefulset.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ spec:
292292
- |
293293
#!/usr/bin/env bash
294294
cp -r /tmp/configfolder/* /tmp/config/
295+
securityContext:
296+
{{ toYaml .Values.securityContext | indent 10 }}
295297
resources:
296298
{{- toYaml .Values.initResources | nindent 10 }}
297299
volumeMounts:
@@ -332,6 +334,8 @@ spec:
332334
cp -a {{ .Values.opensearchHome }}/config/opensearch.keystore /tmp/keystore/
333335
env: {{ toYaml .Values.extraEnvs | nindent 10 }}
334336
envFrom: {{ toYaml .Values.envFrom | nindent 10 }}
337+
securityContext:
338+
{{ toYaml .Values.securityContext | indent 10 }}
335339
resources:
336340
{{- toYaml .Values.initResources | nindent 10 }}
337341
volumeMounts:

‎migration/v0.50/apply/20-upgrade-opensearch.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env bash
2+
3+
ROOT="$(readlink -f "$(dirname "${0}")/../../../")"
4+
5+
# shellcheck source=scripts/migration/lib.sh
6+
source "${ROOT}/scripts/migration/lib.sh"
7+
8+
run() {
9+
case "${1:-}" in
10+
execute)
11+
if [[ "${CK8S_CLUSTER}" =~ ^(sc|both)$ ]]; then
12+
log_info "operation on service cluster"
13+
log_info "- Upgrading Opensearch"
14+
helmfile_upgrade sc app=opensearch
15+
log_info "- Running Opensearch Configurer"
16+
helmfile_do sc -lname=opensearch-configurer sync
17+
fi
18+
;;
19+
rollback)
20+
log_warn "rollback not implemented"
21+
;;
22+
*)
23+
log_fatal "usage: \"${0}\" <execute|rollback>"
24+
;;
25+
esac
26+
}
27+
28+
run "${@}"

‎migration/v0.50/apply/80-apply.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ skipped=(
1313
)
1414
declare -a skipped_sc
1515
skipped_sc=(
16+
"app!=opensearch"
1617
)
1718
declare -a skipped_wc
1819
skipped_wc=(

‎sbom/sbom.cdx.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"bomFormat": "CycloneDX",
33
"specVersion": "1.6",
4-
"serialNumber": "urn:uuid:7351f4eb-6085-450a-b87d-e333a4659fe3",
4+
"serialNumber": "urn:uuid:a50faa8b-843d-49bc-bfef-0231755921fa",
55
"version": 1,
66
"metadata": {
7-
"timestamp": "2025-12-01T10:59:51Z",
7+
"timestamp": "2025-12-17T07:48:55Z",
88
"lifecycles": [
99
{
1010
"phase": "build"
@@ -2199,13 +2199,13 @@
21992199
}
22002200
},
22012201
{
2202-
"bom-ref": "pkg:helm/opensearch@2.35.0",
2202+
"bom-ref": "pkg:helm/opensearch@2.36.0",
22032203
"type": "library",
22042204
"supplier": {
22052205
"name": "opensearch-project"
22062206
},
22072207
"name": "opensearch",
2208-
"version": "2.35.0",
2208+
"version": "2.36.0",
22092209
"description": "A Helm chart for OpenSearch",
22102210
"licenses": [
22112211
{
@@ -2214,7 +2214,7 @@
22142214
}
22152215
}
22162216
],
2217-
"purl": "pkg:helm/opensearch@2.35.0",
2217+
"purl": "pkg:helm/opensearch@2.36.0",
22182218
"properties": [
22192219
{
22202220
"name": "Elastisys evaluation",
@@ -4104,15 +4104,15 @@
41044104
"purl": "pkg:oci/opensearchproject/[email protected]"
41054105
},
41064106
{
4107-
"bom-ref": "pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io",
4107+
"bom-ref": "pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io",
41084108
"type": "container",
41094109
"supplier": {
41104110
"name": "opensearchproject"
41114111
},
41124112
"name": "docker.io/opensearchproject/opensearch",
4113-
"version": "2.19.3",
4114-
"cpe": "cpe:2.3:a:opensearchproject:opensearch:2.19.3:*:*:*:*:*:*:*",
4115-
"purl": "pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
4113+
"version": "2.19.4",
4114+
"cpe": "cpe:2.3:a:opensearchproject:opensearch:2.19.4:*:*:*:*:*:*:*",
4115+
"purl": "pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
41164116
},
41174117
{
41184118
"bom-ref": "pkg:oci/prometheus-community/[email protected]",
@@ -4406,7 +4406,7 @@
44064406
"pkg:helm/[email protected]",
44074407
"pkg:helm/[email protected]",
44084408
"pkg:helm/[email protected]",
4409-
"pkg:helm/opensearch@2.35.0",
4409+
"pkg:helm/opensearch@2.36.0",
44104410
"pkg:helm/[email protected]",
44114411
"pkg:helm/[email protected]",
44124412
"pkg:helm/[email protected]",
@@ -4993,15 +4993,15 @@
49934993
"dependsOn": [
49944994
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
49954995
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
4996-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
4996+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
49974997
]
49984998
},
49994999
{
50005000
"ref": "pkg:helm/[email protected]",
50015001
"dependsOn": [
50025002
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
50035003
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
5004-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
5004+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
50055005
]
50065006
},
50075007
{
@@ -5010,15 +5010,15 @@
50105010
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
50115011
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
50125012
"pkg:oci/opensearchproject/[email protected]?repository_url=docker.io",
5013-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
5013+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
50145014
]
50155015
},
50165016
{
50175017
"ref": "pkg:helm/[email protected]",
50185018
"dependsOn": [
50195019
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
50205020
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
5021-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
5021+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
50225022
]
50235023
},
50245024
{
@@ -5027,15 +5027,15 @@
50275027
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
50285028
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
50295029
"pkg:oci/opensearchproject/[email protected]",
5030-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
5030+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
50315031
]
50325032
},
50335033
{
5034-
"ref": "pkg:helm/opensearch@2.35.0",
5034+
"ref": "pkg:helm/opensearch@2.36.0",
50355035
"dependsOn": [
50365036
"pkg:oci/elastisys/bitnami/[email protected]?repository_url=ghcr.io",
50375037
"pkg:oci/elastisys/[email protected]?repository_url=ghcr.io",
5038-
"pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io"
5038+
"pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io"
50395039
]
50405040
},
50415041
{
@@ -5652,7 +5652,7 @@
56525652
"dependsOn": []
56535653
},
56545654
{
5655-
"ref": "pkg:oci/opensearchproject/[email protected].3?repository_url=docker.io",
5655+
"ref": "pkg:oci/opensearchproject/[email protected].4?repository_url=docker.io",
56565656
"dependsOn": []
56575657
},
56585658
{

0 commit comments

Comments
 (0)