Skip to content

Commit b27abdd

Browse files
authored
[backport 1.x]: added plugins.removeList to allow remove plugins (#640)
* backport: added plugins.removeList to allow remove plugins --- Signed-off-by: Yulong Ruan <[email protected]> * fix(changelog): fix ref compare url Signed-off-by: Yulong Ruan <[email protected]> --------- Signed-off-by: Yulong Ruan <[email protected]>
1 parent cb60739 commit b27abdd

File tree

8 files changed

+92
-57
lines changed

8 files changed

+92
-57
lines changed

charts/opensearch-dashboards/CHANGELOG.md

Lines changed: 64 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Fixed
1515
### Security
1616
---
17+
## [1.26.0]
18+
### Added
19+
- Added plugins.removeList to allow remove plugins
20+
### Changed
21+
### Deprecated
22+
### Removed
23+
### Fixed
24+
### Security
25+
---
1726
## [1.25.0]
1827
### Added
1928
### Changed
@@ -498,58 +507,59 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
498507
### Fixed
499508
### Security
500509

501-
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.25.0...HEAD
502-
[1.25.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.24.1...opensearch-1.25.0
503-
[1.24.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.24.0...opensearch-1.24.1
504-
[1.24.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.23.0...opensearch-1.24.0
505-
[1.23.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.22.0...opensearch-1.23.0
506-
[1.22.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.21.0...opensearch-1.22.0
507-
[1.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.20.0...opensearch-1.21.0
508-
[1.20.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.19.0...opensearch-1.20.0
509-
[1.19.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.18.0...opensearch-1.19.0
510-
[1.18.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.17.0...opensearch-1.18.0
511-
[1.17.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.16.0...opensearch-1.17.0
512-
[1.16.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.15.0...opensearch-1.16.0
513-
[1.15.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.14.0...opensearch-1.15.0
514-
[1.14.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.1...opensearch-1.14.0
515-
[1.13.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.13.0...opensearch-1.13.1
516-
[1.13.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.12.2...opensearch-1.13.0
517-
[1.12.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.12.1...opensearch-1.12.2
518-
[1.12.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.12.0...opensearch-1.12.1
519-
[1.12.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.11.1...opensearch-1.12.0
520-
[1.11.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.11.0...opensearch-1.11.1
521-
[1.11.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.10.0...opensearch-1.11.0
522-
[1.10.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.9.1...opensearch-1.10.0
523-
[1.9.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.9.0...opensearch-1.9.1
524-
[1.9.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.8.4...opensearch-1.9.0
525-
[1.8.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.8.3...opensearch-1.8.4
526-
[1.8.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.8.2...opensearch-1.8.3
527-
[1.8.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.8.1...opensearch-1.8.2
528-
[1.8.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.8.0...opensearch-1.8.1
529-
[1.8.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.4...opensearch-1.8.0
530-
[1.7.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.3...opensearch-1.7.4
531-
[1.7.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.2...opensearch-1.7.3
532-
[1.7.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.1...opensearch-1.7.2
533-
[1.7.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.7.0...opensearch-1.7.1
534-
[1.7.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.6.1...opensearch-1.7.0
535-
[1.6.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.6.0...opensearch-1.6.1
536-
[1.6.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.1...opensearch-1.6.0
537-
[1.5.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.4.1...opensearch-1.5.1
538-
[1.4.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.4.0...opensearch-1.4.1
539-
[1.4.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.3.3...opensearch-1.4.0
540-
[1.3.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.3.2...opensearch-1.3.3
541-
[1.3.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.3.1...opensearch-1.3.2
542-
[1.3.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.3.0...opensearch-1.3.1
543-
[1.3.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.2.2...opensearch-1.3.0
544-
[1.2.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.2.1...opensearch-1.2.2
545-
[1.2.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.2.0...opensearch-1.2.1
546-
[1.2.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.2...opensearch-1.2.0
547-
[1.1.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.1...opensearch-1.1.2
548-
[1.1.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.0...opensearch-1.1.1
549-
[1.1.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.8...opensearch-1.1.0
550-
[1.0.8]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.7...opensearch-1.0.8
551-
[1.0.7]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.6...opensearch-1.0.7
552-
[1.0.6]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.5...opensearch-1.0.6
553-
[1.0.5]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.4...opensearch-1.0.5
554-
[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.2...opensearch-1.0.4
510+
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.26.0...HEAD
511+
[1.26.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.25.0...opensearch-dashboards-1.26.0
512+
[1.25.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.24.1...opensearch-dashboards-1.25.0
513+
[1.24.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.24.0...opensearch-dashboards-1.24.1
514+
[1.24.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.23.0...opensearch-dashboards-1.24.0
515+
[1.23.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.22.0...opensearch-dashboards-1.23.0
516+
[1.22.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.21.0...opensearch-dashboards-1.22.0
517+
[1.21.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.20.0...opensearch-dashboards-1.21.0
518+
[1.20.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.19.0...opensearch-dashboards-1.20.0
519+
[1.19.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.18.0...opensearch-dashboards-1.19.0
520+
[1.18.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.17.0...opensearch-dashboards-1.18.0
521+
[1.17.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.16.0...opensearch-dashboards-1.17.0
522+
[1.16.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.15.0...opensearch-dashboards-1.16.0
523+
[1.15.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.14.0...opensearch-dashboards-1.15.0
524+
[1.14.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.13.1...opensearch-dashboards-1.14.0
525+
[1.13.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.13.0...opensearch-dashboards-1.13.1
526+
[1.13.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.12.2...opensearch-dashboards-1.13.0
527+
[1.12.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.12.1...opensearch-dashboards-1.12.2
528+
[1.12.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.12.0...opensearch-dashboards-1.12.1
529+
[1.12.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.11.1...opensearch-dashboards-1.12.0
530+
[1.11.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.11.0...opensearch-dashboards-1.11.1
531+
[1.11.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.10.0...opensearch-dashboards-1.11.0
532+
[1.10.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.9.1...opensearch-dashboards-1.10.0
533+
[1.9.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.9.0...opensearch-dashboards-1.9.1
534+
[1.9.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.4...opensearch-dashboards-1.9.0
535+
[1.8.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.3...opensearch-dashboards-1.8.4
536+
[1.8.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.2...opensearch-dashboards-1.8.3
537+
[1.8.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.1...opensearch-dashboards-1.8.2
538+
[1.8.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.8.0...opensearch-dashboards-1.8.1
539+
[1.8.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.4...opensearch-dashboards-1.8.0
540+
[1.7.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.3...opensearch-dashboards-1.7.4
541+
[1.7.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.2...opensearch-dashboards-1.7.3
542+
[1.7.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.1...opensearch-dashboards-1.7.2
543+
[1.7.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.7.0...opensearch-dashboards-1.7.1
544+
[1.7.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.6.1...opensearch-dashboards-1.7.0
545+
[1.6.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.6.0...opensearch-dashboards-1.6.1
546+
[1.6.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.5.1...opensearch-dashboards-1.6.0
547+
[1.5.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.4.1...opensearch-dashboards-1.5.1
548+
[1.4.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.4.0...opensearch-dashboards-1.4.1
549+
[1.4.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.3.3...opensearch-dashboards-1.4.0
550+
[1.3.3]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.3.2...opensearch-dashboards-1.3.3
551+
[1.3.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.3.1...opensearch-dashboards-1.3.2
552+
[1.3.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.3.0...opensearch-dashboards-1.3.1
553+
[1.3.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.2.2...opensearch-dashboards-1.3.0
554+
[1.2.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.2.1...opensearch-dashboards-1.2.2
555+
[1.2.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.2.0...opensearch-dashboards-1.2.1
556+
[1.2.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.1.2...opensearch-dashboards-1.2.0
557+
[1.1.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.1.1...opensearch-dashboards-1.1.2
558+
[1.1.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.1.0...opensearch-dashboards-1.1.1
559+
[1.1.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.8...opensearch-dashboards-1.1.0
560+
[1.0.8]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.7...opensearch-dashboards-1.0.8
561+
[1.0.7]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.6...opensearch-dashboards-1.0.7
562+
[1.0.6]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.5...opensearch-dashboards-1.0.6
563+
[1.0.5]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.4...opensearch-dashboards-1.0.5
564+
[1.0.4]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.0.2...opensearch-dashboards-1.0.4
555565
[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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.25.0
18+
version: 1.26.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch-dashboards/templates/deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ spec:
165165
- |
166166
#!/usr/bin/bash
167167
set -e
168+
{{- range $plugin := .Values.plugins.removeList }}
169+
if ./bin/opensearch-dashboards-plugin list | grep -q {{ $plugin }}; then
170+
./bin/opensearch-dashboards-plugin remove {{ $plugin }}
171+
fi
172+
{{- end }}
168173
{{- range $plugin := .Values.plugins.installList }}
169174
./bin/opensearch-dashboards-plugin install {{ $plugin }}
170175
{{- end }}

charts/opensearch-dashboards/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ plugins:
272272
enabled: false
273273
installList: []
274274
# - example-fake-plugin-downloadable-url
275+
removeList: []
276+
# - examplePluginName
275277

276278
# ServiceMonitor Configuration for Prometheus
277279
# Enabling this option will create a ServiceMonitor resource that allows Prometheus to scrape metrics from the OpenSearch service.

charts/opensearch/CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
### Fixed
1515
### Security
1616
---
17+
## [1.35.0]
18+
### Added
19+
- Added plugins.removeList to allow remove plugins
20+
### Changed
21+
### Deprecated
22+
### Removed
23+
### Fixed
24+
### Security
25+
---
1726
## [1.34.0]
1827
### Added
1928
- Ability to set a basic auth configuration to the `serviceMonitor`
@@ -769,7 +778,8 @@ config:
769778
### Fixed
770779
### Security
771780

772-
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.34.0...HEAD
781+
[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.35.0...HEAD
782+
[1.35.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.34.0...opensearch-1.35.0
773783
[1.34.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.34.0...opensearch-1.33.0
774784
[1.33.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.32.0...opensearch-1.33.0
775785
[1.32.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.31.2...opensearch-1.32.0

charts/opensearch/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.34.0
18+
version: 1.35.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/opensearch/templates/statefulset.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,12 @@ spec:
331331
#!/usr/bin/env bash
332332
set -euo pipefail
333333
334+
{{- range $plugin := .Values.plugins.removeList }}
335+
if ./bin/opensearch-plugin list | grep -q {{ $plugin }}; then
336+
./bin/opensearch-plugin remove {{ $plugin }}
337+
fi
338+
{{- end }}
339+
334340
{{- range $plugin := .Values.plugins.installList }}
335341
./bin/opensearch-plugin install -b {{ $plugin }}
336342
{{- end }}

charts/opensearch/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,8 @@ plugins:
471471
enabled: false
472472
installList: []
473473
# - example-fake-plugin
474+
removeList: []
475+
# - example-fake-plugin
474476

475477
# -- Array of extra K8s manifests to deploy
476478
extraObjects: []

0 commit comments

Comments
 (0)