Support default resource of init container

Author: drivebyer

CHANGELOG.md

@@ -9,6 +9,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 * Add `KeepAfterDelete` in `.Spec.VolumeSpec` to keep pvc after mysql cluster been deleted.
+* Add default resource to init container.
 
 ### Changed
 ### Removed

pkg/controller/mysqlcluster/internal/syncer/statefullset.go

@@ -351,6 +351,7 @@ func (s *sfsSyncer) ensureInitContainersSpec() []core.Container {
 		s.cluster.GetSidecarImage(),
 		[]string{"clone-and-init"},
 	)
+	cloneInit.Resources = s.ensureResources(containerCloneAndInitName)
 	initCs = append(initCs, cloneInit)
 
 	// add init container for MySQL if docker image supports this
@@ -676,7 +677,7 @@ func (s *sfsSyncer) ensureResources(name string) core.ResourceRequirements {
 	case containerExporterName:
 		return s.cluster.Spec.PodSpec.MetricsExporterResources
 
-	case containerMySQLInitName, containerMysqlName:
+	case containerMySQLInitName, containerCloneAndInitName, containerMysqlName:
 		return s.cluster.Spec.PodSpec.Resources
 
 	case containerHeartBeatName:

pkg/controller/mysqlcluster/mysqlcluster_controller_test.go

@@ -21,6 +21,8 @@ import (
 	"math/rand"
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/resource"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
@@ -439,6 +441,18 @@ var _ = Describe("MysqlCluster controller", func() {
 				Spec: api.MysqlClusterSpec{
 					Replicas:   &two,
 					SecretName: secret.Name,
+					PodSpec: api.PodSpec{
+						Resources: corev1.ResourceRequirements{
+							Requests: corev1.ResourceList{
+								corev1.ResourceCPU:    resource.MustParse("100m"),
+								corev1.ResourceMemory: resource.MustParse("100Mi"),
+							},
+							Limits: corev1.ResourceList{
+								corev1.ResourceCPU:    resource.MustParse("100m"),
+								corev1.ResourceMemory: resource.MustParse("100Mi"),
+							},
+						},
+					},
 				},
 			})
 
@@ -478,13 +492,40 @@ var _ = Describe("MysqlCluster controller", func() {
 			)))
 		})
 
+		It("should have default resource", func() {
+			cluster.Spec.VolumeSpec = api.VolumeSpec{
+				EmptyDir: &corev1.EmptyDirVolumeSource{},
+			}
+
+			// crete cluster
+			Expect(c.Create(context.TODO(), cluster.Unwrap())).To(Succeed())
+			Eventually(requests, timeout).Should(Receive(Equal(expectedRequest)))
+			Eventually(requests, timeout).Should(Receive(Equal(expectedRequest)))
+
+			sts := &appsv1.StatefulSet{}
+			stsKey := types.NamespacedName{
+				Name:      cluster.GetNameForResource(mysqlcluster.StatefulSet),
+				Namespace: cluster.Namespace,
+			}
+
+			Expect(c.Get(context.TODO(), stsKey, sts)).To(Succeed())
+
+			// test default resource of sts.Spec.Template.Spec.InitContainers should be set
+			Expect(sts.Spec.Template.Spec.InitContainers[0].Resources.Requests[corev1.ResourceCPU]).To(Equal(resource.MustParse("100m")))
+			Expect(sts.Spec.Template.Spec.InitContainers[0].Resources.Requests[corev1.ResourceMemory]).To(Equal(resource.MustParse("100Mi")))
+			Expect(sts.Spec.Template.Spec.InitContainers[0].Resources.Limits[corev1.ResourceCPU]).To(Equal(resource.MustParse("100m")))
+			Expect(sts.Spec.Template.Spec.InitContainers[0].Resources.Limits[corev1.ResourceMemory]).To(Equal(resource.MustParse("100Mi")))
+		})
+
 	})
 
 	Context("testing defaults", func() {
 		It("should set the defaults", func() {
 			newCl := &api.MysqlCluster{}
 			scheme.Default(newCl)
 			Expect(newCl.Spec.Replicas).To(PointTo(Equal(int32(1))))
+
+			// test default resource of spec.podSpec
 		})
 	})
 })