Skip to content

scripts: add migration script from public operator to cloud operator. #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prafull01 merged 3 commits into from
Mar 25, 2025
Merged

scripts: add migration script from public operator to cloud operator. #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e26902
scripts: add migration script from public operator to cloud operator.
jmcarp Feb 14, 2025
4284267
Upgrade the public cockroach operator (#487)
prafull01 Mar 20, 2025
87a8b51
Revert non-semantic change to self-signer.
jmcarp Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ test/units: bin/cockroach ## Run unit tests in ./pkg/...
##@ Binaries
bin: bin/cockroach bin/helm bin/k3d bin/kubectl bin/yq ## install all binaries

.PHONY: bin/migration-helper
bin/migration-helper:
go build -o $(PWD)/bin/migration-helper migrate/main.go

bin/cockroach: ## install cockroach
@mkdir -p bin
@curl -L $(COCKROACH_BIN) | tar -xzf - -C bin/ --strip-components 1
Expand Down
12 changes: 6 additions & 6 deletions build/templates/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,36 +784,36 @@ operator:
# validForDays: 3650

# External certificates for the CockroachDB cluster.
externalCertificates:
externalCertificates: {}
# CAConfigMapName is the name of a Kubernetes ConfigMap containing a ca.crt
# entry that was used to sign other external certificates. This is used to
# validate the node and client certificates.
# https://www.cockroachlabs.com/docs/stable/authentication.html#client-authentication
caConfigMapName: ""
# caConfigMapName: ""

# NodeClientSecretName is the name of a Kubernetes TLS secret holding
# client certificates used when establishing connections to other nodes
# in the cluster (e.g. joining an existing cluster).
# The certificate must be signed with the CA identified by CAConfigMapName
# or ClientCASecretName if using split CA certificates.
nodeClientSecretName: ""
# nodeClientSecretName: ""

# NodeSecretName is the name of a Kubernetes TLS Secret that will be used
# when receiving incoming connections from other nodes for RPC and SQL calls.
# The certificate must be signed with the CA identified by CAConfigMapName,
# or NodeCASecretName if using split CA certificates.
nodeSecretName: ""
# nodeSecretName: ""

# HTTPSecretName is the name of a Kubernetes TLS Secret that will be used
# for the HTTP service.
httpSecretName: ""
# httpSecretName: ""

# RootSQLClientSecretName is the name of a Kubernetes TLS secret holding
# SQL client certificates for the root SQL user. It allows the operator to
# perform various administrative actions (e.g. set cluster settings).
# The certificate must be signed with the CA identified by CAConfigMapName
# or ClientCASecretName if using split CA certificates.
rootSqlClientSecretName: ""
# rootSqlClientSecretName: ""

# NodeCAConfigMapName is the name of a Kubernetes ConfigMap containing a
# ca.crt entry that will be used as the CA for node authentication. Only
Expand Down
16 changes: 3 additions & 13 deletions cockroachdb/templates/crdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,9 @@ spec:
spec:
image: "{{ .Values.operator.image.name }}"
certificates:
externalCertificates:
{{- /* Note: defaults should match secrets and configmaps created by the self-signer job. */}}
caConfigMapName: {{ .Values.operator.certificates.externalCertificates.caConfigMapName | default (printf "%s-ca-secret-crt" (include "cockroachdb.fullname" .)) }}
httpSecretName: {{ .Values.operator.certificates.externalCertificates.httpSecretName | default (printf "%s-client-secret" (include "cockroachdb.fullname" .)) }}
nodeClientSecretName: {{ .Values.operator.certificates.externalCertificates.nodeClientSecretName | default (printf "%s-client-secret" (include "cockroachdb.fullname" .)) }}
nodeSecretName: {{ .Values.operator.certificates.externalCertificates.nodeSecretName | default (printf "%s-node-secret" (include "cockroachdb.fullname" .)) }}
rootSqlClientSecretName: {{ .Values.operator.certificates.externalCertificates.rootSqlClientSecretName | default (printf "%s-client-secret" (include "cockroachdb.fullname" .)) }}
{{- if .Values.operator.certificates.externalCertificates.nodeCaConfigMapName }}
nodeCaConfigMapName: {{ .Values.operator.certificates.externalCertificates.nodeCaConfigMapName }}
{{- end }}
{{- if .Values.operator.certificates.externalCertificates.clientCaConfigMapName }}
clientCaConfigMapName: {{ .Values.operator.certificates.externalCertificates.clientCaConfigMapName }}
{{- end }}
{{- with .Values.operator.certificates.externalCertificates }}
externalCertificates: {{- toYaml . | nindent 10 }}
{{- end }}
{{- with .Values.operator.dataStore }}
dataStore: {{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions cockroachdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,36 +785,36 @@ operator:
# validForDays: 3650

# External certificates for the CockroachDB cluster.
externalCertificates:
externalCertificates: {}
# CAConfigMapName is the name of a Kubernetes ConfigMap containing a ca.crt
# entry that was used to sign other external certificates. This is used to
# validate the node and client certificates.
# https://www.cockroachlabs.com/docs/stable/authentication.html#client-authentication
caConfigMapName: ""
# caConfigMapName: ""

# NodeClientSecretName is the name of a Kubernetes TLS secret holding
# client certificates used when establishing connections to other nodes
# in the cluster (e.g. joining an existing cluster).
# The certificate must be signed with the CA identified by CAConfigMapName
# or ClientCASecretName if using split CA certificates.
nodeClientSecretName: ""
# nodeClientSecretName: ""

# NodeSecretName is the name of a Kubernetes TLS Secret that will be used
# when receiving incoming connections from other nodes for RPC and SQL calls.
# The certificate must be signed with the CA identified by CAConfigMapName,
# or NodeCASecretName if using split CA certificates.
nodeSecretName: ""
# nodeSecretName: ""

# HTTPSecretName is the name of a Kubernetes TLS Secret that will be used
# for the HTTP service.
httpSecretName: ""
# httpSecretName: ""

# RootSQLClientSecretName is the name of a Kubernetes TLS secret holding
# SQL client certificates for the root SQL user. It allows the operator to
# perform various administrative actions (e.g. set cluster settings).
# The certificate must be signed with the CA identified by CAConfigMapName
# or ClientCASecretName if using split CA certificates.
rootSqlClientSecretName: ""
# rootSqlClientSecretName: ""

# NodeCAConfigMapName is the name of a Kubernetes ConfigMap containing a
# ca.crt entry that will be used as the CA for node authentication. Only
Expand Down
15 changes: 8 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
module github.com/cockroachdb/helm-charts

go 1.22
go 1.22.3

toolchain go1.23.7

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cockroachdb/cockroach-operator v0.0.0-20230531051823-2cb3e2e676f4
github.com/cockroachdb/cockroach-operator v0.0.0-20250205123916-58abbe6772fc
github.com/cockroachdb/errors v1.8.0
github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible
github.com/gruntwork-io/terratest v0.41.26
Expand All @@ -23,7 +25,7 @@ require (
k8s.io/apimachinery v0.22.3
k8s.io/client-go v9.0.0+incompatible
sigs.k8s.io/controller-runtime v0.9.2
sigs.k8s.io/yaml v1.2.0
sigs.k8s.io/yaml v1.4.0
)

require (
Expand Down Expand Up @@ -56,7 +58,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
Expand All @@ -72,8 +74,8 @@ require (
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgtype v1.5.0 // indirect
github.com/jackc/pgx/v4 v4.9.0 // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/pgx/v4 v4.18.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/pretty v0.3.0 // indirect
Expand Down Expand Up @@ -105,7 +107,6 @@ require (
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
Expand Down
Loading
Loading