diff --git a/charts/couchbase-operator/Chart.yaml b/charts/couchbase-operator/Chart.yaml index d13fb02..ece7351 100644 --- a/charts/couchbase-operator/Chart.yaml +++ b/charts/couchbase-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: couchbase-operator description: A Helm chart to deploy the Couchbase Autonomous Operator for easily deploying, managing, and maintaining Couchbase Clusters. Couchbase Server is a NoSQL document database with a distributed architecture for performance, scalability, and availability. It enables developers to build applications easier and faster by leveraging the power of SQL with the flexibility of JSON. -version: 2.40.1 -appVersion: 2.4.0 +version: 2.41.1 +appVersion: 2.4.1 type: application keywords: - couchbase diff --git a/charts/couchbase-operator/README.md b/charts/couchbase-operator/README.md index 46df2e5..e4fac59 100644 --- a/charts/couchbase-operator/README.md +++ b/charts/couchbase-operator/README.md @@ -3,7 +3,7 @@ A Helm chart to deploy the Couchbase Autonomous Operator for easily deploying, managing, and maintaining Couchbase Clusters. Couchbase Server is a NoSQL document database with a distributed architecture for performance, scalability, and availability. It enables developers to build applications easier and faster by leveraging the power of SQL with the flexibility of JSON. -![Version: 2.40.0](https://img.shields.io/badge/Version-2.40.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square) +![Version: 2.40.1](https://img.shields.io/badge/Version-2.40.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square) Deploying the Operator and Couchbase Server =========================================== @@ -40,7 +40,7 @@ for more information about customizing and managing your charts. | admissionCA.key | string | `nil` | A base64 encoded PEM format private key | | admissionController.commandArgs | object | `{"default-file-system-group":true,"validate-secrets":true,"validate-storage-classes":true}` | Set of command-line flags to pass on to the Admission Controller to modify its behavior. Do not change. | | admissionController.disableValidatingWebhook | bool | `false` | Disable the creation of Validation webhook. Setting to 'false' may be helpful when installing into a restricted environments (ie Strict mTLS), since disabling avoids performing resource fetching and validation from the Kubernetes API server. | -| admissionController.image | object | `{"repository":"couchbase/admission-controller","tag":"2.4.0"}` | Image specifies repository and tag of the Couchbase Admission container. | +| admissionController.image | object | `{"repository":"couchbase/admission-controller","tag":"2.4.1"}` | Image specifies repository and tag of the Couchbase Admission container. | | admissionController.imagePullPolicy | string | `"IfNotPresent"` | The policy for pulling images from the repository onto hosts. The imagePullPolicy value defaults to IfNotPresent, which means that images are only pulled if they’re not present on the Kubernetes node. Values allowed are Always, IfNotPresent, and Never. | | admissionController.imagePullSecrets | list | `[]` | ImagePullSecrets is an optional list of references to secrets to use for pulling images | | admissionController.name | string | `"couchbase-admission-controller"` | | @@ -254,7 +254,7 @@ for more information about customizing and managing your charts. | coredns.service | string | `nil` | Name of Kubernetes service which exposes DNS endpoints | | couchbaseOperator.commandArgs | object | `{"pod-create-timeout":"10m"}` | Set of command-line flags to pass on to the Operator to modify its behavior. see: https://docs.couchbase.com/operator/2.0/reference-operator-configuration.html#command-line-arguments | | couchbaseOperator.commandArgs.pod-create-timeout | string | `"10m"` | Pod creation timeout. The Operator allows the timeout of pod creation to be manually configured. It is primarily intended for use on cloud platforms where the deployment of multiple volumes and pulling of a Couchbase Server container image may take a longer time than the default timeout period. | -| couchbaseOperator.image | object | `{"repository":"couchbase/operator","tag":"2.4.0"}` | Image specifies repository and tag of the Couchbase Operator container. | +| couchbaseOperator.image | object | `{"repository":"couchbase/operator","tag":"2.4.1"}` | Image specifies repository and tag of the Couchbase Operator container. | | couchbaseOperator.imagePullPolicy | string | `"IfNotPresent"` | The policy for pulling images from the repository onto hosts. The imagePullPolicy value defaults to IfNotPresent, which means that images are only pulled if they’re not present on the Kubernetes node. Values allowed are Always, IfNotPresent, and Never. | | couchbaseOperator.imagePullSecrets | list | `[]` | ImagePullSecrets is an optional list of references to secrets to use for pulling images. | | couchbaseOperator.name | string | `"couchbase-operator"` | Name of the couchbase operator Deployment | diff --git a/charts/couchbase-operator/README.md.adoc b/charts/couchbase-operator/README.md.adoc index 4949a98..3a57b79 100644 --- a/charts/couchbase-operator/README.md.adoc +++ b/charts/couchbase-operator/README.md.adoc @@ -5,7 +5,7 @@ | admissionCA.key | string | `nil` | A base64 encoded PEM format private key | admissionController.commandArgs | object | `{"default-file-system-group":true,"validate-secrets":true,"validate-storage-classes":true}` | Set of command-line flags to pass on to the Admission Controller to modify its behavior. Do not change. | admissionController.disableValidatingWebhook | bool | `false` | Disable the creation of Validation webhook. Setting to 'false' may be helpful when installing into a restricted environments (ie Strict mTLS), since disabling avoids performing resource fetching and validation from the Kubernetes API server. -| admissionController.image | object | `{"repository":"couchbase/admission-controller","tag":"2.4.0"}` | Image specifies repository and tag of the Couchbase Admission container. +| admissionController.image | object | `{"repository":"couchbase/admission-controller","tag":"2.4.1"}` | Image specifies repository and tag of the Couchbase Admission container. | admissionController.imagePullPolicy | string | `"IfNotPresent"` | The policy for pulling images from the repository onto hosts. The imagePullPolicy value defaults to IfNotPresent, which means that images are only pulled if they’re not present on the Kubernetes node. Values allowed are Always, IfNotPresent, and Never. | admissionController.imagePullSecrets | list | `[]` | ImagePullSecrets is an optional list of references to secrets to use for pulling images | admissionController.name | string | `"couchbase-admission-controller"` | @@ -232,7 +232,7 @@ | coredns.service | string | `nil` | Name of Kubernetes service which exposes DNS endpoints | couchbaseOperator.commandArgs | object | `{"pod-create-timeout":"10m"}` | Set of command-line flags to pass on to the Operator to modify its behavior. see: https://docs.couchbase.com/operator/2.0/reference-operator-configuration.html#command-line-arguments | couchbaseOperator.commandArgs.pod-create-timeout | string | `"10m"` | Pod creation timeout. The Operator allows the timeout of pod creation to be manually configured. It is primarily intended for use on cloud platforms where the deployment of multiple volumes and pulling of a Couchbase Server container image may take a longer time than the default timeout period. -| couchbaseOperator.image | object | `{"repository":"couchbase/operator","tag":"2.4.0"}` | Image specifies repository and tag of the Couchbase Operator container. +| couchbaseOperator.image | object | `{"repository":"couchbase/operator","tag":"2.4.1"}` | Image specifies repository and tag of the Couchbase Operator container. | couchbaseOperator.imagePullPolicy | string | `"IfNotPresent"` | The policy for pulling images from the repository onto hosts. The imagePullPolicy value defaults to IfNotPresent, which means that images are only pulled if they’re not present on the Kubernetes node. Values allowed are Always, IfNotPresent, and Never. | couchbaseOperator.imagePullSecrets | list | `[]` | ImagePullSecrets is an optional list of references to secrets to use for pulling images. | couchbaseOperator.name | string | `"couchbase-operator"` | Name of the couchbase operator Deployment diff --git a/charts/couchbase-operator/crds/couchbase.crds.yaml b/charts/couchbase-operator/crds/couchbase.crds.yaml index b9bd8a8..e1fa420 100644 --- a/charts/couchbase-operator/crds/couchbase.crds.yaml +++ b/charts/couchbase-operator/crds/couchbase.crds.yaml @@ -874,9 +874,6 @@ spec: format: int32 minimum: 0 type: integer - required: - - ephemeralVolume - - strategy type: object status: description: CouchbaseBackupStatus provides status notifications about diff --git a/charts/couchbase-operator/templates/couchbase-bucket.yaml b/charts/couchbase-operator/templates/couchbase-bucket.yaml index 5d7fd82..f6789e7 100644 --- a/charts/couchbase-operator/templates/couchbase-bucket.yaml +++ b/charts/couchbase-operator/templates/couchbase-bucket.yaml @@ -1,7 +1,7 @@ {{- if .Values.install.couchbaseCluster }} {{- if .Values.buckets }} --- -{{- $rootScope := . -}} +{{- $rootScope := . }} apiVersion: v1 kind: List metadata: @@ -13,15 +13,18 @@ items: kind: {{ default "CouchbaseBucket" $spec.kind }} metadata: name: {{ default $bucket $spec.resourceName }} + {{- if hasKey $spec "annotations" }} + annotations: + {{ $spec.annotations | toYaml | indent 4 }} + {{- end }} labels: cluster: {{ include "couchbase-cluster.clustername" $rootScope }} spec: - {{/* Remove index replica for Ephemeral Type */}} {{- if eq (default $spec.kind "CouchbaseBucket") "CouchbaseEphemeralBucket" -}} {{- $spec := unset $spec "enableIndexReplica" -}} {{- end -}} -{{ omit $spec "kind" | toYaml | indent 4 }} +{{- omit $spec "kind" "annotations" | toYaml | indent 4 }} {{- end }} {{- end }} {{- end }} diff --git a/charts/couchbase-operator/templates/couchbase-rbac.yaml b/charts/couchbase-operator/templates/couchbase-rbac.yaml index 49e5b7c..017f01d 100644 --- a/charts/couchbase-operator/templates/couchbase-rbac.yaml +++ b/charts/couchbase-operator/templates/couchbase-rbac.yaml @@ -1,8 +1,6 @@ -{{- if .Values.cluster.backup.managed -}} {{- $clusterName := (include "couchbase-cluster.clustername" .) -}} - {{/* List of Groups */}} {{- if .Values.groups }} --- @@ -85,7 +83,7 @@ items: {{- end }} -{{/* List of Collections */}} +{{/* List of Collection Groups */}} {{- if .Values.collectiongroups }} --- apiVersion: couchbase.com/v2 @@ -105,23 +103,26 @@ items: {{- end }} {{- end }} -{{/* List of Collection Groups */}} -{{- if .Values.collectiongroups }} +{{/* List of Collection */}} +{{- if .Values.collections }} --- apiVersion: couchbase.com/v2 kind: CouchbaseCollectionList items: {{- range $name, $spec := .Values.collections }} -{{- if typeIs "map[string]interface {}" $spec }} - apiVersion: couchbase.com/v2 kind: CouchbaseCollection metadata: name: {{ default $name $spec.name}} + {{- if hasKey $spec "annotations" }} + annotations: + {{ $spec.annotations | toYaml | indent 4 }} + {{- end }} labels: cluster: {{ $clusterName }} +{{- if typeIs "map[string]interface {}" $spec }} spec: -{{ omit $spec "name" | toYaml | indent 4 }} -{{- end }} +{{ omit $spec "name" "annotations" | toYaml | indent 4 }} {{- end }} {{- end }} diff --git a/charts/couchbase-operator/values-all.yaml b/charts/couchbase-operator/values-all.yaml index 6c824b3..d16c2f6 100644 --- a/charts/couchbase-operator/values-all.yaml +++ b/charts/couchbase-operator/values-all.yaml @@ -20,7 +20,7 @@ couchbaseOperator: # -- Image specifies repository and tag of the Couchbase Operator container. image: repository: couchbase/operator - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. @@ -53,7 +53,7 @@ admissionController: # -- Image specifies repository and tag of the Couchbase Admission container. image: repository: couchbase/admission-controller - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. diff --git a/charts/couchbase-operator/values.yaml b/charts/couchbase-operator/values.yaml index 196fff4..8e81c2a 100644 --- a/charts/couchbase-operator/values.yaml +++ b/charts/couchbase-operator/values.yaml @@ -20,7 +20,7 @@ couchbaseOperator: # -- Image specifies repository and tag of the Couchbase Operator container. image: repository: couchbase/operator - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. @@ -53,7 +53,7 @@ admissionController: # -- Image specifies repository and tag of the Couchbase Admission container. image: repository: couchbase/admission-controller - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. diff --git a/charts/couchbase-operator/values.yamltmpl b/charts/couchbase-operator/values.yamltmpl index f5bf5a1..eff0721 100644 --- a/charts/couchbase-operator/values.yamltmpl +++ b/charts/couchbase-operator/values.yamltmpl @@ -20,7 +20,7 @@ couchbaseOperator: # -- Image specifies repository and tag of the Couchbase Operator container. image: repository: couchbase/operator - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. @@ -53,7 +53,7 @@ admissionController: # -- Image specifies repository and tag of the Couchbase Admission container. image: repository: couchbase/admission-controller - tag: 2.4.0 + tag: 2.4.1 # -- The policy for pulling images from the repository onto hosts. # The imagePullPolicy value defaults to IfNotPresent, which means # that images are only pulled if they’re not present on the Kubernetes node. @@ -311,8 +311,6 @@ scopes: {} # # contain only [a-zA-Z0-9_-%] and not start with either _ or %. # name: - - # -- Uncomment to create a "couchbasegroups" resource groups: {} # default: