push the new controller image

Author: nhadar-dn

Makefile

@@ -1,7 +1,7 @@
 # CDNOS Image URL to use to test CDNOS CRD Deployment
 CDNOS_IMG ?= registry.dev.drivenets.net/devops/cdnos_pr_61596:19.1.0.1_priv.61596.59ad5662f25a3760114008c0e51c2ef1b583ae7e
 # Image URL to use all building/pushing image targets
-CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:1.7.1
+CONTROLLER_IMG ?= public.ecr.aws/dn/cdnos-controller:1.7.2
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.0
 

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/dn/cdnos-controller
-  newTag: "1.7.1"
+  newTag: "1.7.2"

config/manifests/manifest.yaml

@@ -576,7 +576,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: public.ecr.aws/dn/cdnos-controller:1.7.1
+        image: public.ecr.aws/dn/cdnos-controller:1.7.2
         livenessProbe:
           httpGet:
             path: /healthz

internal/controller/cdnos_controller.go

@@ -188,10 +188,7 @@ func (r *CdnosReconciler) reconcilePod(ctx context.Context, cdnos *cdnosv1.Cdnos
 	pod.Spec.InitContainers[0].Image = cdnos.Spec.InitImage
 	pod.Spec.InitContainers[0].Args = []string{fmt.Sprintf("%d", cdnos.Spec.InterfaceCount), fmt.Sprintf("%d", cdnos.Spec.InitSleep)}
 	pod.Spec.Containers[0].Command = []string{cdnos.Spec.Command}
-	//pod.Spec.Containers[0].Args = append(cdnos.Spec.Args, fmt.Sprintf("--target=%s", cdnos.Name))
-	//pod.Spec.Containers[0].Args = append(cdnos.Spec.Args, "1000")
 	pod.Spec.Containers[0].Env = cdnos.Spec.Env
-	//pod.Spec.Containers[0].Resources = cdnos.Spec.Resources
 	Limits := CombineResourceRequirements(cdnos.Labels, cdnos.Spec.Resources)
 	pod.Spec.Containers[0].Resources = Limits
 
@@ -404,6 +401,7 @@ func checkFieldExists(env []corev1.EnvVar, fieldName string) bool {
 	return false
 }
 
+// This is the function that is responsible for organizing the resource requirements and limits from the labels
 func CombineResourceRequirements(kv map[string]string, req2 corev1.ResourceRequirements) corev1.ResourceRequirements {
 	result := corev1.ResourceRequirements{
 		Requests: map[corev1.ResourceName]resource.Quantity{},
@@ -437,6 +435,7 @@ func CombineResourceRequirements(kv map[string]string, req2 corev1.ResourceRequi
 	return result
 }
 
+// This function is responsible for reconciling the service
 func (r *CdnosReconciler) reconcileService(ctx context.Context, cdnos *cdnosv1.Cdnos) error {
 	var service corev1.Service
 	svcName := fmt.Sprintf("service-%s", cdnos.Name)