Skip to content

Commit a304f35

Browse files
authored
Merge pull request #103 from tahmmee/2.4.x
2.4.0 Release
2 parents ebca67d + 19084a5 commit a304f35

File tree

13 files changed

+1790
-303
lines changed

13 files changed

+1790
-303
lines changed

.github/workflows/publish-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# Triggers the workflow on push or pull request events but only for the main branch
88
push:
99
branches:
10-
- 2.3.x
10+
- 2.4.x
1111
# Ignore anything unrelated to a chart release
1212
paths-ignore:
1313
- 'charts/couchbase-operator/examples/**'

.github/workflows/validate-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Validate CI
55
on:
66
pull_request:
77
branches:
8-
- 2.3.x
8+
- 2.4.x
99
# Ignore anything unrelated to a chart release
1010
paths-ignore:
1111
- 'charts/couchbase-operator/examples/**'

charts/couchbase-operator/Chart.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: couchbase-operator
33
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.
4-
version: 2.32.2
5-
appVersion: 2.3.2
4+
version: 2.40.0
5+
appVersion: 2.4.0
66
type: application
77
keywords:
88
- couchbase
@@ -20,3 +20,5 @@ maintainers:
2020
2121
- name: Tommie McAfee
2222
23+
- name: Alex Emery
24+

charts/couchbase-operator/README.md

Lines changed: 28 additions & 21 deletions
Large diffs are not rendered by default.

charts/couchbase-operator/README.md.adoc

Lines changed: 30 additions & 23 deletions
Large diffs are not rendered by default.

charts/couchbase-operator/crds/couchbase.crds.yaml

Lines changed: 1520 additions & 147 deletions
Large diffs are not rendered by default.

charts/couchbase-operator/templates/admission-deployment.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,12 @@ rules:
194194
- secrets
195195
verbs:
196196
- get
197-
- apiGroups:
198-
- ""
199-
resources:
200-
- namespaces
201-
verbs:
202-
- get
203197
- apiGroups:
204198
- storage.k8s.io
205199
resources:
206200
- storageclasses
207201
verbs:
208202
- get
209-
210203
---
211204
apiVersion: rbac.authorization.k8s.io/v1
212205
kind: {{ printf "%sBinding" .Values.admissionController.scope }}

charts/couchbase-operator/templates/operator-deployment.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,29 @@ rules:
114114
- apiGroups:
115115
- couchbase.com
116116
resources:
117-
- couchbasebuckets
118-
- couchbaseephemeralbuckets
119-
- couchbasememcachedbuckets
120117
- couchbasereplications
121118
- couchbasemigrationreplications
122119
- couchbaseusers
123120
- couchbasegroups
124121
- couchbaserolebindings
125122
- couchbasebackups
123+
verbs:
124+
- list
125+
- watch
126+
- apiGroups:
127+
- couchbase.com
128+
resources:
129+
- couchbasebuckets
130+
- couchbaseephemeralbuckets
131+
- couchbasememcachedbuckets
126132
- couchbasescopes
127133
- couchbasescopegroups
128134
- couchbasecollections
129135
- couchbasecollectiongroups
130136
verbs:
131137
- list
132138
- watch
139+
- create
133140
- apiGroups:
134141
- couchbase.com
135142
resources:
@@ -161,6 +168,8 @@ rules:
161168
- configmaps
162169
verbs:
163170
- get
171+
- list
172+
- watch
164173
- create
165174
- update
166175
- delete

charts/couchbase-operator/values-all.yaml

Lines changed: 132 additions & 72 deletions
Large diffs are not rendered by default.

charts/couchbase-operator/values.yaml

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ couchbaseOperator:
2020
# -- Image specifies repository and tag of the Couchbase Operator container.
2121
image:
2222
repository: couchbase/operator
23-
tag: 2.3.2
23+
tag: 2.4.0
2424
# -- The policy for pulling images from the repository onto hosts.
2525
# The imagePullPolicy value defaults to IfNotPresent, which means
2626
# that images are only pulled if they’re not present on the Kubernetes node.
@@ -53,7 +53,7 @@ admissionController:
5353
# -- Image specifies repository and tag of the Couchbase Admission container.
5454
image:
5555
repository: couchbase/admission-controller
56-
tag: 2.3.2
56+
tag: 2.4.0
5757
# -- The policy for pulling images from the repository onto hosts.
5858
# The imagePullPolicy value defaults to IfNotPresent, which means
5959
# that images are only pulled if they’re not present on the Kubernetes node.
@@ -106,7 +106,7 @@ admissionCA:
106106
# -- A base64 encoded PEM format private key
107107
key:
108108
# -- Expiry time of CA in days for generated certs
109-
expiration: 365
109+
expiration: 3650
110110

111111
# secret with client certs mounted within the admission controller.
112112
admissionSecret:
@@ -576,7 +576,7 @@ syncGateway:
576576
# -- Image of the sync gateway container
577577
image:
578578
repository: couchbase/sync-gateway
579-
tag: 3.0.3-enterprise
579+
tag: 3.0.4-enterprise
580580
imagePullPolicy: IfNotPresent
581581
# -- Optional secret to use with prepoulated database config
582582
configSecret:
@@ -598,8 +598,6 @@ syncGateway:
598598
requests:
599599
storage: 1Gi
600600

601-
602-
603601
# @default -- will be filled in as below
604602
# -- Disable default bucket creation by setting buckets.default: null. Note that
605603
# setting default to null can throw a warning:
@@ -677,6 +675,12 @@ buckets:
677675
# doesn't match a resource, then no error conditions are raised due to
678676
# undefined resource creation ordering and eventual consistency.
679677
resources: []
678+
# -- StorageBackend to be assigned to and used by the bucket. Only valid for
679+
# Couchbase Server 7.0.0 onward. Two different backend storage mechanisms
680+
# can be used - "couchstore" or "magma", defaulting to "couchstore". This
681+
# cannot be edited after bucket creation. Note: "magma" is only valid for
682+
# Couchbase Server 7.1.0 onward.
683+
storageBackend: couchstore
680684

681685
# @default -- will be filled in as below
682686
# -- Controls the generation of the CouchbaseCluster CRD
@@ -723,22 +727,23 @@ cluster:
723727
# automated-backup
724728
backup:
725729
# -- The Backup Image to run on backup pods.
726-
image: couchbase/operator-backup:1.2.0
730+
image: couchbase/operator-backup:1.3.1
727731
# -- Managed defines whether backups are managed by us or the clients.
728732
managed: true
729-
# -- ObjectEndpoint contains the configuration for connecting to a custom S3
730-
# compliant object store.
733+
# -- Deprecated: by CouchbaseBackup.spec.objectStore.Endpoint ObjectEndpoint
734+
# contains the configuration for connecting to a custom S3 compliant object
735+
# store.
731736
objectEndpoint:
732737
# -- UseVirtualPath will force the AWS SDK to use the new virtual style
733-
# paths. by default alternative path style URLs which are often required
734-
# by S3 compatible object stores.
738+
# paths which are often required by S3 compatible object stores.
735739
useVirtualPath: false
736740
# -- The Service Account to run backup (and restore) pods under. Without
737741
# this backup pods will not be able to update status.
738742
serviceAccountName: couchbase-backup
739-
# -- UseIAMRole enables backup to fetch EC2 instance metadata. This allows
740-
# the AWS SDK to use the EC2's IAM Role for S3 access. UseIAMRole will
741-
# ignore credentials in s3Secret.
743+
# -- Deprecated: by CouchbaseBackup.spec.objectStore.useIAM UseIAMRole
744+
# enables backup to fetch EC2 instance metadata. This allows the AWS SDK to
745+
# use the EC2's IAM Role for S3 access. UseIAMRole will ignore credentials
746+
# in s3Secret.
742747
useIAMRole: false
743748
# -- Buckets defines whether the Operator should manage buckets, and how to
744749
# lookup bucket resources.
@@ -812,7 +817,7 @@ cluster:
812817
percent: 30
813818
# -- AutoFailoverMaxCount is the maximum number of automatic failovers
814819
# Couchbase server will allow before not allowing any more. This field must
815-
# be between 1-3, default 3.
820+
# be between 1-3 for server versions prior to 7.1.0 default is 3.
816821
autoFailoverMaxCount: 3
817822
# -- AutoFailoverOnDataDiskIssues defines whether Couchbase server should
818823
# failover a pod if a disk issue was detected.
@@ -823,6 +828,8 @@ cluster:
823828
# https://golang.org/pkg/time/#ParseDuration
824829
autoFailoverOnDataDiskIssuesTimePeriod: 120s
825830
# -- AutoFailoverServerGroup whether to enable failing over a server group.
831+
# This field is ignored in server versions 7.1+ as it has been removed from
832+
# the Couchbase API
826833
autoFailoverServerGroup: false
827834
# -- AutoFailoverTimeout defines how long Couchbase server will wait between
828835
# a pod being witnessed as down, until when it will failover the pod.
@@ -871,6 +878,17 @@ cluster:
871878
# snapshotted. This defaults to 200ms, and must be greater than or equal
872879
# to 1ms.
873880
memorySnapshotInterval: 200ms
881+
# -- NumberOfReplica specifies number of secondary index replicas to be
882+
# created by the Index Service whenever CREATE INDEX is invoked, which
883+
# ensures high availability and high performance. Note, if nodes and
884+
# num_replica are both specified in the WITH clause, the specified number
885+
# of nodes must be one greater than num_replica This defaults to 0, which
886+
# means no index replicas to be created by default. Minimum must be 0.
887+
numReplica: 0
888+
# -- RedistributeIndexes when true, Couchbase Server redistributes indexes
889+
# when rebalance occurs, in order to optimize performance. If false (the
890+
# default), such redistribution does not occur.
891+
redistributeIndexes: false
874892
# -- StableSnapshotInterval controls when disk indexes should be
875893
# snapshotted. This defaults to 5s, and must be greater than or equal to
876894
# 1ms.
@@ -921,9 +939,15 @@ cluster:
921939
# longer restricts autoscaling to ephemeral services. EnablePreviewScaling
922940
# enables autoscaling for stateful services and buckets.
923941
enablePreviewScaling: false
942+
# -- EnvImagePrecedence gives precedence over the default container image name
943+
# in `spec.Image` to an image name provided through Operator environment
944+
# variables. For more info on using Operator environment variables:
945+
# https://docs.couchbase.com/operator/current/reference-operator-
946+
# configuration.html
947+
envImagePrecedence: false
924948
# -- Hibernate is whether to hibernate the cluster.
925949
hibernate: false
926-
image: couchbase/server:7.0.2
950+
image: couchbase/server:7.1.3
927951
# -- Logging defines Operator logging options.
928952
logging:
929953
# -- Used to manage the audit configuration directly
@@ -1076,6 +1100,10 @@ cluster:
10761100
rbac:
10771101
# -- Managed defines whether RBAC is managed by us or the clients.
10781102
managed: true
1103+
# -- UISessionTimeout sets how long, in minutes, before a user is declared
1104+
# inactive and signed out from the Couchbase Server UI. 0 represents no time
1105+
# out.
1106+
uiSessionTimeout: 0
10791107
# -- Cluster administrator username
10801108
username: Administrator
10811109
# -- SecurityContext allows the configuration of the security context for all

0 commit comments

Comments
 (0)