fix: do not omit 0 replica (#556)

* fix: do not omit 0 replica Signed-off-by: Aylei <rayingecho@gmail.com> * fix Signed-off-by: Aylei <rayingecho@gmail.com> --------- Signed-off-by: Aylei <rayingecho@gmail.com>
matrixorigin · Oct 12, 2024 · 5e68358 · 5e68358
1 parent bf9d35b
commit 5e68358
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 2 deletions.
diff --git a/api/core/v1alpha1/common_types.go b/api/core/v1alpha1/common_types.go
@@ -65,8 +65,7 @@ type PodSet struct {
 	Overlay *Overlay `json:"overlay,omitempty"`
 
 	// Replicas is the desired number of pods of this set
-	// +optional
-	Replicas int32 `json:"replicas,omitempty"`
+	Replicas int32 `json:"replicas"`
 
 	// TopologyEvenSpread specifies what topology domains the Pods in set should be
 	// evenly spread in.

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_cnpools.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_cnpools.yaml
@@ -443,6 +443,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
             required:
             - deps

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_cnsets.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_cnsets.yaml
@@ -412,6 +412,8 @@ spec:
                       can be unavailable during the update process.
                     x-kubernetes-int-or-string: true
                 type: object
+            required:
+            - replicas
             type: object
           status:
             description: CNSetStatus Figure out what status should be exposed

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_dnsets.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_dnsets.yaml
@@ -245,6 +245,8 @@ spec:
                 items:
                   type: string
                 type: array
+            required:
+            - replicas
             type: object
           status:
             properties:

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_logsets.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_logsets.yaml
@@ -327,6 +327,7 @@ spec:
                     type: string
                 type: object
             required:
+            - replicas
             - sharedStorage
             - volume
             type: object

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_matrixoneclusters.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_matrixoneclusters.yaml
@@ -409,6 +409,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
               cnGroups:
                 description: CNGroups are CN pod sets that have different spec like
@@ -770,6 +772,7 @@ spec:
                       type: object
                   required:
                   - name
+                  - replicas
                   type: object
                 type: array
                 x-kubernetes-list-map-keys:
@@ -959,6 +962,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               imagePullPolicy:
                 description: PullPolicy describes a policy for if/when to pull a container
@@ -1252,6 +1257,7 @@ spec:
                         type: string
                     type: object
                 required:
+                - replicas
                 - sharedStorage
                 - volume
                 type: object
@@ -1421,6 +1427,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               restoreFrom:
                 type: string
@@ -1614,6 +1622,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               topologySpread:
                 description: |-
@@ -1973,6 +1983,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
               version:
                 description: |-
@@ -2141,6 +2153,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
             required:
             - logService

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_proxysets.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_proxysets.yaml
@@ -216,6 +216,8 @@ spec:
                 items:
                   type: string
                 type: array
+            required:
+            - replicas
             type: object
           status:
             properties:

diff --git a/charts/matrixone-operator/templates/crds/core.matrixorigin.io_webuis.yaml b/charts/matrixone-operator/templates/crds/core.matrixorigin.io_webuis.yaml
@@ -214,6 +214,8 @@ spec:
                       can be unavailable during the update process.
                     x-kubernetes-int-or-string: true
                 type: object
+            required:
+            - replicas
             type: object
           status:
             properties:

diff --git a/deploy/crds/core.matrixorigin.io_cnpools.yaml b/deploy/crds/core.matrixorigin.io_cnpools.yaml
@@ -443,6 +443,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
             required:
             - deps

diff --git a/deploy/crds/core.matrixorigin.io_cnsets.yaml b/deploy/crds/core.matrixorigin.io_cnsets.yaml
@@ -412,6 +412,8 @@ spec:
                       can be unavailable during the update process.
                     x-kubernetes-int-or-string: true
                 type: object
+            required:
+            - replicas
             type: object
           status:
             description: CNSetStatus Figure out what status should be exposed

diff --git a/deploy/crds/core.matrixorigin.io_dnsets.yaml b/deploy/crds/core.matrixorigin.io_dnsets.yaml
@@ -245,6 +245,8 @@ spec:
                 items:
                   type: string
                 type: array
+            required:
+            - replicas
             type: object
           status:
             properties:

diff --git a/deploy/crds/core.matrixorigin.io_logsets.yaml b/deploy/crds/core.matrixorigin.io_logsets.yaml
@@ -327,6 +327,7 @@ spec:
                     type: string
                 type: object
             required:
+            - replicas
             - sharedStorage
             - volume
             type: object

diff --git a/deploy/crds/core.matrixorigin.io_matrixoneclusters.yaml b/deploy/crds/core.matrixorigin.io_matrixoneclusters.yaml
@@ -409,6 +409,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
               cnGroups:
                 description: CNGroups are CN pod sets that have different spec like
@@ -770,6 +772,7 @@ spec:
                       type: object
                   required:
                   - name
+                  - replicas
                   type: object
                 type: array
                 x-kubernetes-list-map-keys:
@@ -959,6 +962,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               imagePullPolicy:
                 description: PullPolicy describes a policy for if/when to pull a container
@@ -1252,6 +1257,7 @@ spec:
                         type: string
                     type: object
                 required:
+                - replicas
                 - sharedStorage
                 - volume
                 type: object
@@ -1421,6 +1427,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               restoreFrom:
                 type: string
@@ -1614,6 +1622,8 @@ spec:
                     items:
                       type: string
                     type: array
+                required:
+                - replicas
                 type: object
               topologySpread:
                 description: |-
@@ -1973,6 +1983,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
               version:
                 description: |-
@@ -2141,6 +2153,8 @@ spec:
                           can be unavailable during the update process.
                         x-kubernetes-int-or-string: true
                     type: object
+                required:
+                - replicas
                 type: object
             required:
             - logService

diff --git a/deploy/crds/core.matrixorigin.io_proxysets.yaml b/deploy/crds/core.matrixorigin.io_proxysets.yaml
@@ -216,6 +216,8 @@ spec:
                 items:
                   type: string
                 type: array
+            required:
+            - replicas
             type: object
           status:
             properties:

diff --git a/deploy/crds/core.matrixorigin.io_webuis.yaml b/deploy/crds/core.matrixorigin.io_webuis.yaml
@@ -214,6 +214,8 @@ spec:
                       can be unavailable during the update process.
                     x-kubernetes-int-or-string: true
                 type: object
+            required:
+            - replicas
             type: object
           status:
             properties: