Skip to content

Commit a576772

Browse files
committed
small fixes
1 parent a4d6c96 commit a576772

File tree

4 files changed

+41
-500
lines changed

4 files changed

+41
-500
lines changed

cmd/example-gen/defaults/manual.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func ManualCluster(cr *apiv1.PerconaServerMySQL) {
2020
Orchestrator: false,
2121
OrchestratorSize: false,
2222
}
23-
cr.Spec.Pause = true
23+
cr.Spec.Pause = false
2424
cr.Spec.CRVersion = version.Version()
2525
cr.Spec.VolumeExpansionEnabled = true
2626
cr.Spec.UpdateStrategy = "SmartUpdate"
@@ -232,7 +232,7 @@ frontend stats
232232
}
233233

234234
func routerDefaults(spec *apiv1.MySQLRouterSpec) {
235-
spec.Enabled = true
235+
spec.Enabled = false
236236
spec.Size = 3
237237
spec.Image = "perconalab/percona-server-mysql-operator:main-router8.4"
238238
spec.RuntimeClassName = ptr.To("image-rc")
@@ -320,7 +320,7 @@ level=DEBUG`
320320
}
321321

322322
func orchestratorDefaults(spec *apiv1.OrchestratorSpec) {
323-
spec.Enabled = true
323+
spec.Enabled = false
324324
spec.Image = "perconalab/percona-server-mysql-operator:main-orchestrator"
325325
spec.Size = 3
326326
spec.TerminationGracePeriodSeconds = ptr.To(int64(30))

cmd/example-gen/generate.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ del_fields_to_comment() {
133133
| yq "del(.spec.proxy.router.serviceAccountName)" \
134134
| yq "del(.spec.proxy.router.imagePullSecrets)" \
135135
| yq "del(.spec.proxy.router.podDisruptionBudget.minAvailable)" \
136-
| yq "del(.spec.proxy.router.resources.limits)" \
137136
| yq "del(.spec.proxy.router.env)" \
138137
| yq "del(.spec.proxy.router.envFrom)" \
139138
| yq "del(.spec.proxy.router.startupProbe)" \
@@ -157,7 +156,6 @@ del_fields_to_comment() {
157156
| yq "del(.spec.orchestrator.serviceAccountName)" \
158157
| yq "del(.spec.orchestrator.imagePullSecrets)" \
159158
| yq "del(.spec.orchestrator.podDisruptionBudget.minAvailable)" \
160-
| yq "del(.spec.orchestrator.resources.limits)" \
161159
| yq "del(.spec.orchestrator.env)" \
162160
| yq "del(.spec.orchestrator.envFrom)" \
163161
| yq "del(.spec.orchestrator.startupProbe)" \
@@ -173,12 +171,14 @@ del_fields_to_comment() {
173171
| yq "del(.spec.pmm.readinessProbes)" \
174172
| yq "del(.spec.pmm.livenessProbes)" \
175173
| yq "del(.spec.pmm.containerSecurityContext)" \
174+
| yq "del(.spec.pmm.resources.limits)" \
176175
| yq "del(.spec.backup.sourcePod)" \
177176
| yq "del(.spec.backup.schedule)" \
178177
| yq "del(.spec.backup.backoffLimit)" \
179178
| yq "del(.spec.backup.imagePullSecrets)" \
180179
| yq "del(.spec.backup.initContainer)" \
181180
| yq "del(.spec.backup.containerSecurityContext)" \
181+
| yq "del(.spec.backup.resources)" \
182182
| yq "del(.spec.backup.storages.azure-blob)" \
183183
| yq "del(.spec.backup.storages.s3-us-west.resources)" \
184184
| yq "del(.spec.backup.storages.s3-us-west.topologySpreadConstraints)" \
@@ -191,6 +191,11 @@ del_fields_to_comment() {
191191
| yq "del(.spec.backup.storages.s3-us-west.annotations)" \
192192
| yq "del(.spec.backup.storages.s3-us-west.containerOptions)" \
193193
| yq "del(.spec.backup.storages.s3-us-west.volumeSpec)" \
194+
| yq "del(.spec.backup.storages.s3-us-west.affinity)" \
195+
| yq "del(.spec.backup.storages.s3-us-west.s3.prefix)" \
196+
| yq "del(.spec.backup.storages.s3-us-west.s3.endpointUrl)" \
197+
| yq "del(.spec.backup.storages.s3-us-west.schedulerName)" \
198+
| yq "del(.spec.backup.storages.s3-us-west.runtimeClassName)" \
194199
| yq "del(.spec.toolkit.imagePullSecrets)" \
195200
| yq "del(.spec.toolkit.env)" \
196201
| yq "del(.spec.toolkit.envFrom)" \

0 commit comments

Comments
 (0)