small fixes

Author: pooknull

cmd/example-gen/generate.sh

@@ -133,7 +133,6 @@ del_fields_to_comment() {
 		| yq "del(.spec.proxy.router.serviceAccountName)" \
 		| yq "del(.spec.proxy.router.imagePullSecrets)" \
 		| yq "del(.spec.proxy.router.podDisruptionBudget.minAvailable)" \
-		| yq "del(.spec.proxy.router.resources.limits)" \
 		| yq "del(.spec.proxy.router.env)" \
 		| yq "del(.spec.proxy.router.envFrom)" \
 		| yq "del(.spec.proxy.router.startupProbe)" \
@@ -157,7 +156,6 @@ del_fields_to_comment() {
 		| yq "del(.spec.orchestrator.serviceAccountName)" \
 		| yq "del(.spec.orchestrator.imagePullSecrets)" \
 		| yq "del(.spec.orchestrator.podDisruptionBudget.minAvailable)" \
-		| yq "del(.spec.orchestrator.resources.limits)" \
 		| yq "del(.spec.orchestrator.env)" \
 		| yq "del(.spec.orchestrator.envFrom)" \
 		| yq "del(.spec.orchestrator.startupProbe)" \
@@ -173,12 +171,14 @@ del_fields_to_comment() {
 		| yq "del(.spec.pmm.readinessProbes)" \
 		| yq "del(.spec.pmm.livenessProbes)" \
 		| yq "del(.spec.pmm.containerSecurityContext)" \
+		| yq "del(.spec.pmm.resources.limits)" \
 		| yq "del(.spec.backup.sourcePod)" \
 		| yq "del(.spec.backup.schedule)" \
 		| yq "del(.spec.backup.backoffLimit)" \
 		| yq "del(.spec.backup.imagePullSecrets)" \
 		| yq "del(.spec.backup.initContainer)" \
 		| yq "del(.spec.backup.containerSecurityContext)" \
+		| yq "del(.spec.backup.resources)" \
 		| yq "del(.spec.backup.storages.azure-blob)" \
 		| yq "del(.spec.backup.storages.s3-us-west.resources)" \
 		| yq "del(.spec.backup.storages.s3-us-west.topologySpreadConstraints)" \
@@ -191,6 +191,11 @@ del_fields_to_comment() {
 		| yq "del(.spec.backup.storages.s3-us-west.annotations)" \
 		| yq "del(.spec.backup.storages.s3-us-west.containerOptions)" \
 		| yq "del(.spec.backup.storages.s3-us-west.volumeSpec)" \
+		| yq "del(.spec.backup.storages.s3-us-west.affinity)" \
+		| yq "del(.spec.backup.storages.s3-us-west.s3.prefix)" \
+		| yq "del(.spec.backup.storages.s3-us-west.s3.endpointUrl)" \
+		| yq "del(.spec.backup.storages.s3-us-west.schedulerName)" \
+		| yq "del(.spec.backup.storages.s3-us-west.runtimeClassName)" \
 		| yq "del(.spec.toolkit.imagePullSecrets)" \
 		| yq "del(.spec.toolkit.env)" \
 		| yq "del(.spec.toolkit.envFrom)" \

cmd/example-gen/internal/fill/defaults.go

@@ -18,7 +18,7 @@ func SetDefaults(cr *apiv1.PerconaServerMySQL) {
 		Orchestrator:     false,
 		OrchestratorSize: false,
 	}
-	cr.Spec.Pause = true
+	cr.Spec.Pause = false
 	cr.Spec.CRVersion = version.Version()
 	cr.Spec.VolumeExpansionEnabled = true
 	cr.Spec.UpdateStrategy = "SmartUpdate"
@@ -228,7 +228,7 @@ frontend stats
 }
 
 func routerDefaults(spec *apiv1.MySQLRouterSpec) {
-	spec.Enabled = true
+	spec.Enabled = false
 	spec.Size = 3
 	spec.Image = "perconalab/percona-server-mysql-operator:main-router8.4"
 	spec.RuntimeClassName = ptr.To("image-rc")
@@ -316,7 +316,7 @@ level=DEBUG`
 }
 
 func orchestratorDefaults(spec *apiv1.OrchestratorSpec) {
-	spec.Enabled = true
+	spec.Enabled = false
 	spec.Image = "perconalab/percona-server-mysql-operator:main-orchestrator"
 	spec.Size = 3
 	spec.TerminationGracePeriodSeconds = ptr.To(int64(30))

deploy/cr.yaml

@@ -445,8 +445,8 @@ spec:
         maxUnavailable: 1
 #        minAvailable: 0
       resources:
-#        limits:
-#          memory: 256M
+        limits:
+          memory: 256M
         requests:
           memory: 256M
 #      startupProbe:
@@ -586,8 +586,8 @@ spec:
       maxUnavailable: 1
 #      minAvailable: 0
     resources:
-#      limits:
-#        memory: 256M
+      limits:
+        memory: 256M
       requests:
         memory: 128M
 #    startupProbe:
@@ -643,9 +643,9 @@ spec:
 #      runAsGroup: 1001
 #      runAsUser: 1001
     resources:
-      limits:
-        cpu: 400m
-        memory: 256M
+#      limits:
+#        cpu: 400m
+#        memory: 256M
       requests:
         cpu: 300m
         memory: 150M
@@ -697,13 +697,13 @@ spec:
 #      privileged: false
 #      runAsGroup: 1001
 #      runAsUser: 1001
-    resources:
-      limits:
-        cpu: 100m
-        memory: 100M
-      requests:
-        cpu: 200m
-        memory: 200M
+#    resources:
+#      limits:
+#        cpu: 100m
+#        memory: 100M
+#      requests:
+#        cpu: 200m
+#        memory: 200M
     storages:
 #      azure-blob:
 #        azure:
@@ -755,16 +755,16 @@ spec:
 #        type: azure
 #        verifyTLS: null
       s3-us-west:
-        affinity:
-          nodeAffinity:
-            requiredDuringSchedulingIgnoredDuringExecution:
-              nodeSelectorTerms:
-                - matchExpressions:
-                    - key: kubernetes.io/e2e-az-name
-                      operator: In
-                      values:
-                        - e2e-az1
-                        - e2e-az2
+#        affinity:
+#          nodeAffinity:
+#            requiredDuringSchedulingIgnoredDuringExecution:
+#              nodeSelectorTerms:
+#                - matchExpressions:
+#                    - key: kubernetes.io/e2e-az-name
+#                      operator: In
+#                      values:
+#                        - e2e-az1
+#                        - e2e-az2
 #        annotations:
 #          testName: scheduled-backup
 #        containerOptions:
@@ -800,14 +800,14 @@ spec:
 #          requests:
 #            cpu: 200m
 #            memory: 200M
-        runtimeClassName: image-rc
+#        runtimeClassName: image-rc
         s3:
           bucket: S3-BACKUP-BUCKET-NAME-HERE
           credentialsSecret: ps-cluster1-s3-credentials
-          endpointUrl: https://s3.amazonaws.com
-          prefix: PREFIX_NAME
+#          endpointUrl: https://s3.amazonaws.com
+#          prefix: PREFIX_NAME
           region: us-west-2
-        schedulerName: default-scheduler
+#        schedulerName: default-scheduler
 #        tolerations:
 #          - effect: NoExecute
 #            key: node.alpha.kubernetes.io/unreachable