diff --git a/charts/github-actions-runner/Chart.yaml b/charts/github-actions-runner/Chart.yaml index 90da0b7..449c99e 100644 --- a/charts/github-actions-runner/Chart.yaml +++ b/charts/github-actions-runner/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.3.2 +version: 0.3.3 # 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 diff --git a/charts/github-actions-runner/templates/deployment.yaml b/charts/github-actions-runner/templates/deployment.yaml index 42f27b5..d5fcc46 100644 --- a/charts/github-actions-runner/templates/deployment.yaml +++ b/charts/github-actions-runner/templates/deployment.yaml @@ -34,9 +34,19 @@ spec: - name: workspace-volume emptyDir: {} {{- end }} - - name: ca-certificates.crt + {{- if .Values.runner.customCerts.caCertificatesCrt }} + - name: ca-certificates-crt configMap: name: "{{ .Values.runner.customCerts.caCertificatesCrt }}" + {{- end }} + - name: config-files + configMap: + name: {{ .Release.Name }}-configmap-files + items: + {{- if .Values.runner.additionalFiles.maven.settingsXml }} + - key: "settings.xml" + path: "settings.xml" + {{- end }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} @@ -57,7 +67,7 @@ spec: - name: workspace-volume mountPath: /kaniko/workspace/ {{- if .Values.runner.customCerts.caCertificatesCrt }} - - name: ca-certificates.crt + - name: ca-certificates-crt mountPath: /kaniko/ssl/certs/ca-certificates.crt {{- end }} {{- if .Values.runner.kaniko.mountedSecret }} @@ -74,13 +84,16 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} volumeMounts: {{- if .Values.runner.customCerts.caCertificatesCrt }} - - name: ca-certificates.crt + - name: ca-certificates-crt mountPath: /etc/ssl/certs/ca-certificates.crt {{- end }} {{- if .Values.runner.kaniko.enabled }} - name: workspace-volume mountPath: /kaniko/workspace/ {{- end }} + - name: config-files + mountPath: "/mnt/dynamic" + readOnly: true resources: {{- toYaml .Values.resources | nindent 12 }} env: diff --git a/charts/github-actions-runner/values.yaml b/charts/github-actions-runner/values.yaml index b48e442..5c5f33f 100644 --- a/charts/github-actions-runner/values.yaml +++ b/charts/github-actions-runner/values.yaml @@ -41,28 +41,27 @@ runner: maven: # example settings.xml, will be placed in global .m2 folder settingsXml: - "" - # - # - # - # custom-nexus - # * - # https://example.intra.com/repository/maven-public/ - # - # - # - # - # custom-maven-releases - # ${maven.username} - # ${maven.password} - # - # - # custom-maven-snapshots - # ${maven.username} - # ${maven.password} - # - # - # + + + + custom-nexus + * + https://example.intra.com/repository/maven-public/ + + + + + custom-maven-releases + ${maven.username} + ${maven.password} + + + custom-maven-snapshots + ${maven.username} + ${maven.password} + + + imagePullSecrets: [] nameOverride: ""