fix missing settings.xml

fullstack-devops · Jul 13, 2022 · db182ca · db182ca
1 parent 2e3cfaa
commit db182ca
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 26 deletions.
diff --git 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
@@ -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
@@ -41,28 +41,27 @@ runner:
     maven:
       # example settings.xml, will be placed in global .m2 folder
       settingsXml:
-        ""
-        # <settings xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
-        #     <mirrors>
-        #         <mirror>
-        #             <id>custom-nexus</id>
-        #             <mirrorOf>*</mirrorOf>
-        #             <url>https://example.intra.com/repository/maven-public/</url>
-        #         </mirror>
-        #     </mirrors>
-        #     <servers>
-        #         <server>
-        #             <id>custom-maven-releases</id>
-        #             <username>${maven.username}</username>
-        #             <password>${maven.password}</password>
-        #         </server>
-        #         <server>
-        #             <id>custom-maven-snapshots</id>
-        #             <username>${maven.username}</username>
-        #             <password>${maven.password}</password>
-        #         </server>
-        #     </servers>
-        # </settings>
+        <settings xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+            <mirrors>
+                <mirror>
+                    <id>custom-nexus</id>
+                    <mirrorOf>*</mirrorOf>
+                    <url>https://example.intra.com/repository/maven-public/</url>
+                </mirror>
+            </mirrors>
+            <servers>
+                <server>
+                    <id>custom-maven-releases</id>
+                    <username>${maven.username}</username>
+                    <password>${maven.password}</password>
+                </server>
+                <server>
+                    <id>custom-maven-snapshots</id>
+                    <username>${maven.username}</username>
+                    <password>${maven.password}</password>
+                </server>
+            </servers>
+        </settings>
 
 imagePullSecrets: []
 nameOverride: ""