improve abstraction

kubernetes-sigs · Apr 12, 2021 · 16c49f6 · 16c49f6
1 parent cead46d
commit 16c49f6
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/cmd/clusterctl/internal/util/objs.go b/cmd/clusterctl/internal/util/objs.go
@@ -120,11 +120,11 @@ func FixImages(objs []unstructured.Unstructured, alterImageFunc func(image strin
 	// look for resources of kind Deployment and alter the image
 	for i := range objs {
 		o := &objs[i]
-		err := fixDeploymentImage(o, alterImageFunc)
+		err := fixDeploymentImages(o, alterImageFunc)
 		if err != nil {
 			return nil, err
 		}
-		err = fixDaemonSetImage(o, alterImageFunc)
+		err = fixDaemonSetImages(o, alterImageFunc)
 		if err != nil {
 			return nil, err
 		}
@@ -133,7 +133,7 @@ func FixImages(objs []unstructured.Unstructured, alterImageFunc func(image strin
 	return objs, nil
 }
 
-func fixDeploymentImage(o *unstructured.Unstructured, alterImageFunc func(image string) (string, error)) error {
+func fixDeploymentImages(o *unstructured.Unstructured, alterImageFunc func(image string) (string, error)) error {
 	if o.GetKind() != deploymentKind {
 		return nil
 	}
@@ -145,14 +145,10 @@ func fixDeploymentImage(o *unstructured.Unstructured, alterImageFunc func(image
 	}
 
 	var err error
-	d.Spec.Template.Spec.Containers, err = fixContainersImage(d.Spec.Template.Spec.Containers, alterImageFunc)
+	d.Spec.Template.Spec, err = fixPodSpecImages(d.Spec.Template.Spec, alterImageFunc)
 	if err != nil {
 		return errors.Wrapf(err, "failed to fix containers in deployment %s", d.Name)
 	}
-	d.Spec.Template.Spec.InitContainers, err = fixContainersImage(d.Spec.Template.Spec.InitContainers, alterImageFunc)
-	if err != nil {
-		return errors.Wrapf(err, "failed to fix init containers in deployment %s", d.Name)
-	}
 
 	// Convert typed object back to Unstructured
 	if err := scheme.Scheme.Convert(d, o, nil); err != nil {
@@ -161,7 +157,7 @@ func fixDeploymentImage(o *unstructured.Unstructured, alterImageFunc func(image
 	return nil
 }
 
-func fixDaemonSetImage(o *unstructured.Unstructured, alterImageFunc func(image string) (string, error)) error {
+func fixDaemonSetImages(o *unstructured.Unstructured, alterImageFunc func(image string) (string, error)) error {
 	if o.GetKind() != daemonSetKind {
 		return nil
 	}
@@ -173,22 +169,30 @@ func fixDaemonSetImage(o *unstructured.Unstructured, alterImageFunc func(image s
 	}
 
 	var err error
-	d.Spec.Template.Spec.Containers, err = fixContainersImage(d.Spec.Template.Spec.Containers, alterImageFunc)
+	d.Spec.Template.Spec, err = fixPodSpecImages(d.Spec.Template.Spec, alterImageFunc)
 	if err != nil {
 		return errors.Wrapf(err, "failed to fix containers in deamonSet %s", d.Name)
 	}
-	d.Spec.Template.Spec.InitContainers, err = fixContainersImage(d.Spec.Template.Spec.InitContainers, alterImageFunc)
-	if err != nil {
-		return errors.Wrapf(err, "failed to fix init containers in deamonSet %s", d.Name)
-	}
-
 	// Convert typed object back to Unstructured
 	if err := scheme.Scheme.Convert(d, o, nil); err != nil {
 		return err
 	}
 	return nil
 }
 
+func fixPodSpecImages(podSpec v1.PodSpec, alterImageFunc func(image string) (string, error)) (v1.PodSpec, error) {
+	var err error
+	podSpec.Containers, err = fixContainersImage(podSpec.Containers, alterImageFunc)
+	if err != nil {
+		return podSpec, errors.Wrapf(err, "failed to fix containers")
+	}
+	podSpec.InitContainers, err = fixContainersImage(podSpec.InitContainers, alterImageFunc)
+	if err != nil {
+		return podSpec, errors.Wrapf(err, "failed to fix init containers")
+	}
+	return podSpec, nil
+}
+
 func fixContainersImage(containers []v1.Container, alterImageFunc func(image string) (string, error)) ([]v1.Container, error) {
 	for j := range containers {
 		container := &containers[j]