Default manager image version to provider if not specified

Signed-off-by: alexander-demicev <[email protected]>

Author: alexander-demicev

api/v1alpha2/provider_types.go

@@ -184,7 +184,7 @@ type ContainerSpec struct {
 	// Name of the container. Cannot be updated.
 	Name string `json:"name"`
 
-	// Container Image URL
+	// Container Image URL. If container is "manager" and version is not specified, it will be set to the provider version.
 	// +optional
 	ImageURL *string `json:"imageUrl,omitempty"`
 

internal/controller/component_customizer.go

@@ -82,6 +82,7 @@ func customizeObjectsFn(provider operatorv1.GenericProvider) func(objs []unstruc
 
 				providerDeployment := provider.GetSpec().Deployment
 				providerManager := provider.GetSpec().Manager
+				providerVersion := provider.GetSpec().Version
 
 				// If there are multiple deployments, check if we specify customizations for those deployments.
 				// We need to skip the deployment customization if there are several deployments available
@@ -107,7 +108,7 @@ func customizeObjectsFn(provider operatorv1.GenericProvider) func(objs []unstruc
 					providerManager = additionalProviderCustomization.Manager
 				}
 
-				if err := customizeDeployment(providerDeployment, providerManager, d); err != nil {
+				if err := customizeDeployment(providerDeployment, providerManager, d, providerVersion); err != nil {
 					return nil, err
 				}
 
@@ -124,7 +125,7 @@ func customizeObjectsFn(provider operatorv1.GenericProvider) func(objs []unstruc
 }
 
 // customizeDeployment customize provider deployment base on provider spec input.
-func customizeDeployment(dSpec *operatorv1.DeploymentSpec, mSpec *operatorv1.ManagerSpec, d *appsv1.Deployment) error {
+func customizeDeployment(dSpec *operatorv1.DeploymentSpec, mSpec *operatorv1.ManagerSpec, d *appsv1.Deployment, providerVersion string) error {
 	// Customize deployment spec first.
 	if dSpec != nil {
 		customizeDeploymentSpec(*dSpec, d)
@@ -137,7 +138,7 @@ func customizeDeployment(dSpec *operatorv1.DeploymentSpec, mSpec *operatorv1.Man
 			return fmt.Errorf("cannot find %q container in deployment %q", managerContainerName, d.Name)
 		}
 
-		customizeManagerContainer(mSpec, container)
+		customizeManagerContainer(mSpec, container, providerVersion)
 	}
 
 	return nil
@@ -183,7 +184,9 @@ func findManagerContainer(dSpec *appsv1.DeploymentSpec) *corev1.Container {
 }
 
 // customizeManagerContainer customize manager container base on provider spec input.
-func customizeManagerContainer(mSpec *operatorv1.ManagerSpec, c *corev1.Container) {
+func customizeManagerContainer(mSpec *operatorv1.ManagerSpec, c *corev1.Container, providerVersion string) {
+	c.Image = addImageVersionIfMissing(c.Image, providerVersion)
+
 	// ControllerManagerConfigurationSpec fields
 	if mSpec.Controller != nil {
 		// TODO can't find an arg for CacheSyncTimeout
@@ -378,3 +381,11 @@ func isMultipleDeployments(objs []unstructured.Unstructured) bool {
 func isProviderManagerDeploymentName(name string) bool {
 	return strings.HasPrefix(name, "ca") && strings.HasSuffix(name, "-controller-manager")
 }
+
+func addImageVersionIfMissing(image, version string) string {
+	if strings.Contains(image, ":") || strings.Contains(image, "@sha256:") {
+		return image
+	}
+
+	return fmt.Sprintf("%s:%s", image, version)
+}

internal/controller/component_customizer_test.go

@@ -51,7 +51,7 @@ func TestCustomizeDeployment(t *testing.T) {
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{
 						Name:  "manager",
-						Image: "registry.k8s.io/a-manager:1.6.2",
+						Image: "registry.k8s.io/a-manager",
 						Env: []corev1.EnvVar{
 							{
 								Name:  "test1",
@@ -503,7 +503,7 @@ func TestCustomizeDeployment(t *testing.T) {
 							Containers: []corev1.Container{
 								{
 									Name:  "manager",
-									Image: "registry.k8s.io/a-manager:1.6.2",
+									Image: "registry.k8s.io/a-manager:v1.6.2",
 									Env: []corev1.EnvVar{
 										{
 											Name:  "test1",
@@ -557,7 +557,7 @@ func TestCustomizeDeployment(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			deployment := managerDepl.DeepCopy()
-			if err := customizeDeployment(tc.inputDeploymentSpec, tc.inputManagerSpec, deployment); err != nil {
+			if err := customizeDeployment(tc.inputDeploymentSpec, tc.inputManagerSpec, deployment, "v1.6.2"); err != nil {
 				t.Error(err)
 			}