Skip to content

Commit aa9552e

Browse files
authored
Fix the length of the name of cronjob (#538)
* Fix the length of the name of cronjob * Update the Chart version
1 parent 66701fe commit aa9552e

9 files changed

Lines changed: 25 additions & 14 deletions

File tree

cockroachdb-parent/Chart.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: operator
33
repository: file://charts/operator
4-
version: 25.2.2-preview
4+
version: 25.2.2-preview+1
55
- name: cockroachdb
66
repository: file://charts/cockroachdb
7-
version: 25.2.2-preview
8-
digest: sha256:cc9eaf29f0c8000a9b016b59c82a550e5160658ecd922c76544c3b2838ca3d4b
9-
generated: "2025-06-30T12:11:57.642841303Z"
7+
version: 25.2.2-preview+1
8+
digest: sha256:9f1bb739f03dbc1abb9bfd04fcf43e01f065230c8ebfc8ec4fde6fd17084c2be
9+
generated: "2025-07-15T18:45:12.388963+05:30"

cockroachdb-parent/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ apiVersion: v2
33
name: cockroachdb-parent
44
description: A parent Helm chart for CockroachDB and its operator using helm-spray
55
type: application
6-
version: 25.2.2-preview
6+
version: 25.2.2-preview+1
77
appVersion: 25.2.2
88
dependencies:
99
- name: operator
10-
version: 25.2.2-preview
10+
version: 25.2.2-preview+1
1111
condition: operator.enabled
1212
repository: "file://charts/operator"
1313
- name: cockroachdb
14-
version: 25.2.2-preview
14+
version: 25.2.2-preview+1
1515
condition: cockroachdb.enabled
1616
repository: "file://charts/cockroachdb"

cockroachdb-parent/charts/cockroachdb/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
name: cockroachdb
44
home: https://www.cockroachlabs.com
5-
version: 25.2.2-preview
5+
version: 25.2.2-preview+1
66
appVersion: 25.2.2
77
description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
88
icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png

cockroachdb-parent/charts/cockroachdb/templates/_helpers.tpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,15 @@ Define the default values for the certificate selfSigner inputs
6868
{{- end -}}
6969

7070
{{- define "rotatecerts.fullname" -}}
71-
{{- printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 56 | trimSuffix "-" -}}
71+
{{- printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 52 | trimSuffix "-" -}}
7272
{{- end -}}
7373

74+
{{- define "rotatecerts.fullname-cronjob-client" -}}
75+
{{- $base := printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 45 | trimSuffix "-" -}}
76+
{{- printf "%s-client" $base -}}
77+
{{- end -}}
78+
79+
7480
{{- define "selfcerts.minimumCertDuration" -}}
7581
{{- if .Values.cockroachdb.tls.selfSigner.minimumCertDuration -}}
7682
{{- print (.Values.cockroachdb.tls.selfSigner.minimumCertDuration | trimSuffix "h") -}}

cockroachdb-parent/charts/cockroachdb/templates/cronjob-client-node-certSelfSigner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: batch/v1
33
kind: CronJob
44
metadata:
5-
name: {{ template "rotatecerts.fullname" . }}-client
5+
name: {{ template "rotatecerts.fullname-cronjob-client" . }}
66
namespace: {{ .Release.Namespace | quote }}
77
labels:
88
helm.sh/chart: {{ template "cockroachdb.chart" . }}

cockroachdb-parent/charts/operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ name: operator
44
description: A Helm chart for managing the CockroachDB operator.
55
type: application
66
appVersion: 25.2.2
7-
version: 25.2.2-preview
7+
version: 25.2.2-preview+1

cockroachdb/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
name: cockroachdb
44
home: https://www.cockroachlabs.com
5-
version: 17.0.4
5+
version: 17.0.5
66
appVersion: 25.2.2
77
description: CockroachDB is a scalable, survivable, strongly-consistent SQL database.
88
icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png

cockroachdb/templates/_helpers.tpl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,12 @@ Define the default values for the certificate selfSigner inputs
122122
{{- end -}}
123123

124124
{{- define "rotatecerts.fullname" -}}
125-
{{- printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 56 | trimSuffix "-" -}}
125+
{{- printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 52 | trimSuffix "-" -}}
126+
{{- end -}}
127+
128+
{{- define "rotatecerts.fullname-cronjob-client" -}}
129+
{{- $base := printf "%s-%s" (include "cockroachdb.fullname" .) "rotate-self-signer" | trunc 45 | trimSuffix "-" -}}
130+
{{- printf "%s-client" $base -}}
126131
{{- end -}}
127132

128133
{{- define "selfcerts.minimumCertDuration" -}}

cockroachdb/templates/cronjob-client-node-certSelfSigner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apiVersion: batch/v1beta1
66
{{- end }}
77
kind: CronJob
88
metadata:
9-
name: {{ template "rotatecerts.fullname" . }}-client
9+
name: {{ template "rotatecerts.fullname-cronjob-client" . }}
1010
namespace: {{ .Release.Namespace | quote }}
1111
labels:
1212
helm.sh/chart: {{ template "cockroachdb.chart" . }}

0 commit comments

Comments
 (0)