feat: add field to override and merge them (#99)

* feat: add field to override and merge some * feat: merge override tolerations * test: add testing for terraform config merge * test: check tolerations merge * feat: merge all override runner spec * test: add for merge image, pullsecrets and nodeselector * test: fix image pull secret check * test: check service account name merging * test: add check for resources merge * test: add check for env merge * test: check enfrom merge * build: update crds in install manifest * build: update crds in install manifest * test: check volumes merge * test: check volume mount merge * test: check metatadata merge * docs: list all override available * feat: use override runner spec merging in runner pod
padok-team · Apr 18, 2023 · dcc8f16 · dcc8f16
1 parent 2581051
commit dcc8f16
Show file tree

Hide file tree

Showing 8 changed files with 9,135 additions and 36 deletions.
diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
@@ -2,13 +2,26 @@ package v1alpha1
 
 import (
 	corev1 "k8s.io/api/core/v1"
+	resource "k8s.io/apimachinery/pkg/api/resource"
 )
 
 type OverrideRunnerSpec struct {
 	ImagePullSecrets   []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
+	Image              string                        `json:"image,omitempty"`
 	Tolerations        []corev1.Toleration           `json:"tolerations,omitempty"`
 	NodeSelector       map[string]string             `json:"nodeSelector,omitempty"`
 	ServiceAccountName string                        `json:"serviceAccountName,omitempty"`
+	Resources          corev1.ResourceRequirements   `json:"resources,omitempty"`
+	Env                []corev1.EnvVar               `json:"env,omitempty"`
+	EnvFrom            []corev1.EnvFromSource        `json:"envFrom,omitempty"`
+	Volumes            []corev1.Volume               `json:"volumes,omitempty"`
+	VolumeMounts       []corev1.VolumeMount          `json:"volumeMounts,omitempty"`
+	Metadata           MetadataOverride              `json:"metadata,omitempty"`
+}
+
+type MetadataOverride struct {
+	Annotations map[string]string `json:"annotations,omitempty"`
+	Labels      map[string]string `json:"labels,omitempty"`
 }
 
 // +kubebuilder:validation:Enum=dry;autoApply
@@ -55,3 +68,190 @@ func GetTerragruntEnabled(repository *TerraformRepository, layer *TerraformLayer
 	}
 	return enabled
 }
+
+func GetOverrideRunnerSpec(repository *TerraformRepository, layer *TerraformLayer) OverrideRunnerSpec {
+	return OverrideRunnerSpec{
+		Tolerations:  mergeTolerations(repository.Spec.OverrideRunnerSpec.Tolerations, layer.Spec.OverrideRunnerSpec.Tolerations),
+		NodeSelector: mergeMaps(repository.Spec.OverrideRunnerSpec.NodeSelector, layer.Spec.OverrideRunnerSpec.NodeSelector),
+		Metadata: MetadataOverride{
+			Annotations: mergeMaps(repository.Spec.OverrideRunnerSpec.Metadata.Annotations, layer.Spec.OverrideRunnerSpec.Metadata.Annotations),
+			Labels:      mergeMaps(repository.Spec.OverrideRunnerSpec.Metadata.Labels, layer.Spec.OverrideRunnerSpec.Metadata.Labels),
+		},
+		Env:                mergeEnvVars(repository.Spec.OverrideRunnerSpec.Env, layer.Spec.OverrideRunnerSpec.Env),
+		Volumes:            mergeVolumes(repository.Spec.OverrideRunnerSpec.Volumes, layer.Spec.OverrideRunnerSpec.Volumes),
+		VolumeMounts:       mergeVolumeMounts(repository.Spec.OverrideRunnerSpec.VolumeMounts, layer.Spec.OverrideRunnerSpec.VolumeMounts),
+		Resources:          mergeResources(repository.Spec.OverrideRunnerSpec.Resources, layer.Spec.OverrideRunnerSpec.Resources),
+		EnvFrom:            mergeEnvFrom(repository.Spec.OverrideRunnerSpec.EnvFrom, layer.Spec.OverrideRunnerSpec.EnvFrom),
+		Image:              chooseString(repository.Spec.OverrideRunnerSpec.Image, layer.Spec.OverrideRunnerSpec.Image),
+		ServiceAccountName: chooseString(repository.Spec.OverrideRunnerSpec.ServiceAccountName, layer.Spec.OverrideRunnerSpec.ServiceAccountName),
+		ImagePullSecrets:   mergeImagePullSecrets(repository.Spec.OverrideRunnerSpec.ImagePullSecrets, layer.Spec.OverrideRunnerSpec.ImagePullSecrets),
+	}
+}
+
+func mergeImagePullSecrets(a, b []corev1.LocalObjectReference) []corev1.LocalObjectReference {
+	result := []corev1.LocalObjectReference{}
+	temp := map[string]string{}
+
+	for _, elt := range a {
+		temp[elt.Name] = ""
+	}
+	for _, elt := range b {
+		temp[elt.Name] = ""
+	}
+
+	for k := range temp {
+		result = append(result, corev1.LocalObjectReference{Name: k})
+	}
+	return result
+}
+
+func chooseString(a, b string) string {
+	if len(b) > 0 {
+		return b
+	}
+	return a
+}
+
+func mergeEnvFrom(a, b []corev1.EnvFromSource) []corev1.EnvFromSource {
+	result := []corev1.EnvFromSource{}
+	tempSecret := map[string]string{}
+	tempConfigMap := map[string]string{}
+
+	for _, elt := range a {
+		if elt.ConfigMapRef != nil {
+			tempConfigMap[elt.ConfigMapRef.LocalObjectReference.Name] = elt.Prefix
+		} else {
+			tempSecret[elt.SecretRef.LocalObjectReference.Name] = elt.Prefix
+		}
+	}
+	for _, elt := range b {
+		if elt.ConfigMapRef != nil {
+			tempConfigMap[elt.ConfigMapRef.LocalObjectReference.Name] = elt.Prefix
+		} else {
+			tempSecret[elt.SecretRef.LocalObjectReference.Name] = elt.Prefix
+		}
+	}
+
+	for k, v := range tempConfigMap {
+		result = append(result, corev1.EnvFromSource{
+			Prefix: v,
+			ConfigMapRef: &corev1.ConfigMapEnvSource{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: k,
+				},
+			},
+		})
+	}
+
+	for k, v := range tempSecret {
+		result = append(result, corev1.EnvFromSource{
+			Prefix: v,
+			SecretRef: &corev1.SecretEnvSource{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: k,
+				},
+			},
+		})
+	}
+	return result
+}
+
+func mergeResources(a, b corev1.ResourceRequirements) corev1.ResourceRequirements {
+	return corev1.ResourceRequirements{
+		Limits:   mergeResourceList(a.Limits, b.Limits),
+		Requests: mergeResourceList(a.Requests, b.Requests),
+	}
+}
+
+func mergeResourceList(a, b corev1.ResourceList) map[corev1.ResourceName]resource.Quantity {
+	result := map[corev1.ResourceName]resource.Quantity{}
+
+	for k, v := range a {
+		result[k] = v
+	}
+	for k, v := range b {
+		result[k] = v
+	}
+	return result
+}
+
+func mergeVolumeMounts(a, b []corev1.VolumeMount) []corev1.VolumeMount {
+	result := []corev1.VolumeMount{}
+	tempMap := map[string]corev1.VolumeMount{}
+
+	for _, elt := range a {
+		tempMap[elt.Name] = elt
+	}
+	for _, elt := range b {
+		tempMap[elt.Name] = elt
+	}
+
+	for _, v := range tempMap {
+		result = append(result, v)
+	}
+	return result
+}
+
+func mergeVolumes(a, b []corev1.Volume) []corev1.Volume {
+	result := []corev1.Volume{}
+	tempMap := map[string]corev1.Volume{}
+
+	for _, elt := range a {
+		tempMap[elt.Name] = elt
+	}
+	for _, elt := range b {
+		tempMap[elt.Name] = elt
+	}
+
+	for _, v := range tempMap {
+		result = append(result, v)
+	}
+	return result
+}
+
+func mergeTolerations(a, b []corev1.Toleration) []corev1.Toleration {
+	result := []corev1.Toleration{}
+	tempMap := map[string]corev1.Toleration{}
+
+	for _, elt := range a {
+		tempMap[elt.Key] = elt
+	}
+	for _, elt := range b {
+		tempMap[elt.Key] = elt
+	}
+
+	for _, v := range tempMap {
+		result = append(result, v)
+	}
+	return result
+}
+
+func mergeEnvVars(a, b []corev1.EnvVar) []corev1.EnvVar {
+	result := []corev1.EnvVar{}
+	tempMap := map[string]string{}
+
+	for _, elt := range a {
+		tempMap[elt.Name] = elt.Value
+	}
+	for _, elt := range b {
+		tempMap[elt.Name] = elt.Value
+	}
+
+	for k, v := range tempMap {
+		result = append(result, corev1.EnvVar{Name: k, Value: v})
+	}
+
+	return result
+
+}
+
+func mergeMaps(a, b map[string]string) map[string]string {
+	result := map[string]string{}
+	for k, v := range a {
+		result[k] = v
+	}
+	for k, v := range b {
+		result[k] = v
+	}
+	return result
+}