Skip to content

Commit

Permalink
Merge pull request #96 from tahmmee/2.3.x
Browse files Browse the repository at this point in the history
2.3.2 Release
  • Loading branch information
tahmmee authored Aug 17, 2022
2 parents 9de09b4 + 0aed83b commit 947d621
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion charts/couchbase-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ for more information about customizing and managing your charts.
| cluster.logging.server.configurationName | string | `"fluent-bit-config"` | ConfigurationName is the name of the Secret to use holding the logging configuration in the namespace. A Secret is used to ensure we can safely store credentials but this can be populated from plaintext if acceptable too. If it does not exist then one will be created with defaults in the namespace so it can be easily updated whilst running. Note that if running multiple clusters in the same kubernetes namespace then you should use a separate Secret for each, otherwise the first cluster will take ownership (if created) and the Secret will be cleaned up when that cluster is removed. If running clusters in separate namespaces then they will be separate Secrets anyway. |
| cluster.logging.server.enabled | bool | `false` | Enabled is a boolean that enables the logging sidecar container. |
| cluster.logging.server.manageConfiguration | bool | `true` | A boolean which indicates whether the operator should manage the configuration or not. If omitted then this defaults to true which means the operator will attempt to reconcile it to default values. To use a custom configuration make sure to set this to false. Note that the ownership of any Secret is not changed so if a Secret is created externally it can be updated by the operator but it's ownership stays the same so it will be cleaned up when it's owner is. |
| cluster.logging.server.sidecar | object | `{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.0","resources":{"limits":null,"requests":null}}` | Any specific logging sidecar container configuration. |
| cluster.logging.server.sidecar | object | `{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.1","resources":{"limits":null,"requests":null}}` | Any specific logging sidecar container configuration. |
| cluster.monitoring | object | `{}` | Monitoring defines any Operator managed integration into 3rd party monitoring infrastructure. |
| cluster.name | string | `nil` | Name of the cluster, defaults to name of chart release |
| cluster.networking.addressFamily | string | `nil` | AddressFamily allows the manual selection of the address family to use. When this field is not set, Couchbase server will default to using IPv4 for internal communication and also support IPv6 on dual stack systems. Setting this field to either IPv4 or IPv6 will force Couchbase to use the selected protocol for internal communication, and also disable all other protocols to provide added security and simplicty when defining firewall rules. Disabling of address families is only supported in Couchbase Server 7.0.2+. |
Expand Down
6 changes: 3 additions & 3 deletions charts/couchbase-operator/README.md.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
| cluster.hibernate | bool | `false` | Hibernate is whether to hibernate the cluster.
| cluster.hibernationStrategy | string | `nil` | HibernationStrategy defines how to hibernate the cluster. When Immediate the Operator will immediately delete all pods and take no further action until the hibernate field is set to false.
| cluster.image | string | `"couchbase/server:7.0.2"` | Image is the container image name that will be used to launch Couchbase server instances. Updating this field will cause an automatic upgrade of the cluster.
| cluster.logging | object | `{"audit":{"disabledEvents":null,"disabledUsers":null,"enabled":false,"garbageCollection":{"sidecar":{"age":"1h","enabled":false,"image":"busybox:1.33.1","interval":"20m","resources":{"limits":null,"requests":null}}},"rotation":{"interval":"15m","size":"20Mi"}},"logRetentionCount":null,"logRetentionTime":null,"server":{"configurationName":"fluent-bit-config","enabled":false,"manageConfiguration":true,"sidecar":{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.0","resources":{"limits":null,"requests":null}}}}` | Logging defines Operator logging options.
| cluster.logging | object | `{"audit":{"disabledEvents":null,"disabledUsers":null,"enabled":false,"garbageCollection":{"sidecar":{"age":"1h","enabled":false,"image":"busybox:1.33.1","interval":"20m","resources":{"limits":null,"requests":null}}},"rotation":{"interval":"15m","size":"20Mi"}},"logRetentionCount":null,"logRetentionTime":null,"server":{"configurationName":"fluent-bit-config","enabled":false,"manageConfiguration":true,"sidecar":{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.1","resources":{"limits":null,"requests":null}}}}` | Logging defines Operator logging options.
| cluster.logging.audit | object | `{"disabledEvents":null,"disabledUsers":null,"enabled":false,"garbageCollection":{"sidecar":{"age":"1h","enabled":false,"image":"busybox:1.33.1","interval":"20m","resources":{"limits":null,"requests":null}}},"rotation":{"interval":"15m","size":"20Mi"}}` | Used to manage the audit configuration directly
| cluster.logging.audit.disabledEvents | string | `nil` | The list of event ids to disable for auditing purposes. This is passed to the REST API with no verification by the operator. Refer to the documentation for details: https://docs.couchbase.com/server/current/audit-event-reference/audit-event-reference.html
| cluster.logging.audit.disabledUsers | string | `nil` | The list of users to ignore for auditing purposes. This is passed to the REST API with minimal validation it meets an acceptable regex pattern. Refer to the documentation for full details on how to configure this: https://docs.couchbase.com/server/current/manage/manage-security/manage-auditing.html#ignoring-events-by-user
Expand All @@ -127,11 +127,11 @@
| cluster.logging.audit.rotation | object | `{"interval":"15m","size":"20Mi"}` | The interval to optionally rotate the audit log. This is passed to the REST API, see here for details: https://docs.couchbase.com/server/current/manage/manage-security/manage-auditing.html
| cluster.logging.logRetentionCount | string | `nil` | LogRetentionCount gives the number of persistent log PVCs to keep.
| cluster.logging.logRetentionTime | string | `nil` | LogRetentionTime gives the time to keep persistent log PVCs alive for.
| cluster.logging.server | object | `{"configurationName":"fluent-bit-config","enabled":false,"manageConfiguration":true,"sidecar":{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.0","resources":{"limits":null,"requests":null}}}` | Specification of all logging configuration required to manage the sidecar containers in each pod.
| cluster.logging.server | object | `{"configurationName":"fluent-bit-config","enabled":false,"manageConfiguration":true,"sidecar":{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.1","resources":{"limits":null,"requests":null}}}` | Specification of all logging configuration required to manage the sidecar containers in each pod.
| cluster.logging.server.configurationName | string | `"fluent-bit-config"` | ConfigurationName is the name of the Secret to use holding the logging configuration in the namespace. A Secret is used to ensure we can safely store credentials but this can be populated from plaintext if acceptable too. If it does not exist then one will be created with defaults in the namespace so it can be easily updated whilst running. Note that if running multiple clusters in the same kubernetes namespace then you should use a separate Secret for each, otherwise the first cluster will take ownership (if created) and the Secret will be cleaned up when that cluster is removed. If running clusters in separate namespaces then they will be separate Secrets anyway.
| cluster.logging.server.enabled | bool | `false` | Enabled is a boolean that enables the logging sidecar container.
| cluster.logging.server.manageConfiguration | bool | `true` | A boolean which indicates whether the operator should manage the configuration or not. If omitted then this defaults to true which means the operator will attempt to reconcile it to default values. To use a custom configuration make sure to set this to false. Note that the ownership of any Secret is not changed so if a Secret is created externally it can be updated by the operator but it's ownership stays the same so it will be cleaned up when it's owner is.
| cluster.logging.server.sidecar | object | `{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.0","resources":{"limits":null,"requests":null}}` | Any specific logging sidecar container configuration.
| cluster.logging.server.sidecar | object | `{"configurationMountPath":"/fluent-bit/config/","image":"couchbase/fluent-bit:1.2.1","resources":{"limits":null,"requests":null}}` | Any specific logging sidecar container configuration.
| cluster.monitoring | object | `{}` | Monitoring defines any Operator managed integration into 3rd party monitoring infrastructure.
| cluster.name | string | `nil` | Name of the cluster, defaults to name of chart release
| cluster.networking | object | `{"addressFamily":null,"adminConsoleServiceTemplate":{"metadata":{"annotations":null,"labels":null},"spec":{"clusterIP":null,"clusterIPs":null,"externalIPs":null,"externalName":null,"externalTrafficPolicy":null,"healthCheckNodePort":null,"internalTrafficPolicy":null,"ipFamilies":null,"ipFamilyPolicy":null,"loadBalancerClass":null,"loadBalancerIP":null,"loadBalancerSourceRanges":null,"sessionAffinity":null,"sessionAffinityConfig":{"clientIP":{"timeoutSeconds":null}},"type":"NodePort"}},"adminConsoleServices":["data"],"disableUIOverHTTP":false,"disableUIOverHTTPS":false,"dns":{"domain":null},"exposeAdminConsole":true,"exposedFeatureServiceTemplate":{"metadata":{"annotations":null,"labels":null},"spec":{"clusterIP":null,"clusterIPs":null,"externalIPs":null,"externalName":null,"externalTrafficPolicy":null,"healthCheckNodePort":null,"internalTrafficPolicy":null,"ipFamilies":null,"ipFamilyPolicy":null,"loadBalancerClass":null,"loadBalancerIP":null,"loadBalancerSourceRanges":null,"sessionAffinity":null,"sessionAffinityConfig":{"clientIP":{"timeoutSeconds":null}},"type":"NodePort"}},"exposedFeatureTrafficPolicy":null,"exposedFeatures":["client","xdcr"],"loadBalancerSourceRanges":null,"networkPlatform":null,"serviceAnnotations":null,"waitForAddressReachable":"10m","waitForAddressReachableDelay":"2m"}` | Networking defines Couchbase cluster networking options such as network topology, TLS and DDNS settings.
Expand Down
36 changes: 18 additions & 18 deletions charts/couchbase-operator/crds/couchbase.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbaseautoscalers.couchbase.com
spec:
Expand Down Expand Up @@ -92,7 +92,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasebackuprestores.couchbase.com
spec:
Expand Down Expand Up @@ -458,7 +458,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasebackups.couchbase.com
spec:
Expand Down Expand Up @@ -856,7 +856,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasebuckets.couchbase.com
spec:
Expand Down Expand Up @@ -1144,7 +1144,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbaseclusters.couchbase.com
spec:
Expand Down Expand Up @@ -1272,7 +1272,7 @@ spec:
backups, and how to lookup backup resources.
properties:
image:
default: couchbase/operator-backup:1.3.0
default: couchbase/operator-backup:1.3.1
description: The Backup Image to run on backup pods.
type: string
imagePullSecrets:
Expand Down Expand Up @@ -2085,7 +2085,7 @@ spec:
environment variable.
type: string
image:
default: couchbase/fluent-bit:1.2.0
default: couchbase/fluent-bit:1.2.1
description: Image is the image to be used to deal with
logging as a sidecar. No validation is carried out as
this can be any arbitrary repo and tag. It will default
Expand Down Expand Up @@ -4839,7 +4839,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasecollectiongroups.couchbase.com
spec:
Expand Down Expand Up @@ -4925,7 +4925,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasecollections.couchbase.com
spec:
Expand Down Expand Up @@ -4998,7 +4998,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbaseephemeralbuckets.couchbase.com
spec:
Expand Down Expand Up @@ -5273,7 +5273,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasegroups.couchbase.com
spec:
Expand Down Expand Up @@ -5640,7 +5640,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasememcachedbuckets.couchbase.com
spec:
Expand Down Expand Up @@ -5721,7 +5721,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasemigrationreplications.couchbase.com
spec:
Expand Down Expand Up @@ -5869,7 +5869,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasereplications.couchbase.com
spec:
Expand Down Expand Up @@ -6074,7 +6074,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbaserolebindings.couchbase.com
spec:
Expand Down Expand Up @@ -6154,7 +6154,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasescopegroups.couchbase.com
spec:
Expand Down Expand Up @@ -6329,7 +6329,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbasescopes.couchbase.com
spec:
Expand Down Expand Up @@ -6501,7 +6501,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
config.couchbase.com/version: 2.3.0
config.couchbase.com/version: 2.3.2
controller-gen.kubebuilder.io/version: v0.8.0
name: couchbaseusers.couchbase.com
spec:
Expand Down
6 changes: 3 additions & 3 deletions charts/couchbase-operator/values-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ couchbaseOperator:
# -- Image specifies repository and tag of the Couchbase Operator container.
image:
repository: couchbase/operator
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down Expand Up @@ -53,7 +53,7 @@ admissionController:
# -- Image specifies repository and tag of the Couchbase Admission container.
image:
repository: couchbase/admission-controller
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down Expand Up @@ -1257,7 +1257,7 @@ cluster:
# Image is the image to be used to deal with logging as a sidecar. No
# validation is carried out as this can be any arbitrary repo and tag.
# It will default to the latest supported version of Fluent Bit.
image: couchbase/fluent-bit:1.2.0
image: couchbase/fluent-bit:1.2.1
# Resources is the resource requirements for the sidecar container. Will
# be populated by Kubernetes defaults if not specified.
resources:
Expand Down
6 changes: 3 additions & 3 deletions charts/couchbase-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ couchbaseOperator:
# -- Image specifies repository and tag of the Couchbase Operator container.
image:
repository: couchbase/operator
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down Expand Up @@ -53,7 +53,7 @@ admissionController:
# -- Image specifies repository and tag of the Couchbase Admission container.
image:
repository: couchbase/admission-controller
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down Expand Up @@ -1001,7 +1001,7 @@ cluster:
# Image is the image to be used to deal with logging as a sidecar. No
# validation is carried out as this can be any arbitrary repo and tag.
# It will default to the latest supported version of Fluent Bit.
image: couchbase/fluent-bit:1.2.0
image: couchbase/fluent-bit:1.2.1
# -- Monitoring defines any Operator managed integration into 3rd party
# monitoring infrastructure.
monitoring: {}
Expand Down
4 changes: 2 additions & 2 deletions charts/couchbase-operator/values.yamltmpl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ couchbaseOperator:
# -- Image specifies repository and tag of the Couchbase Operator container.
image:
repository: couchbase/operator
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down Expand Up @@ -53,7 +53,7 @@ admissionController:
# -- Image specifies repository and tag of the Couchbase Admission container.
image:
repository: couchbase/admission-controller
tag: 2.3.1
tag: 2.3.2
# -- 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.
Expand Down

0 comments on commit 947d621

Please sign in to comment.