Adding Configmap handling to deployments (#419)

Co-authored-by: David Gamero <[email protected]>

.github/workflows/integration-linux.yml

@@ -444,6 +444,8 @@ jobs:
           npm install -g [email protected]
           ajv validate -s test/update_dry_run_schema.json -d test/temp/update_dry_run.json
       - run: ./draft -v update -d ./langtest/ -a webapp_routing --variable ingress-tls-cert-keyvault-uri=test.cert.keyvault.uri --variable ingress-use-osm-mtls=true --variable ingress-host=host1
+      - name: print manifests
+        run: cat ./langtest/manifests/*
       - name: start minikube
         id: minikube
         uses: medyagh/setup-minikube@master
@@ -2238,7 +2240,7 @@ jobs:
         - run: mkdir ./langtest
         - uses: actions/checkout@v3
           with:
-            repository: OliverMKing/ruby-hello-world
+            repository: davidgamero/sinatra-hello-world
             path: ./langtest
         - name: Execute Dry Run with config file
           run: |
@@ -2273,7 +2275,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - run: rm -rf ./langtest/manifests && rm -f ./langtest/Dockerfile ./langtest/.dockerignore
       - run: ./draft -v create -c ./test/integration/ruby/helm.yaml -d ./langtest/
@@ -2379,7 +2381,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - name: Execute Dry Run with config file
         run: |
@@ -2414,7 +2416,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - run: rm -rf ./langtest/manifests && rm -f ./langtest/Dockerfile ./langtest/.dockerignore
       - run: ./draft -v create -c ./test/integration/ruby/kustomize.yaml -d ./langtest/
@@ -2511,7 +2513,7 @@ jobs:
         - run: mkdir ./langtest
         - uses: actions/checkout@v3
           with:
-            repository: OliverMKing/ruby-hello-world
+            repository: davidgamero/sinatra-hello-world
             path: ./langtest
         - name: Execute Dry Run with config file
           run: |
@@ -2546,7 +2548,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - run: rm -rf ./langtest/manifests && rm -f ./langtest/Dockerfile ./langtest/.dockerignore
       - run: ./draft -v create -c ./test/integration/ruby/manifest.yaml -d ./langtest/

.github/workflows/integration-windows.yml

@@ -551,7 +551,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - run: Remove-Item ./langtest/manifests -Recurse -Force -ErrorAction Ignore
       - run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore
@@ -601,7 +601,7 @@ jobs:
       - run: mkdir ./langtest
       - uses: actions/checkout@v3
         with:
-          repository: OliverMKing/ruby-hello-world
+          repository: davidgamero/sinatra-hello-world
           path: ./langtest
       - run: Remove-Item ./langtest/manifests -Recurse -Force -ErrorAction Ignore
       - run: Remove-Item ./langtest/Dockerfile -ErrorAction Ignore

pkg/cmdhelpers/workflow_helpers.go

@@ -80,7 +80,7 @@ func setDeploymentContainerImage(filePath, productionImage string) error {
 
 	printer := printers.YAMLPrinter{}
 
-	out, err := os.OpenFile(filePath, os.O_RDWR, 0755)
+	out, err := os.OpenFile(filePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
 	if err != nil {
 		return nil
 	}

pkg/config/draftconfig.go

@@ -16,7 +16,7 @@ import (
 const draftConfigFile = "draft.yaml"
 
 type VariableValidator func(string) error
-type VariableTransformer func(string) (string, error)
+type VariableTransformer func(string) (any, error)
 
 type DraftConfig struct {
 	TemplateName        string                         `yaml:"templateName"`
@@ -99,7 +99,7 @@ func (d *DraftConfig) GetVariable(name string) (*BuilderVar, error) {
 	return nil, fmt.Errorf("variable %s not found", name)
 }
 
-func (d *DraftConfig) GetVariableValue(name string) (string, error) {
+func (d *DraftConfig) GetVariableValue(name string) (any, error) {
 	for _, variable := range d.Variables {
 		if variable.Name == name {
 			if variable.Value == "" {

pkg/config/draftconfig_template_test.go

@@ -40,12 +40,19 @@ var validVariableKinds = map[string]bool{
 	"containerImageVersion":      true,
 	"dirPath":                    true,
 	"dockerFileName":             true,
+	"envVarMap":                  true,
 	"filePath":                   true,
 	"flag":                       true,
 	"helmChartOverrides":         true,
 	"ingressHostName":            true,
 	"kubernetesNamespace":        true,
+	"kubernetesProbePeriod":      true,
+	"kubernetesProbeTimeout":     true,
+	"kubernetesProbeThreshold":   true,
+	"kubernetesProbeDelay":       true,
+	"kubernetesResourceLimit":    true,
 	"kubernetesResourceName":     true,
+	"kubernetesResourceRequest":  true,
 	"label":                      true,
 	"port":                       true,
 	"repositoryBranch":           true,

pkg/config/transformers/transformers.go

@@ -1,12 +1,27 @@
 package transformers
 
-func GetTransformer(variableKind string) func(string) (string, error) {
+import (
+	"encoding/json"
+	"fmt"
+)
+
+func GetTransformer(variableKind string) func(string) (any, error) {
 	switch variableKind {
+	case "envVarMap":
+		return EnvironmentVariableMapTransformer
 	default:
 		return DefaultTransformer
 	}
 }
 
-func DefaultTransformer(inputVar string) (string, error) {
+func EnvironmentVariableMapTransformer(inputVar string) (any, error) {
+	var inputVarMap map[string]string
+	if err := json.Unmarshal([]byte(inputVar), &inputVarMap); err != nil {
+		return "", fmt.Errorf("failed to unmarshal variable as map[string]string: %s", err)
+	}
+	return inputVarMap, nil
+}
+
+func DefaultTransformer(inputVar string) (any, error) {
 	return inputVar, nil
 }

pkg/config/validators/validators.go

@@ -1,12 +1,26 @@
 package validators
 
+import (
+	"encoding/json"
+	"fmt"
+)
+
 func GetValidator(variableKind string) func(string) error {
 	switch variableKind {
+	case "envVarMap":
+		return KeyValueMapValidator
 	default:
 		return DefaultValidator
 	}
 }
 
+func KeyValueMapValidator(input string) error {
+	if err := json.Unmarshal([]byte(input), &map[string]string{}); err != nil {
+		return fmt.Errorf("failed to unmarshal variable as map[string]string: %s", err)
+	}
+	return nil
+}
+
 func DefaultValidator(input string) error {
 	return nil
 }

pkg/fixtures/deployments/helm/charts/templates/_helpers.tpl

@@ -26,6 +26,7 @@
 {{- define "testapp.labels" -}}
 helm.sh/chart: {{ include "testapp.chart" . }}
 {{ include "testapp.selectorLabels" . }}
+kubernetes.azure.com/generator: {{ .Values.generatorLabel }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}

pkg/fixtures/deployments/helm/charts/templates/configmap.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "testapp.fullname" . }}-config
+  labels:
+    {{- include "testapp.labels" . | nindent 4 }}
+  namespace: {{ .Values.namespace }}
+data:
+{{- range $key, $value := .Values.envVars }}
+  {{ $key }}: {{ $value }}
+{{- end }}

pkg/fixtures/deployments/helm/charts/templates/deployment.yaml

@@ -4,7 +4,6 @@ metadata:
   name: {{ include "testapp.fullname" . }}
   labels:
     {{- include "testapp.labels" . | nindent 4 }}
-    kubernetes.azure.com/generator: {{ .Values.generatorLabel }}
   namespace: {{ .Values.namespace }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -40,15 +39,14 @@ spec:
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: http
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
-            httpGet:
-              path: /
-              port: http
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "testapp.fullname" . }}-config
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -57,6 +55,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

pkg/fixtures/deployments/helm/charts/templates/service.yaml

@@ -4,7 +4,6 @@ metadata:
   name: {{ include "testapp.fullname" . }}
   labels:
     {{- include "testapp.labels" . | nindent 4 }}
-    kubernetes.azure.com/generator: {{.Values.generatorLabel}}
   annotations:
     {{ toYaml .Values.service.annotations | nindent 4 }}
   namespace: {{ .Values.namespace }}

pkg/fixtures/deployments/helm/charts/values.yaml

@@ -12,40 +12,30 @@ image:
   tag: latest
   pullPolicy: Always
 
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
 podAnnotations: {}
 
 podSecurityContext: {}
-# fsGroup: 2000
-
-securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-# runAsUser: 1000
 
 service:
   annotations: {}
   type: LoadBalancer
   port: 80
 
-resources: {}
+resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-#   memory: 128Mi
+  limits:
+    cpu: "2"
+    memory: "1Gi"
+  requests:
+    cpu: "1"
+    memory: "512Mi"
 
 autoscaling:
   enabled: false
@@ -54,10 +44,62 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+livenessProbe:
+  tcpSocket:
+    port: 80
+readinessProbe:
+  tcpSocket:
+    port: 80
+  periodSeconds: 5
+  timeoutSeconds: 5
+  failureThreshold: 1
+  successThreshold: 1
+  initialDelaySeconds: 3
+
 nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: kubernetes.io/hostname
+    whenUnsatisfiable: ScheduleAnyway
+    labelSelector:
+      matchLabels:
+        app.kubernetes.io/name: testapp
+
+affinity:
+  podAntiAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - weight: 100
+      podAffinityTerm:
+        topologyKey: kubernetes.io/hostname
+        labelSelector:
+          matchLabels:
+            app.kubernetes.io/name: testapp
+
+securityContext:
+  seccompProfile:
+    type: RuntimeDefault
+  capabilities:
+    drop:
+      - ALL
+    add:
+      - SETPCAP
+      - MKNOD
+      - AUDIT_WRITE
+      - CHOWN
+      - DAC_OVERRIDE
+      - FOWNER
+      - FSETID
+      - KILL
+      - SETGID
+      - SETUID
+      - NET_BIND_SERVICE
+      - SYS_CHROOT
+      - SETFCAP
+      - SYS_PTRACE
+
+envVars:
 
 generatorLabel: draft

pkg/fixtures/deployments/kustomize/base/configmap.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: testapp-config
+  namespace: default
+  labels:
+    app.kubernetes.io/name: testapp
+    kubernetes.azure.com/generator: draft
+data: