Revert "Set vttablet init container resource limits (#216)" (#244)

This reverts commit be42288.

pkg/operator/vttablet/mysqlctld.go

@@ -18,7 +18,6 @@ package vttablet
 
 import (
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/utils/pointer"
 
 	planetscalev2 "planetscale.dev/vitess-operator/pkg/apis/planetscale/v2"
@@ -48,10 +47,6 @@ for mycnf in $(find . -mindepth 2 -maxdepth 2 -path './vt_*/my.cnf'); do
   sed -i -e 's,^socket[ \t]*=.*$,socket = ` + mysqlSocketPath + `,' "${mycnf}"
 done
 `
-
-	defaultInitCPURequestMillis   = 100
-	defaultInitMemoryRequestBytes = 32 * (1 << 20)  // 32 MiB
-	defaultInitMemoryLimitBytes   = 128 * (1 << 20) // 128 MiB
 )
 
 func init() {
@@ -91,15 +86,6 @@ func init() {
 				},
 				Command: []string{"bash", "-c"},
 				Args:    []string{vtRootInitScript},
-				Resources: corev1.ResourceRequirements{
-					Requests: corev1.ResourceList{
-						corev1.ResourceCPU:    *resource.NewMilliQuantity(defaultInitCPURequestMillis, resource.DecimalSI),
-						corev1.ResourceMemory: *resource.NewQuantity(defaultInitMemoryRequestBytes, resource.BinarySI),
-					},
-					Limits: corev1.ResourceList{
-						corev1.ResourceMemory: *resource.NewQuantity(defaultInitMemoryLimitBytes, resource.BinarySI),
-					},
-				},
 			},
 		}
 
@@ -122,15 +108,6 @@ func init() {
 				},
 				Command: []string{"bash", "-c"},
 				Args:    []string{mysqlSocketInitScript},
-				Resources: corev1.ResourceRequirements{
-					Requests: corev1.ResourceList{
-						corev1.ResourceCPU:    *resource.NewMilliQuantity(defaultInitCPURequestMillis, resource.DecimalSI),
-						corev1.ResourceMemory: *resource.NewQuantity(defaultInitMemoryRequestBytes, resource.BinarySI),
-					},
-					Limits: corev1.ResourceList{
-						corev1.ResourceMemory: *resource.NewQuantity(defaultInitMemoryLimitBytes, resource.BinarySI),
-					},
-				},
 			})
 		}
 

pkg/operator/vttablet/pod.go

@@ -241,18 +241,9 @@ func UpdatePod(obj *corev1.Pod, spec *Spec) {
 		}
 	}
 
-	// Set the resource requirements on each of the default vttablet init
-	// containers to the same values as the vttablet container itself in
-	// case the cluster requires them.
-	defaultTabletInitContainers := tabletInitContainers.Get(spec)
-	for i := range defaultTabletInitContainers {
-		c := &defaultTabletInitContainers[i]
-		update.ResourceRequirements(&c.Resources, &spec.Vttablet.Resources)
-	}
-
 	// Make the final list of desired containers and init containers.
 	initContainers := []corev1.Container{}
-	initContainers = append(initContainers, defaultTabletInitContainers...)
+	initContainers = append(initContainers, tabletInitContainers.Get(spec)...)
 	initContainers = append(initContainers, spec.InitContainers...)
 
 	sidecarContainers := []corev1.Container{}