Merge branch 'master' into scottcrossen/node-locality

Author: scottcrossen

cockroachdb/Chart.yaml

@@ -2,11 +2,11 @@ apiVersion: v1
 name: cockroachdb
 home: https://www.cockroachlabs.com
 version: 6.1.0
-appVersion: 21.1.5
+appVersion: 21.1.6
 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
 icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png
 sources:
-- https://github.com/cockroachdb/cockroach
+  - https://github.com/cockroachdb/cockroach
 maintainers:
-- name: cockroachlabs
-  email: helm-charts@cockroachlabs.com
+  - name: cockroachlabs
+    email: helm-charts@cockroachlabs.com

cockroachdb/README.md

@@ -221,10 +221,10 @@ kubectl get pods \
 ```
 
 ```
-my-release-cockroachdb-0    cockroachdb/cockroach:v21.1.5
-my-release-cockroachdb-1    cockroachdb/cockroach:v21.1.5
-my-release-cockroachdb-2    cockroachdb/cockroach:v21.1.5
-my-release-cockroachdb-3    cockroachdb/cockroach:v21.1.5
+my-release-cockroachdb-0    cockroachdb/cockroach:v21.1.6
+my-release-cockroachdb-1    cockroachdb/cockroach:v21.1.6
+my-release-cockroachdb-2    cockroachdb/cockroach:v21.1.6
+my-release-cockroachdb-3    cockroachdb/cockroach:v21.1.6
 ```
 
 Resume normal operations. Once you are comfortable that the stability and performance of the cluster is what you'd expect post-upgrade, finalize the upgrade:
@@ -279,7 +279,7 @@ Verify that no pod is deleted and then upgrade as normal. A new StatefulSet will
 
 For more information about upgrading a cluster to the latest major release of CockroachDB, see [Upgrade to CockroachDB v21.1](https://www.cockroachlabs.com/docs/stable/upgrade-cockroach-version.html).
 
-Note that there are some backward-incompatible changes to SQL features between versions 20.2 and 21.1. For details, see the [CockroachDB v21.1.5 release notes](https://www.cockroachlabs.com/docs/releases/v21.1.5.html#backward-incompatible-changes).
+Note that there are some backward-incompatible changes to SQL features between versions 20.2 and 21.1. For details, see the [CockroachDB v21.1.6 release notes](https://www.cockroachlabs.com/docs/releases/v21.1.6.html#backward-incompatible-changes).
 
 ## Configuration
 
@@ -311,7 +311,7 @@ For details see the [`values.yaml`](values.yaml) file.
 | `conf.store.size`                                         | CockroachDB storage size                                        | `""`                                             |
 | `conf.store.attrs`                                        | CockroachDB storage attributes                                  | `""`                                             |
 | `image.repository`                                        | Container image name                                            | `cockroachdb/cockroach`                          |
-| `image.tag`                                               | Container image tag                                             | `v21.1.5`                                        |
+| `image.tag`                                               | Container image tag                                             | `v21.1.6`                                        |
 | `image.pullPolicy`                                        | Container pull policy                                           | `IfNotPresent`                                   |
 | `image.credentials`                                       | `registry`, `user` and `pass` credentials to pull private image | `{}`                                             |
 | `statefulset.replicas`                                    | StatefulSet replicas number                                     | `3`                                              |

cockroachdb/templates/job.init.yaml

@@ -15,9 +15,10 @@ metadata:
   {{- with .Values.labels }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .Values.init.jobAnnotations }}
   annotations:
-    helm.sh/hook: post-install,post-upgrade
-    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
+    {{ . | toYaml | nindent 4 }}
+  {{- end }}
 spec:
   template:
     metadata:

cockroachdb/values.yaml

@@ -1,6 +1,6 @@
 image:
   repository: cockroachdb/cockroach
-  tag: v21.1.5
+  tag: v21.1.6
   pullPolicy: IfNotPresent
   credentials: {}
     # registry: docker.io
@@ -362,6 +362,11 @@ init:
   labels:
     app.kubernetes.io/component: init
 
+  # Annotations to add to the job resource
+  jobAnnotations:
+    helm.sh/hook: post-install,post-upgrade
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
+
   # Additional annotations to apply to the Pod of this Job.
   annotations: {}