Allow resource limits to be set for the Operator's init container (#647)

* Allow resource limits to be set for the Operator's init container

* Add label to all rbac roles

Author: thegridman

api/v1/coherencejobresource_types.go

@@ -76,6 +76,13 @@ func (in *CoherenceJob) GetGlobalSpec() *GlobalSpec {
 	return in.Spec.Global
 }
 
+func (in *CoherenceJob) GetInitResources() *corev1.ResourceRequirements {
+	if in == nil {
+		return nil
+	}
+	return in.Spec.InitResources
+}
+
 // GetSpec returns this resource's CoherenceResourceSpec
 func (in *CoherenceJob) GetSpec() *CoherenceResourceSpec {
 	return &in.Spec.CoherenceResourceSpec
@@ -453,6 +460,12 @@ type CoherenceJobResourceSpec struct {
 	EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`
 	// Global contains attributes that will be applied to all resources managed by the Coherence Operator.
 	Global *GlobalSpec `json:"global,omitempty"`
+	// InitResources is the optional resource requests and limits for the init-container that the Operator
+	// adds to the Pod.
+	//  ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+	// The Coherence operator does not apply any default resources.
+	// +optional
+	InitResources *corev1.ResourceRequirements `json:"initResources,omitempty"`
 }
 
 // GetRestartPolicy returns the name of the application image to use

api/v1/coherenceresource.go

@@ -98,4 +98,6 @@ type CoherenceResource interface {
 	GetEnvVarFrom() []corev1.EnvFromSource
 	// GetGlobalSpec returns the attributes to be applied to all resources
 	GetGlobalSpec() *GlobalSpec
+	// GetInitResources returns the optional resource requirements for the init container
+	GetInitResources() *corev1.ResourceRequirements
 }

api/v1/coherenceresource_types.go

@@ -194,6 +194,13 @@ func (in *Coherence) GetGlobalSpec() *GlobalSpec {
 	return in.Spec.Global
 }
 
+func (in *Coherence) GetInitResources() *corev1.ResourceRequirements {
+	if in == nil {
+		return nil
+	}
+	return in.Spec.InitResources
+}
+
 // FindFullyQualifiedPortServiceNames returns a map of the exposed ports of this resource mapped to their Service's
 // fully qualified domain name.
 func (in *Coherence) FindFullyQualifiedPortServiceNames() map[string]string {
@@ -497,6 +504,12 @@ type CoherenceStatefulSetResourceSpec struct {
 	EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`
 	// Global contains attributes that will be applied to all resources managed by the Coherence Operator.
 	Global *GlobalSpec `json:"global,omitempty"`
+	// InitResources is the optional resource requests and limits for the init-container that the Operator
+	// adds to the Pod.
+	//  ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+	// The Coherence operator does not apply any default resources.
+	// +optional
+	InitResources *corev1.ResourceRequirements `json:"initResources,omitempty"`
 }
 
 // CreateStatefulSetResource creates the deployment's StatefulSet resource.

api/v1/coherenceresourcespec_types.go

@@ -1046,6 +1046,12 @@ func (in *CoherenceResourceSpec) CreateOperatorInitContainer(deployment Coherenc
 	// set the persistence volume mounts if required
 	in.Coherence.AddPersistenceVolumeMounts(&c)
 
+	// set the container resources if specified
+	r := deployment.GetInitResources()
+	if r != nil {
+		c.Resources = *r
+	}
+
 	return c
 }
 

api/v1/create_statefulset_test.go

@@ -280,6 +280,31 @@ func TestCreateStatefulSetWithPodAnnotations(t *testing.T) {
 	assertStatefulSetCreation(t, deployment, stsExpected)
 }
 
+func TestCreateStatefulSetWithInitContainerResources(t *testing.T) {
+	res := corev1.ResourceRequirements{
+		Limits: map[corev1.ResourceName]resource.Quantity{
+			corev1.ResourceCPU: resource.MustParse("8"),
+		},
+		Requests: map[corev1.ResourceName]resource.Quantity{
+			corev1.ResourceCPU: resource.MustParse("4"),
+		},
+	}
+
+	spec := coh.CoherenceStatefulSetResourceSpec{
+		InitResources: &res,
+	}
+
+	// Create the test deployment
+	deployment := createTestCoherenceDeployment(spec)
+
+	// Create expected StatefulSet
+	stsExpected := createMinimalExpectedStatefulSet(deployment)
+	stsExpected.Spec.Template.Spec.InitContainers[0].Resources = res
+
+	// assert that the StatefulSet is as expected
+	assertStatefulSetCreation(t, deployment, stsExpected)
+}
+
 func TestCreateStatefulSetWithResources(t *testing.T) {
 	res := corev1.ResourceRequirements{
 		Limits: map[corev1.ResourceName]resource.Quantity{

api/v1/zz_generated.deepcopy.go

@@ -7,3 +7,5 @@ kind: Secret
 metadata:
   name: coherence-webhook-server-cert
   namespace: coherence
+  labels:
+    control-plane: coherence

config/manager/webhook-secret.yaml

@@ -3,6 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: leader-election-role
+  labels:
+    control-plane: coherence
 rules:
 - apiGroups:
   - ""

config/rbac/leader_election_role.yaml

@@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: leader-election-rolebinding
+  labels:
+    control-plane: coherence
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

config/rbac/leader_election_role_binding.yaml

@@ -2,8 +2,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
+  labels:
+    control-plane: coherence
 rules:
 - apiGroups:
   - ""