Skip to content

Commit db182ca

Browse files
committed
fix missing settings.xml
1 parent 2e3cfaa commit db182ca

File tree

3 files changed

+38
-26
lines changed

3 files changed

+38
-26
lines changed

charts/github-actions-runner/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.3.2
18+
version: 0.3.3
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/github-actions-runner/templates/deployment.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,19 @@ spec:
3434
- name: workspace-volume
3535
emptyDir: {}
3636
{{- end }}
37-
- name: ca-certificates.crt
37+
{{- if .Values.runner.customCerts.caCertificatesCrt }}
38+
- name: ca-certificates-crt
3839
configMap:
3940
name: "{{ .Values.runner.customCerts.caCertificatesCrt }}"
41+
{{- end }}
42+
- name: config-files
43+
configMap:
44+
name: {{ .Release.Name }}-configmap-files
45+
items:
46+
{{- if .Values.runner.additionalFiles.maven.settingsXml }}
47+
- key: "settings.xml"
48+
path: "settings.xml"
49+
{{- end }}
4050
{{- with .Values.imagePullSecrets }}
4151
imagePullSecrets:
4252
{{- toYaml . | nindent 8 }}
@@ -57,7 +67,7 @@ spec:
5767
- name: workspace-volume
5868
mountPath: /kaniko/workspace/
5969
{{- if .Values.runner.customCerts.caCertificatesCrt }}
60-
- name: ca-certificates.crt
70+
- name: ca-certificates-crt
6171
mountPath: /kaniko/ssl/certs/ca-certificates.crt
6272
{{- end }}
6373
{{- if .Values.runner.kaniko.mountedSecret }}
@@ -74,13 +84,16 @@ spec:
7484
imagePullPolicy: {{ .Values.image.pullPolicy }}
7585
volumeMounts:
7686
{{- if .Values.runner.customCerts.caCertificatesCrt }}
77-
- name: ca-certificates.crt
87+
- name: ca-certificates-crt
7888
mountPath: /etc/ssl/certs/ca-certificates.crt
7989
{{- end }}
8090
{{- if .Values.runner.kaniko.enabled }}
8191
- name: workspace-volume
8292
mountPath: /kaniko/workspace/
8393
{{- end }}
94+
- name: config-files
95+
mountPath: "/mnt/dynamic"
96+
readOnly: true
8497
resources:
8598
{{- toYaml .Values.resources | nindent 12 }}
8699
env:

charts/github-actions-runner/values.yaml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,27 @@ runner:
4141
maven:
4242
# example settings.xml, will be placed in global .m2 folder
4343
settingsXml:
44-
""
45-
# <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">
46-
# <mirrors>
47-
# <mirror>
48-
# <id>custom-nexus</id>
49-
# <mirrorOf>*</mirrorOf>
50-
# <url>https://example.intra.com/repository/maven-public/</url>
51-
# </mirror>
52-
# </mirrors>
53-
# <servers>
54-
# <server>
55-
# <id>custom-maven-releases</id>
56-
# <username>${maven.username}</username>
57-
# <password>${maven.password}</password>
58-
# </server>
59-
# <server>
60-
# <id>custom-maven-snapshots</id>
61-
# <username>${maven.username}</username>
62-
# <password>${maven.password}</password>
63-
# </server>
64-
# </servers>
65-
# </settings>
44+
<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">
45+
<mirrors>
46+
<mirror>
47+
<id>custom-nexus</id>
48+
<mirrorOf>*</mirrorOf>
49+
<url>https://example.intra.com/repository/maven-public/</url>
50+
</mirror>
51+
</mirrors>
52+
<servers>
53+
<server>
54+
<id>custom-maven-releases</id>
55+
<username>${maven.username}</username>
56+
<password>${maven.password}</password>
57+
</server>
58+
<server>
59+
<id>custom-maven-snapshots</id>
60+
<username>${maven.username}</username>
61+
<password>${maven.password}</password>
62+
</server>
63+
</servers>
64+
</settings>
6665

6766
imagePullSecrets: []
6867
nameOverride: ""

0 commit comments

Comments
 (0)