rename helm imageKey to image to match starter workflows (Azure#176)

aamgayle · Mar 23, 2023 · 983cd20 · 983cd20
1 parent 1562ebf
commit 983cd20
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,9 @@ go-generate:
 	GO111MODULE=on go generate ./pkg/workflows/...; \
 	GO111MODULE=on go generate ./pkg/addons/...;
 
+.PHONY: test
+test: run-unit-tests run-e2e-tests-local
+
 .PHONY: run-unit-tests
 run-unit-tests:
 	docker build . -t gotest && docker run -t --rm --name draft-test gotest test ./... -buildvcs=false

diff --git a/pkg/workflows/service_types.go b/pkg/workflows/service_types.go
@@ -20,8 +20,8 @@ type ServiceManifest interface {
 }
 
 type HelmProductionYaml struct {
-	ImageKey imageKey `yaml:"imageKey"`
-	Service  service  `yaml:"service"`
+	Image   image   `yaml:"image"`
+	Service service `yaml:"service"`
 }
 
 type service struct {
@@ -30,7 +30,7 @@ type service struct {
 	Port        string            `yaml:"port"`
 }
 
-type imageKey struct {
+type image struct {
 	Repository string `yaml:"repository"`
 	PullPolicy string `yaml:"pullPolicy"`
 	Tag        string `yaml:"tag"`

diff --git a/pkg/workflows/workflows.go b/pkg/workflows/workflows.go
@@ -151,7 +151,7 @@ func setHelmContainerImage(filePath, productionImage string) error {
 		return err
 	}
 
-	deploy.ImageKey.Repository = productionImage
+	deploy.Image.Repository = productionImage
 
 	out, err := yaml.Marshal(deploy)
 	if err != nil {

diff --git a/pkg/workflows/workflows_test.go b/pkg/workflows/workflows_test.go
@@ -98,7 +98,7 @@ func TestUpdateProductionDeployments(t *testing.T) {
 
 	helmDeploy := &HelmProductionYaml{}
 	assert.Nil(t, helmDeploy.LoadFromFile(helmFileName))
-	assert.Equal(t, "testImage", helmDeploy.ImageKey.Repository)
+	assert.Equal(t, "testImage", helmDeploy.Image.Repository)
 
 	assert.Nil(t, setDeploymentContainerImage(deploymentFileName, "testImage"))
 	decode := scheme.Codecs.UniversalDeserializer().Decode

diff --git a/template/deployments/helm/charts/production.yaml b/template/deployments/helm/charts/production.yaml
@@ -1,4 +1,4 @@
-imageKey:
+image:
   repository: "{{APPNAME}}"
   pullPolicy: IfNotPresent
   tag: "latest"

diff --git a/template/deployments/helm/charts/templates/deployment.yaml b/template/deployments/helm/charts/templates/deployment.yaml
@@ -31,8 +31,8 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.imageKey.repository }}"
-          imagePullPolicy: {{ .Values.imageKey.pullPolicy }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
               containerPort: {{ .Values.containerPort }}

diff --git a/template/deployments/helm/charts/values.yaml b/template/deployments/helm/charts/values.yaml
@@ -8,8 +8,9 @@ namespace: {{NAMESPACE}}
 
 containerPort: {{PORT}}
 
-imageKey:
+image:
   repository: {{IMAGENAME}}
+  tag: {{IMAGETAG}}
   pullPolicy: IfNotPresent
 
 

diff --git a/template/deployments/helm/draft.yaml b/template/deployments/helm/draft.yaml
@@ -9,6 +9,8 @@ variables:
     description: " the namespace to place new resources in"
   - name: "IMAGENAME"
     description: "the name of the image to use in the deployment"
+  - name: "IMAGETAG"
+    description: "the tag of the image to use in the deployment"
 variableDefaults:
   - name: "PORT"
     value: 80
@@ -17,4 +19,7 @@ variableDefaults:
   - name: "NAMESPACE"
     value: default
   - name: "IMAGENAME"
-    referenceVar: "APPNAME"
+    referenceVar: "APPNAME"
+  - name: "IMAGETAG"
+    value: "latest"
+    disablePrompt: true
diff --git a/template/deployments/kustomize/base/deployment.yaml b/template/deployments/kustomize/base/deployment.yaml
@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
         - name: {{APPNAME}}
-          image: {{IMAGENAME}}
+          image: {{IMAGENAME}}:{{IMAGETAG}}
           ports:
             - containerPort: {{PORT}}
diff --git a/template/deployments/kustomize/draft.yaml b/template/deployments/kustomize/draft.yaml
@@ -9,6 +9,8 @@ variables:
     description: " the namespace to place new resources in"
   - name: "IMAGENAME"
     description: "the name of the image to use in the deployment"
+  - name: "IMAGETAG"
+    description: "the tag of the image to use in the deployment"
 variableDefaults:
   - name: "PORT"
     value: 80
@@ -17,4 +19,7 @@ variableDefaults:
   - name: "NAMESPACE"
     value: default
   - name: "IMAGENAME"
-    referenceVar: "APPNAME"
+    referenceVar: "APPNAME"
+  - name: "IMAGETAG"
+    value: "latest"
+    disablePrompt: true
diff --git a/template/deployments/kustomize/overlays/production/deployment.yaml b/template/deployments/kustomize/overlays/production/deployment.yaml
@@ -13,4 +13,4 @@ spec:
     spec:
       containers:
         - name: {{APPNAME}}
-          image: {{IMAGENAME}}
+          image: {{IMAGENAME}}:{{IMAGETAG}}
diff --git a/template/deployments/manifests/draft.yaml b/template/deployments/manifests/draft.yaml
@@ -9,6 +9,8 @@ variables:
     description: " the namespace to place new resources in"
   - name: "IMAGENAME"
     description: "the name of the image to use in the deployment"
+  - name: "IMAGETAG"
+    description: "the tag of the image to use in the deployment"
 variableDefaults:
   - name: "PORT"
     value: 80
@@ -17,4 +19,7 @@ variableDefaults:
   - name: "NAMESPACE"
     value: default
   - name: "IMAGENAME"
-    referenceVar: "APPNAME"
+    referenceVar: "APPNAME"
+  - name: "IMAGETAG"
+    value: "latest"
+    disablePrompt: true
diff --git a/template/deployments/manifests/manifests/deployment.yaml b/template/deployments/manifests/manifests/deployment.yaml
@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
         - name: {{APPNAME}}
-          image: {{IMAGENAME}}
+          image: {{IMAGENAME}}:{{IMAGETAG}}
           ports:
             - containerPort: {{PORT}}
diff --git a/test/skaffold.yaml b/test/skaffold.yaml
@@ -12,6 +12,6 @@ deploy:
       - name: my-chart
         chartPath: charts
         artifactOverrides:
-          imageKey: my-app
+          image: my-app
         imageStrategy:
           helm: {}
diff --git a/test/templates/helm/charts/production.yaml b/test/templates/helm/charts/production.yaml
@@ -1,4 +1,4 @@
-imageKey:
+image:
   repository: "test"
   pullPolicy: IfNotPresent
   tag: "latest"

diff --git a/test/templates/helm/charts/templates/deployment.yaml b/test/templates/helm/charts/templates/deployment.yaml
@@ -30,8 +30,8 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.imageKey.repository }}:{{ .Values.imageKey.tag }}"
-          imagePullPolicy: {{ .Values.imageKey.pullPolicy }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
               containerPort: {{ .Values.containerPort }}

diff --git a/test/templates/helm/charts/values.yaml b/test/templates/helm/charts/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 containerPort: 8080
 
-imageKey:
+image:
   repository: test
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.

diff --git a/test/templates/helm_prod_values.yaml b/test/templates/helm_prod_values.yaml
@@ -1,4 +1,4 @@
-imageKey:
+image:
   repository: "prodImage"
   pullPolicy: IfNotPresent
   tag: "latest"