Merge pull request #120 from couchbase-partners/K8S-3280

K8S-3280 Updates for 2.6.0

Author: Lumin343

.github/workflows/publish-ci.yml

@@ -7,7 +7,7 @@ on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches:
-      - 2.5.x
+      - 2.6.x
     # Ignore anything unrelated to a chart release
     paths-ignore:
       - 'charts/couchbase-operator/examples/**'

.github/workflows/validate-ci.yml

@@ -5,7 +5,7 @@ name: Validate CI
 on:
   pull_request:
     branches:
-      - 2.5.x
+      - 2.6.x
     # Ignore anything unrelated to a chart release
     paths-ignore:
       - 'charts/couchbase-operator/examples/**'

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.50.4
-appVersion: 2.5.0
+version: 2.60.0
+appVersion: 2.6.0
 type: application
 keywords:
 - couchbase

charts/couchbase-operator/README.md

@@ -20,7 +20,7 @@ couchbaseOperator:
   # -- Image specifies repository and tag of the Couchbase Operator container.
   image:
     repository: couchbase/operator
-    tag: 2.5.0
+    tag: 2.6.0
   # -- 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.5.0
+    tag: 2.6.0
   # -- 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.
@@ -945,7 +945,7 @@ cluster:
   envImagePrecedence: false
   # -- Hibernate is whether to hibernate the cluster.
   hibernate: false
-  image: couchbase/server:7.2.0
+  image: couchbase/server:7.2.3
   # -- Logging defines Operator logging options.
   logging:
     # -- Used to manage the audit configuration directly
@@ -1039,7 +1039,7 @@ cluster:
     # must also be enabled. The Operator reserves the right to modify or replace
     # any field.  More info:
     # https://kubernetes.io/docs/reference/generated/kubernetes-
-    # api/v1.21/#service-v1-core
+    # api/v1.28/#service-v1-core
     adminConsoleServiceTemplate:
       # -- ServiceSpec describes the attributes that a user creates on a
       # service.
@@ -1063,7 +1063,7 @@ cluster:
     # must also be enabled. The Operator reserves the right to modify or replace
     # any field.  More info:
     # https://kubernetes.io/docs/reference/generated/kubernetes-
-    # api/v1.21/#service-v1-core
+    # api/v1.28/#service-v1-core
     exposedFeatureServiceTemplate:
       # -- ServiceSpec describes the attributes that a user creates on a
       # service.
@@ -1116,14 +1116,10 @@ cluster:
       # cannot be set when spec.os.name is linux.
       windowsOptions:
         # HostProcess determines if a container should be run as a 'Host
-        # Process' container. This field is alpha-level and will only be honored
-        # by components that enable the WindowsHostProcessContainers feature
-        # flag. Setting this field without the feature flag will result in
-        # errors when validating the Pod. All of a Pod's containers must have
-        # the same effective HostProcess value (it is not allowed to have a mix
-        # of HostProcess containers and non-HostProcess containers).  In
-        # addition, if HostProcess is true then HostNetwork must also be set to
-        # true.
+        # Process' container. All of a Pod's containers must have the same
+        # effective HostProcess value (it is not allowed to have a mix of
+        # HostProcess containers and non-HostProcess containers). In addition,
+        # if HostProcess is true then HostNetwork must also be set to true.
         hostProcess: false
     # -- RBAC is the options provided for enabling and selecting RBAC User
     # resources to manage.
@@ -1176,7 +1172,7 @@ cluster:
       # cluster upgrade in order to fulfill the request. The Operator reserves
       # the right to modify or replace any field.  More info:
       # https://kubernetes.io/docs/reference/generated/kubernetes-
-      # api/v1.21/#pod-v1-core
+      # api/v1.28/#pod-v1-core
       pod:
         spec: {}
       services:

charts/couchbase-operator/README.md.adoc

@@ -20,7 +20,7 @@ couchbaseOperator:
   # -- Image specifies repository and tag of the Couchbase Operator container.
   image:
     repository: couchbase/operator
-    tag: 2.5.0
+    tag: 2.6.0
   # -- 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.5.0
+    tag: 2.6.0
   # -- 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.

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

@@ -158,7 +158,7 @@ def postProcessCluster(crd_value, value_map, comment_map) :
   value_map[crd_value]['backup']['managed'] = True
 
   value_map[crd_value]['buckets']['managed'] = True
-  value_map[crd_value]['image'] = 'couchbase/server:7.2.0'
+  value_map[crd_value]['image'] = 'couchbase/server:7.2.3'
   comment_map[(crd_value, 'backup')] += "  Refer to the documentation for supported values https://docs.couchbase.com/operator/current/howto-backup.html#enable-automated-backup"
 
   value_map[crd_value]['networking']['adminConsoleServices'] = ['data']