Skip to content

[ CC-32596 ] Add WAL failover custom path support for helm chart migration #565

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ CC-32596 ] Add WAL failover custom path support for helm chart migration #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions build/templates/cockroachdb-parent/charts/cockroachdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,11 @@ cockroachdb:
#
# walFailoverSpec captures the configuration for WAL Failover.
walFailoverSpec: {}
# name determines the prefix of the pvc name that we want to provide
# for the wal failover. This field was introduced during the migration process
# from the statefulset to the operator.
# name: failover-dir
#
# status determines the possible values to WAL Failover configuration.
# It has 3 possible values: "", "enable" and "disable".
# status: ""
Expand All @@ -276,6 +281,14 @@ cockroachdb:
# If not set, the default provisioner will be chosen (gp2 on AWS, standard on GKE).
# storageClassName: ""
#
# path is the absolute mount path inside the CockroachDB container to use for WAL failover side disk.
# Examples:
# - /cockroach/cockroach-failover
# - /cockroach/custom/path
# IMPORTANT: Set it only for fresh deployments. Changing it on upgrades might cause issues with the deployment.
#
# path: "/cockroach/cockroach-failover"
#
# podLabels captures additional labels to apply to CockroachDB pods.
podLabels:
app.kubernetes.io/component: cockroachdb
Expand Down
2 changes: 1 addition & 1 deletion build/templates/cockroachdb-parent/charts/operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ image:
# pullPolicy specifies the image pull policy.
pullPolicy: IfNotPresent
# tag is the image tag.
tag: "6f62639e9fee99d99b0387a9dccda84daa1a489b592b008f2f354ec57eae09ac"
tag: "5d96af12a077e9176bc40ffdb203c193a1505829f0d4318e04748e5ac56f6817"
# certificate defines the certificate settings for the Operator.
certificate:
# validForDays specifies the number of days the certificate is valid for.
Expand Down
13 changes: 13 additions & 0 deletions cockroachdb-parent/charts/cockroachdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ cockroachdb:
#
# walFailoverSpec captures the configuration for WAL Failover.
walFailoverSpec: {}
# name determines the prefix of the pvc name that we want to provide
# for the wal failover. This field was introduced during the migration process
# from the statefulset to the operator.
# name: failover-dir
#
# status determines the possible values to WAL Failover configuration.
# It has 3 possible values: "", "enable" and "disable".
# status: ""
Expand All @@ -277,6 +282,14 @@ cockroachdb:
# If not set, the default provisioner will be chosen (gp2 on AWS, standard on GKE).
# storageClassName: ""
#
# path is the absolute mount path inside the CockroachDB container to use for WAL failover side disk.
# Examples:
# - /cockroach/cockroach-failover
# - /cockroach/custom/path
# IMPORTANT: Set it only for fresh deployments. Changing it on upgrades might cause issues with the deployment.
#
# path: "/cockroach/cockroach-failover"
#
# podLabels captures additional labels to apply to CockroachDB pods.
podLabels:
app.kubernetes.io/component: cockroachdb
Expand Down
10 changes: 10 additions & 0 deletions cockroachdb-parent/charts/operator/templates/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ rules:
- admissionregistration.k8s.io
resources:
- validatingwebhookconfigurations
- mutatingwebhookconfigurations
verbs:
- create
- apiGroups:
Expand All @@ -265,6 +266,15 @@ rules:
verbs:
- get
- patch
- apiGroups:
- admissionregistration.k8s.io
resources:
- mutatingwebhookconfigurations
resourceNames:
- cockroach-mutating-webhook-config
verbs:
- get
- patch
# The "create" verb cannot be qualified with resourceNames, so grant the
# unqualified permission so that the operator can create new CRDs. But only
# allow the operator to get and patch its own CRDs.
Expand Down
2 changes: 1 addition & 1 deletion cockroachdb-parent/charts/operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ image:
# pullPolicy specifies the image pull policy.
pullPolicy: IfNotPresent
# tag is the image tag.
tag: "6f62639e9fee99d99b0387a9dccda84daa1a489b592b008f2f354ec57eae09ac"
tag: "5d96af12a077e9176bc40ffdb203c193a1505829f0d4318e04748e5ac56f6817"
# certificate defines the certificate settings for the Operator.
certificate:
# validForDays specifies the number of days the certificate is valid for.
Expand Down
2 changes: 2 additions & 0 deletions pkg/migrate/build-manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ func (m *Manifest) FromHelmChart() error {
return errors.Newf("pod %s isn't scheduled to a node", podName)
}

// Build the walFailoverSpec if applicable
buildWalFailoverSpec(ctx, m.clientset, sts, pod.Spec.NodeName, nodeIdx, &input)
nodeSpec := buildNodeSpecFromHelm(sts, pod.Spec.NodeName, input)
crdbNode := v1alpha1.CrdbNode{
TypeMeta: metav1.TypeMeta{
Expand Down
Loading