fix some default values + ca-certs

fullstack-devops · Jul 13, 2022 · 38fec92 · 38fec92
1 parent db182ca
commit 38fec92
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 30 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.3
+version: 0.3.4
 
 # 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
@@ -42,11 +42,6 @@ spec:
         - 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 }}
@@ -68,7 +63,7 @@ spec:
               mountPath: /kaniko/workspace/
             {{- if .Values.runner.customCerts.caCertificatesCrt }}
             - name: ca-certificates-crt
-              mountPath: /kaniko/ssl/certs/ca-certificates.crt
+              mountPath: /kaniko/ssl/certs/
             {{- end }}
             {{- if .Values.runner.kaniko.mountedSecret }}
             - name: pull-secret
@@ -85,7 +80,7 @@ spec:
           volumeMounts:
             {{- if .Values.runner.customCerts.caCertificatesCrt }}
             - name: ca-certificates-crt
-              mountPath: /etc/ssl/certs/ca-certificates.crt
+              mountPath: /etc/ssl/certs/
             {{- end }}
             {{- if .Values.runner.kaniko.enabled }}
             - name: workspace-volume

diff --git a/charts/github-actions-runner/values.yaml b/charts/github-actions-runner/values.yaml
@@ -22,7 +22,7 @@ runner:
     # - name: TEST_ENV
     #   value: "some value"
   kaniko:
-    enabled: true
+    enabled: false
     image:
       repository: ""
     mountedSecret: ""
@@ -41,27 +41,28 @@ 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: ""