From c6097ba00b6f23a9fb0dc4a3c593651524046279 Mon Sep 17 00:00:00 2001 From: Alberto Llamas Date: Fri, 3 Jun 2022 13:19:30 +0200 Subject: [PATCH 1/3] Adding missing spec to CRD in helm chart Distributed CRD is missing `dashboards.additionalConfig` spec in helm chart Signed-off-by: Alberto Llamas --- .../opensearchclusters.opensearch.opster.io-crd.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml b/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml index 5bc92cfa..ed63a97e 100644 --- a/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml +++ b/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml @@ -53,6 +53,10 @@ spec: type: object dashboards: properties: + additionalConfig: + additionalProperties: + type: string + type: object enable: type: boolean opensearchCredentialsSecret: From f32d9dd1b8603397e60d1125e97f00970b2468f7 Mon Sep 17 00:00:00 2001 From: Alberto Llamas Date: Thu, 9 Jun 2022 19:56:25 +0200 Subject: [PATCH 2/3] Additional changes - Update Chart version - Added Chart version to CHANGELOG file - Matching content of file `opensearch.opster.io_opensearchclusters.yaml` and `charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml` Signed-off-by: Alberto Llamas --- charts/opensearch-operator/CHANGELOG.md | 10 ++ charts/opensearch-operator/Chart.yaml | 2 +- ...archclusters.opensearch.opster.io-crd.yaml | 118 ++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-) diff --git a/charts/opensearch-operator/CHANGELOG.md b/charts/opensearch-operator/CHANGELOG.md index 9372669b..3786ceb7 100644 --- a/charts/opensearch-operator/CHANGELOG.md +++ b/charts/opensearch-operator/CHANGELOG.md @@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security +--- +## [1.0.3] +### Added +### Changed +- Added missing spec `dashboards.additionalConfig` +### Deprecated +### Removed +### Fixed +### Security + --- ## [1.0.2] ### Added diff --git a/charts/opensearch-operator/Chart.yaml b/charts/opensearch-operator/Chart.yaml index 098ed4e4..5a2f2e73 100644 --- a/charts/opensearch-operator/Chart.yaml +++ b/charts/opensearch-operator/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.2 +version: 1.0.3 # 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-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml b/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml index ed63a97e..3b6dcf47 100644 --- a/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml +++ b/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml @@ -56,6 +56,7 @@ spec: additionalConfig: additionalProperties: type: string + description: Additional properties for opensearch_dashboards.yaml type: object enable: type: boolean @@ -1080,8 +1081,125 @@ spec: type: string diskSize: type: string + env: + items: + description: EnvVar represents an environment variable present + in a Container. + properties: + name: + description: Name of the environment variable. Must be + a C_IDENTIFIER. + type: string + value: + description: 'Variable references $(VAR_NAME) are expanded + using the previously defined environment variables in + the container and any service environment variables. + If a variable cannot be resolved, the reference in the + input string will be unchanged. Double $$ are reduced + to a single $, which allows for escaping the $(VAR_NAME) + syntax: i.e. "$$(VAR_NAME)" will produce the string + literal "$(VAR_NAME)". Escaped references will never + be expanded, regardless of whether the variable exists + or not. Defaults to "".' + type: string + valueFrom: + description: Source for the environment variable's value. + Cannot be used if value is not empty. + properties: + configMapKeyRef: + description: Selects a key of a ConfigMap. + properties: + key: + description: The key to select. + type: string + name: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the ConfigMap or + its key must be defined + type: boolean + required: + - key + type: object + fieldRef: + description: 'Selects a field of the pod: supports + metadata.name, metadata.namespace, `metadata.labels['''']`, + `metadata.annotations['''']`, spec.nodeName, + spec.serviceAccountName, status.hostIP, status.podIP, + status.podIPs.' + properties: + apiVersion: + description: Version of the schema the FieldPath + is written in terms of, defaults to "v1". + type: string + fieldPath: + description: Path of the field to select in the + specified API version. + type: string + required: + - fieldPath + type: object + resourceFieldRef: + description: 'Selects a resource of the container: + only resources limits and requests (limits.cpu, + limits.memory, limits.ephemeral-storage, requests.cpu, + requests.memory and requests.ephemeral-storage) + are currently supported.' + properties: + containerName: + description: 'Container name: required for volumes, + optional for env vars' + type: string + divisor: + anyOf: + - type: integer + - type: string + description: Specifies the output format of the + exposed resources, defaults to "1" + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + resource: + description: 'Required: resource to select' + type: string + required: + - resource + type: object + secretKeyRef: + description: Selects a key of a secret in the pod's + namespace + properties: + key: + description: The key of the secret to select from. Must + be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: + https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, + uid?' + type: string + optional: + description: Specify whether the Secret or its + key must be defined + type: boolean + required: + - key + type: object + type: object + required: + - name + type: object + type: array jvm: type: string + labels: + additionalProperties: + type: string + type: object nodeSelector: additionalProperties: type: string From c8be0e3abbfeb3bd47e9049212d186f20b16ef38 Mon Sep 17 00:00:00 2001 From: Alberto Llamas Date: Thu, 9 Jun 2022 22:21:32 +0200 Subject: [PATCH 3/3] Fix Changelog Signed-off-by: Alberto Llamas --- charts/opensearch-operator/CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/opensearch-operator/CHANGELOG.md b/charts/opensearch-operator/CHANGELOG.md index 3786ceb7..797b2bb4 100644 --- a/charts/opensearch-operator/CHANGELOG.md +++ b/charts/opensearch-operator/CHANGELOG.md @@ -43,5 +43,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed ### Security -[Unreleased]: https://github.com/Opster/opensearch-k8s-operator/compare/opensearch-operator-1.0.2...HEAD -[1.0.2]: https://github.com/Opster/opensearch-k8s-operator/compare/opensearch-operator-1.0.1...1.0.2 +[Unreleased]: https://github.com/Opster/opensearch-k8s-operator/compare/opensearch-operator-1.0.3...HEAD +[1.0.3]: https://github.com/Opster/opensearch-k8s-operator/compare/opensearch-operator-1.0.2...opensearch-operator-1.0.3 +[1.0.2]: https://github.com/Opster/opensearch-k8s-operator/compare/opensearch-operator-1.0.1...opensearch-operator-1.0.2