Skip to content

Commit

Permalink
Merge pull request #117 from couchbase-partners/K8S-3168
Browse files Browse the repository at this point in the history
K8s-3168
  • Loading branch information
malscent authored Sep 19, 2023
2 parents 093d8d7 + 9b9af65 commit 593b55a
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
8 changes: 3 additions & 5 deletions charts/couchbase-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.2
version: 2.50.3
appVersion: 2.5.0
type: application
keywords:
Expand All @@ -18,7 +18,5 @@ sources:
maintainers:
- name: Couchbase Cloud Native Team
email: [email protected]
- name: Tommie McAfee
email: [email protected]
- name: Alex Emery
email: [email protected]
- name: Yusuf Ramzan
email: [email protected]
4 changes: 2 additions & 2 deletions charts/couchbase-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.50.2](https://img.shields.io/badge/Version-2.50.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
![Version: 2.50.3](https://img.shields.io/badge/Version-2.50.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)

Deploying the Operator and Couchbase Server
===========================================
Expand Down Expand Up @@ -85,7 +85,7 @@ for more information about customizing and managing your charts.
| cluster.autoResourceAllocation.overheadPercent | int | `25` | OverheadPercent defines the amount of memory above that required for individual services on a pod. For Couchbase Server this should be approximately 25%. |
| cluster.autoscaleStabilizationPeriod | string | `nil` | AutoscaleStabilizationPeriod defines how long after a rebalance the corresponding HorizontalPodAutoscaler should remain in maintenance mode. During maintenance mode all autoscaling is disabled since every HorizontalPodAutoscaler associated with the cluster becomes inactive. Since certain metrics can be unpredictable when Couchbase is rebalancing or upgrading, setting a stabilization period helps to prevent scaling recommendations from the HorizontalPodAutoscaler for a provided period of time. Values must be a valid Kubernetes duration of 0s or higher: https://golang.org/pkg/time/#ParseDuration A value of 0, puts the cluster in maintenance mode during rebalance but immediately exits this mode once the rebalance has completed. When undefined, the HPA is never put into maintenance mode during rebalance. |
| cluster.backup.annotations | string | `nil` | Annotations defines additional annotations to appear on the backup/restore pods. |
| cluster.backup.image | string | `"couchbase/operator-backup:1.3.1"` | The Backup Image to run on backup pods. |
| cluster.backup.image | string | `"couchbase/operator-backup:1.3.5"` | The Backup Image to run on backup pods. |
| cluster.backup.imagePullSecrets | object | `{"name":null}` | ImagePullSecrets allow you to use an image from private repositories and non-dockerhub ones. |
| cluster.backup.imagePullSecrets.name | string | `nil` | 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? |
| cluster.backup.labels | string | `nil` | Labels defines additional labels to appear on the backup/restore pods. |
Expand Down
4 changes: 2 additions & 2 deletions charts/couchbase-operator/README.md.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
| cluster.autoResourceAllocation.enabled | bool | `false` | Enabled defines whether auto-resource allocation is enabled.
| cluster.autoResourceAllocation.overheadPercent | int | `25` | OverheadPercent defines the amount of memory above that required for individual services on a pod. For Couchbase Server this should be approximately 25%.
| cluster.autoscaleStabilizationPeriod | string | `nil` | AutoscaleStabilizationPeriod defines how long after a rebalance the corresponding HorizontalPodAutoscaler should remain in maintenance mode. During maintenance mode all autoscaling is disabled since every HorizontalPodAutoscaler associated with the cluster becomes inactive. Since certain metrics can be unpredictable when Couchbase is rebalancing or upgrading, setting a stabilization period helps to prevent scaling recommendations from the HorizontalPodAutoscaler for a provided period of time. Values must be a valid Kubernetes duration of 0s or higher: https://golang.org/pkg/time/#ParseDuration A value of 0, puts the cluster in maintenance mode during rebalance but immediately exits this mode once the rebalance has completed. When undefined, the HPA is never put into maintenance mode during rebalance.
| cluster.backup | object | `{"annotations":null,"image":"couchbase/operator-backup:1.3.1","imagePullSecrets":{"name":null},"labels":null,"managed":true,"nodeSelector":null,"objectEndpoint":{"secret":null,"url":null,"useVirtualPath":false},"resources":{"limits":null,"requests":null},"s3Secret":null,"selector":{"matchExpressions":{"key":null,"operator":null,"values":null},"matchLabels":null},"serviceAccountName":"couchbase-backup","tolerations":{"effect":null,"key":null,"operator":null,"tolerationSeconds":null,"value":null},"useIAMRole":false}` | Backup defines whether the Operator should manage automated backups, and how to lookup backup resources. Refer to the documentation for supported values https://docs.couchbase.com/operator/current/howto-backup.html#enable-automated-backup
| cluster.backup | object | `{"annotations":null,"image":"couchbase/operator-backup:1.3.5","imagePullSecrets":{"name":null},"labels":null,"managed":true,"nodeSelector":null,"objectEndpoint":{"secret":null,"url":null,"useVirtualPath":false},"resources":{"limits":null,"requests":null},"s3Secret":null,"selector":{"matchExpressions":{"key":null,"operator":null,"values":null},"matchLabels":null},"serviceAccountName":"couchbase-backup","tolerations":{"effect":null,"key":null,"operator":null,"tolerationSeconds":null,"value":null},"useIAMRole":false}` | Backup defines whether the Operator should manage automated backups, and how to lookup backup resources. Refer to the documentation for supported values https://docs.couchbase.com/operator/current/howto-backup.html#enable-automated-backup
| cluster.backup.annotations | string | `nil` | Annotations defines additional annotations to appear on the backup/restore pods.
| cluster.backup.image | string | `"couchbase/operator-backup:1.3.1"` | The Backup Image to run on backup pods.
| cluster.backup.image | string | `"couchbase/operator-backup:1.3.5"` | The Backup Image to run on backup pods.
| cluster.backup.imagePullSecrets | object | `{"name":null}` | ImagePullSecrets allow you to use an image from private repositories and non-dockerhub ones.
| cluster.backup.imagePullSecrets.name | string | `nil` | 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?
| cluster.backup.labels | string | `nil` | Labels defines additional labels to appear on the backup/restore pods.
Expand Down
2 changes: 1 addition & 1 deletion charts/couchbase-operator/values-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ cluster:
# backup/restore pods.
annotations:
# -- The Backup Image to run on backup pods.
image: couchbase/operator-backup:1.3.1
image: couchbase/operator-backup:1.3.5
# -- ImagePullSecrets allow you to use an image from private repositories
# and non-dockerhub ones.
imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion charts/couchbase-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ cluster:
# automated-backup
backup:
# -- The Backup Image to run on backup pods.
image: couchbase/operator-backup:1.3.1
image: couchbase/operator-backup:1.3.5
# -- Managed defines whether backups are managed by us or the clients.
managed: true
# -- Deprecated: by CouchbaseBackup.spec.objectStore.Endpoint ObjectEndpoint
Expand Down
2 changes: 1 addition & 1 deletion tools/value-generation/gen.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def postProcessCluster(crd_value, value_map, comment_map) :
if expectedKey not in value_map[crd_value]:
value_map[crd_value][expectedKey] = {}

value_map[crd_value]['backup']['image'] = 'couchbase/operator-backup:1.3.1'
value_map[crd_value]['backup']['image'] = 'couchbase/operator-backup:1.3.5'
value_map[crd_value]['backup']['managed'] = True

value_map[crd_value]['buckets']['managed'] = True
Expand Down

0 comments on commit 593b55a

Please sign in to comment.