diff --git a/charts/opensearch-dashboards/CHANGELOG.md b/charts/opensearch-dashboards/CHANGELOG.md index 05a6fb47..18e47d4f 100644 --- a/charts/opensearch-dashboards/CHANGELOG.md +++ b/charts/opensearch-dashboards/CHANGELOG.md @@ -12,7 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed ### Security - +--- +## [1.2.0] +### Added +### Changed +- Changed structure of `image` keys in `values.yaml` file to use helm's default (`image.repository`, `image.tag`, `image.pullPolicy`) +### Deprecated +### Removed +### Fixed +### Security --- ## [1.1.2] ### Added @@ -107,7 +115,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.1.2...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-dashboards-1.2.0...HEAD +[1.2.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.2...opensearch-1.2.0 [1.1.2]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.1...opensearch-1.1.2 [1.1.1]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.1.0...opensearch-1.1.1 [1.1.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.0.8...opensearch-1.1.0 diff --git a/charts/opensearch-dashboards/Chart.yaml b/charts/opensearch-dashboards/Chart.yaml index b88ccedd..a3a616c5 100644 --- a/charts/opensearch-dashboards/Chart.yaml +++ b/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.1.2 +version: 1.2.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 diff --git a/charts/opensearch-dashboards/templates/deployment.yaml b/charts/opensearch-dashboards/templates/deployment.yaml index f3776a65..ccb20c85 100644 --- a/charts/opensearch-dashboards/templates/deployment.yaml +++ b/charts/opensearch-dashboards/templates/deployment.yaml @@ -89,8 +89,8 @@ spec: - name: dashboards securityContext: {{ toYaml .Values.securityContext | indent 10 }} - image: "{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: "{{ .Values.image.pullPolicy }}" env: {{- if .Values.opensearchURL }} - name: OPENSEARCH_URL diff --git a/charts/opensearch-dashboards/values.yaml b/charts/opensearch-dashboards/values.yaml index 9432babb..b8b6cdda 100644 --- a/charts/opensearch-dashboards/values.yaml +++ b/charts/opensearch-dashboards/values.yaml @@ -8,10 +8,11 @@ opensearchHosts: "https://opensearch-cluster-master:9200" replicaCount: 1 -image: "opensearchproject/opensearch-dashboards" -# override image tag, which is .Chart.AppVersion by default -imageTag: "" -imagePullPolicy: "IfNotPresent" +image: + repository: "opensearchproject/opensearch-dashboards" + # override image tag, which is .Chart.AppVersion by default + tag: "" + pullPolicy: "IfNotPresent" imagePullSecrets: [] nameOverride: "" diff --git a/charts/opensearch/CHANGELOG.md b/charts/opensearch/CHANGELOG.md index 4f6d3bf9..7367091f 100644 --- a/charts/opensearch/CHANGELOG.md +++ b/charts/opensearch/CHANGELOG.md @@ -12,6 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed ### Security +--- +## [1.6.0] +### Added +### Changed +- Changed structure of `image` keys in `values.yaml` file to use helm's default (`image.repository`, `image.tag`, `image.pullPolicy`) +### Deprecated +### Removed +### Fixed +### Security --- ## [1.5.8] @@ -35,10 +44,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.5.6] ### Added **BREAKING CHANGE** -This version introduces a change in the service name definitions that will break Helm upgrades due to changes in the `StatefulSet`. +This version introduces a change in the service name definitions that will break Helm upgrades due to changes in the `StatefulSet`. To resolve: Simply delete the existing statefulset in the cluster and ensure the PVC is retained (by default, this should be the case). `kubectl delete sts opensearch-cluster-master` -After deleting the statefulset and upgrading the helm chart again, the new replacement statefulset will be created and should consume the same PVC as before. +After deleting the statefulset and upgrading the helm chart again, the new replacement statefulset will be created and should consume the same PVC as before. ### Changed ### Deprecated @@ -286,7 +295,8 @@ config: ### Fixed ### Security -[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.8...HEAD +[Unreleased]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.6.0...HEAD +[1.6.0]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.8...opensearch-1.6.0 [1.5.8]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.7...opensearch-1.5.8 [1.5.7]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.6...opensearch-1.5.7 [1.5.6]: https://github.com/opensearch-project/helm-charts/compare/opensearch-1.5.5...opensearch-1.5.6 diff --git a/charts/opensearch/Chart.yaml b/charts/opensearch/Chart.yaml index f72ac52b..d4fc258c 100644 --- a/charts/opensearch/Chart.yaml +++ b/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.5.8 +version: 1.6.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 diff --git a/charts/opensearch/README.md b/charts/opensearch/README.md index 343cf853..22a48f16 100644 --- a/charts/opensearch/README.md +++ b/charts/opensearch/README.md @@ -53,10 +53,10 @@ helm uninstall my-release | `fullnameOverride` | Overrides the `clusterName` and `nodeGroup` when used in the naming of resources. This should only be used when using a single `nodeGroup`, otherwise you will have name conflicts | `""` | | `hostAliases` | Configurable [hostAliases][] | `[]` | | `httpPort` | The http port that Kubernetes will use for the healthchecks and the service. If you change this you will also need to set `http.port` in `extraEnvs` | `9200` | -| `imagePullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | +| `image.pullPolicy` | The Kubernetes [imagePullPolicy][] value | `IfNotPresent` | | `imagePullSecrets` | Configuration for [imagePullSecrets][] so that you can use a private registry for your image | `[]` | -| `imageTag` | The OpenSearch Docker image tag | `1.0.0` | -| `image` | The OpenSearch Docker image | `opensearchproject/opensearch` | +| `image.tag` | The OpenSearch Docker image tag | `1.0.0` | +| `image.repository` | The OpenSearch Docker image | `opensearchproject/opensearch` | | `ingress` | Configurable [ingress][] to expose the OpenSearch service. See [values.yaml][] for an example | see [values.yaml][] | | `initResources` | Allows you to set the [resources][] for the `initContainer` in the StatefulSet | `{}` | | `keystore` | Allows you map Kubernetes secrets into the keystore. | `[]` | @@ -114,7 +114,7 @@ helm uninstall my-release [hostAliases]: https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ -[imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images +[image.pullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images [imagePullSecrets]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ [ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/ [resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ diff --git a/charts/opensearch/ci/ci-ingress-class-name-values.yaml b/charts/opensearch/ci/ci-ingress-class-name-values.yaml index 52745b90..bfa7cfbe 100644 --- a/charts/opensearch/ci/ci-ingress-class-name-values.yaml +++ b/charts/opensearch/ci/ci-ingress-class-name-values.yaml @@ -122,10 +122,11 @@ hostAliases: [] # - "foo.local" # - "bar.local" -image: "opensearchproject/opensearch" -# override image tag, which is .Chart.AppVersion by default -imageTag: "" -imagePullPolicy: "IfNotPresent" +image: + repository: "opensearchproject/opensearch" + # override image tag, which is .Chart.AppVersion by default + tag: "" + pullPolicy: "IfNotPresent" podAnnotations: {} # iam.amazonaws.com/role: es-cluster diff --git a/charts/opensearch/ci/ci-rbac-enabled-values.yaml b/charts/opensearch/ci/ci-rbac-enabled-values.yaml index e775d6e9..602c64c2 100755 --- a/charts/opensearch/ci/ci-rbac-enabled-values.yaml +++ b/charts/opensearch/ci/ci-rbac-enabled-values.yaml @@ -122,10 +122,11 @@ hostAliases: [] # - "foo.local" # - "bar.local" -image: "opensearchproject/opensearch" -# override image tag, which is .Chart.AppVersion by default -imageTag: "" -imagePullPolicy: "IfNotPresent" +image: + repository: "opensearchproject/opensearch" + # override image tag, which is .Chart.AppVersion by default + tag: "" + pullPolicy: "IfNotPresent" podAnnotations: {} # iam.amazonaws.com/role: es-cluster diff --git a/charts/opensearch/ci/ci-values.yaml b/charts/opensearch/ci/ci-values.yaml index 84787d15..f99cf5c5 100755 --- a/charts/opensearch/ci/ci-values.yaml +++ b/charts/opensearch/ci/ci-values.yaml @@ -122,10 +122,13 @@ hostAliases: [] # - "foo.local" # - "bar.local" -image: "opensearchproject/opensearch" -# override image tag, which is .Chart.AppVersion by default -imageTag: "" -imagePullPolicy: "IfNotPresent" + +image: + repository: "opensearchproject/opensearch" + # override image tag, which is .Chart.AppVersion by default + tag: "" + pullPolicy: "IfNotPresent" + podAnnotations: {} # iam.amazonaws.com/role: es-cluster diff --git a/charts/opensearch/templates/_helpers.tpl b/charts/opensearch/templates/_helpers.tpl index 6c47e408..f7dc47d0 100755 --- a/charts/opensearch/templates/_helpers.tpl +++ b/charts/opensearch/templates/_helpers.tpl @@ -98,7 +98,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.majorVersion }} {{- .Values.majorVersion }} {{- else }} - {{- $version := semver (coalesce .Values.imageTag .Chart.AppVersion "1") }} + {{- $version := semver (coalesce .Values.image.tag .Chart.AppVersion "1") }} {{- $version.Major }} {{- end }} {{- end }} diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml index 5f621fd1..b57bc6f8 100644 --- a/charts/opensearch/templates/statefulset.yaml +++ b/charts/opensearch/templates/statefulset.yaml @@ -225,8 +225,8 @@ spec: {{- end }} {{ if .Values.keystore }} - name: keystore - image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" + image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: "{{ .Values.image.pullPolicy }}" command: - sh - -c @@ -289,8 +289,8 @@ spec: bash opensearch-docker-entrypoint.sh {{- end }} - image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" + image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: "{{ .Values.image.PullPolicy }}" ports: - name: http containerPort: {{ .Values.httpPort }} @@ -396,8 +396,8 @@ spec: {{- if eq .Values.roles.master "true" }} # This sidecar will prevent slow master re-election - name: opensearch-master-graceful-termination-handler - image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image }}:{{ .Values.imageTag | default .Chart.AppVersion }}" - imagePullPolicy: "{{ .Values.imagePullPolicy }}" + image: "{{ template "opensearch.dockerRegistry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: "{{ .Values.image.pullPolicy }}" command: - "sh" - -c diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml index 36906cdb..5e19f750 100644 --- a/charts/opensearch/values.yaml +++ b/charts/opensearch/values.yaml @@ -122,10 +122,11 @@ hostAliases: [] # - "foo.local" # - "bar.local" -image: "opensearchproject/opensearch" -# override image tag, which is .Chart.AppVersion by default -imageTag: "" -imagePullPolicy: "IfNotPresent" +image: + repository: "opensearchproject/opensearch" + # override image tag, which is .Chart.AppVersion by default + tag: "" + pullPolicy: "IfNotPresent" podAnnotations: {} # iam.amazonaws.com/role: es-cluster