Merge pull request #2818 from NikhilSharmaWe/controllerTestCorrection

✨deploy-image/v1alpha: made corrections in **controller_test.go scaffolds

Author: camilamacedo86

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/api.go

@@ -105,7 +105,6 @@ func (s *apiScaffolder) Scaffold() error {
 
 	controller := &controllers.Controller{
 		ControllerRuntimeVersion: golangv3scaffolds.ControllerRuntimeVersion,
-		Image:                    s.image,
 	}
 	if err := scaffold.Execute(
 		controller,
@@ -122,7 +121,7 @@ func (s *apiScaffolder) Scaffold() error {
 	}
 
 	if err := scaffold.Execute(
-		&controllers.ControllerTest{},
+		&controllers.ControllerTest{Port: s.port},
 	); err != nil {
 		return fmt.Errorf("error creating controllers/**_controller_test.go: %v", err)
 	}

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go

@@ -34,6 +34,7 @@ type ControllerTest struct {
 	machinery.ResourceMixin
 
 	Image string
+	Port  string
 }
 
 // SetTemplateDefaults implements file.Template
@@ -103,6 +104,9 @@ var _ = Describe("{{ .Resource.Kind }} controller", func() {
 					},
 					Spec: {{ .Resource.ImportAlias }}.{{ .Resource.Kind }}Spec{
 						Size: 1,
+						{{ if not (isEmptyStr .Port) -}}
+						ContainerPort: {{ .Port }},
+						{{- end }}
 					},
 				}
 				fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Creating a new custom resource in the namespace: %s with the name %s\n", {{ lower .Resource.Kind }}.Namespace, {{ lower .Resource.Kind }}.Name))

pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go

@@ -35,8 +35,6 @@ type Controller struct {
 	machinery.ProjectNameMixin
 
 	ControllerRuntimeVersion string
-
-	Image string
 }
 
 // SetTemplateDefaults implements file.Template

testdata/project-v3-with-deploy-image/controllers/memcached_controller_test.go

@@ -59,7 +59,8 @@ var _ = Describe("Memcached controller", func() {
 						Namespace: MemcachedNamespace,
 					},
 					Spec: examplecomv1alpha1.MemcachedSpec{
-						Size: 1,
+						Size:          1,
+						ContainerPort: 11211,
 					},
 				}
 				fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Creating a new custom resource in the namespace: %s with the name %s\n", memcached.Namespace, memcached.Name))

testdata/project-v4-with-deploy-image/controllers/memcached_controller_test.go

@@ -59,7 +59,8 @@ var _ = Describe("Memcached controller", func() {
 						Namespace: MemcachedNamespace,
 					},
 					Spec: examplecomv1alpha1.MemcachedSpec{
-						Size: 1,
+						Size:          1,
+						ContainerPort: 11211,
 					},
 				}
 				fmt.Fprintf(GinkgoWriter, fmt.Sprintf("Creating a new custom resource in the namespace: %s with the name %s\n", memcached.Namespace, memcached.Name))