Make mysqldExporter.resources optional

It's possible that mysqldExporter.extraFlags are provided while mysqldExporter.resources are not.
planetscale · Nov 8, 2024 · 8b0d8a0 · 8b0d8a0
1 parent 392f857
commit 8b0d8a0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 22 deletions.
diff --git a/deploy/crds/planetscale.com_vitessclusters.yaml b/deploy/crds/planetscale.com_vitessclusters.yaml
@@ -2029,8 +2029,6 @@ spec:
                                                       x-kubernetes-int-or-string: true
                                                     type: object
                                                 type: object
-                                            required:
-                                            - resources
                                             type: object
                                           name:
                                             default: ""
@@ -2474,8 +2472,6 @@ spec:
                                                     x-kubernetes-int-or-string: true
                                                   type: object
                                               type: object
-                                          required:
-                                          - resources
                                           type: object
                                         name:
                                           default: ""

diff --git a/deploy/crds/planetscale.com_vitesskeyspaces.yaml b/deploy/crds/planetscale.com_vitesskeyspaces.yaml
@@ -587,8 +587,6 @@ spec:
                                                 x-kubernetes-int-or-string: true
                                               type: object
                                           type: object
-                                      required:
-                                      - resources
                                       type: object
                                     name:
                                       default: ""
@@ -1032,8 +1030,6 @@ spec:
                                               x-kubernetes-int-or-string: true
                                             type: object
                                         type: object
-                                    required:
-                                    - resources
                                     type: object
                                   name:
                                     default: ""

diff --git a/deploy/crds/planetscale.com_vitessshards.yaml b/deploy/crds/planetscale.com_vitessshards.yaml
@@ -570,8 +570,6 @@ spec:
                                 x-kubernetes-int-or-string: true
                               type: object
                           type: object
-                      required:
-                      - resources
                       type: object
                     name:
                       default: ""

diff --git a/pkg/apis/planetscale/v2/vitessshard_types.go b/pkg/apis/planetscale/v2/vitessshard_types.go
@@ -326,7 +326,7 @@ type MysqldExporterSpec struct {
 	ExtraFlags map[string]string `json:"extraFlags,omitempty"`
 
 	// Resources specify the compute resources to allocate for just the MySQL Exporter.
-	Resources corev1.ResourceRequirements `json:"resources"`
+	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
 // VitessTabletPoolType represents the tablet types for which it makes sense

diff --git a/pkg/operator/vttablet/pod.go b/pkg/operator/vttablet/pod.go
@@ -245,7 +245,7 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
 			//   so we need to do more investigation. For now it's better to leave them empty.
 		}
 
-		if spec.MysqldExporter != nil {
+		if spec.MysqldExporter != nil && (len(spec.MysqldExporter.Resources.Limits) > 0 || len(spec.MysqldExporter.Resources.Requests) > 0) {
 			update.ResourceRequirements(&mysqldExporterContainer.Resources, &spec.MysqldExporter.Resources)
 		}
 	}

diff --git a/test/endtoend/operator/operator-latest.yaml b/test/endtoend/operator/operator-latest.yaml
@@ -3886,8 +3886,6 @@ spec:
                                                         x-kubernetes-int-or-string: true
                                                       type: object
                                                   type: object
-                                              required:
-                                                - resources
                                               type: object
                                             name:
                                               default: ""
@@ -4331,8 +4329,6 @@ spec:
                                                       x-kubernetes-int-or-string: true
                                                     type: object
                                                 type: object
-                                            required:
-                                              - resources
                                             type: object
                                           name:
                                             default: ""
@@ -5708,8 +5704,6 @@ spec:
                                                   x-kubernetes-int-or-string: true
                                                 type: object
                                             type: object
-                                        required:
-                                          - resources
                                         type: object
                                       name:
                                         default: ""
@@ -6153,8 +6147,6 @@ spec:
                                                 x-kubernetes-int-or-string: true
                                               type: object
                                           type: object
-                                      required:
-                                        - resources
                                       type: object
                                     name:
                                       default: ""
@@ -7146,8 +7138,6 @@ spec:
                                   x-kubernetes-int-or-string: true
                                 type: object
                             type: object
-                        required:
-                          - resources
                         type: object
                       name:
                         default: ""