Merge pull request #4 from tomtom-international/feat/secret-option-added

feat: secret objects can be created

charts/azure-devops-agents/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/azure-devops-agents/templates/scaledjob.yaml

@@ -24,7 +24,7 @@ spec:
           - name: AZP_TOKEN
             valueFrom:
               secretKeyRef:
-                name: {{ .Values.secretName | default (printf "%s" (include "azure-devops-agents.fullname" .)) }}
+                name: {{ .Values.secret.name | default (printf "%s" (include "azure-devops-agents.fullname" .)) }}
                 key: AZP_TOKEN
           ports:
             - name: http
@@ -44,8 +44,10 @@ spec:
         nodeSelector:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with .Values.imagePullSecrets }}
         imagePullSecrets:
-        - name: {{ .Values.image.pullSecret }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
   {{- toYaml .Values.autoscaling | nindent 2 }}
   scalingStrategy:
     strategy: "default"               

charts/azure-devops-agents/templates/secret.yaml

@@ -0,0 +1,30 @@
+{{- if .Values.secret.create -}}
+---
+apiVersion: v1
+kind: Secret
+type: "Opaque"
+data:
+  AZP_TOKEN: {{ .Values.secret.token | b64enc | quote }}
+metadata:
+  name: {{ .Values.secret.name | default (printf "%s" (include "azure-devops-agents.fullname" .)) }}
+  labels:
+    {{- include "azure-devops-agents.labels" . | nindent 4 }}
+  {{- with .Values.secret.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+---
+apiVersion: v1
+kind: Secret
+type: "kubernetes.io/dockerconfigjson"
+data:
+  .dockerconfigjson: {{ .Values.secret.pullsecret | b64enc | quote }}
+metadata:
+  name: {{ .Values.secret.name | default (printf "%s" (include "azure-devops-agents.fullname" .)) }}
+  labels:
+    {{- include "azure-devops-agents.labels" . | nindent 4 }}
+  {{- with .Values.secret.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

charts/azure-devops-agents/values.yaml

@@ -5,7 +5,6 @@
 image:
   repository: mcr.microsoft.com/azure-pipelines/vsts-agent
   pullPolicy: IfNotPresent
-  pullSecret: "secret"
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
 
@@ -48,7 +47,11 @@ workloadidentity:
   parameters: ""
   secretObjects: ""
 
-secretName: "mysecret"
+secret:
+  create: true
+  name: "mysecret"
+  token: "mytoken"
+  pullsecret: '{"auths":{"URL":{"username":"USERNAME","password":"TOKEN","auth":"AUTH"}}}'
 
 volumeMounts:
 - name: work-disk