Skip to content

Commit 38fec92

Browse files
committed
fix some default values + ca-certs
1 parent db182ca commit 38fec92

File tree

3 files changed

+26
-30
lines changed

3 files changed

+26
-30
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.3
18+
version: 0.3.4
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: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ spec:
4242
- name: config-files
4343
configMap:
4444
name: {{ .Release.Name }}-configmap-files
45-
items:
46-
{{- if .Values.runner.additionalFiles.maven.settingsXml }}
47-
- key: "settings.xml"
48-
path: "settings.xml"
49-
{{- end }}
5045
{{- with .Values.imagePullSecrets }}
5146
imagePullSecrets:
5247
{{- toYaml . | nindent 8 }}
@@ -68,7 +63,7 @@ spec:
6863
mountPath: /kaniko/workspace/
6964
{{- if .Values.runner.customCerts.caCertificatesCrt }}
7065
- name: ca-certificates-crt
71-
mountPath: /kaniko/ssl/certs/ca-certificates.crt
66+
mountPath: /kaniko/ssl/certs/
7267
{{- end }}
7368
{{- if .Values.runner.kaniko.mountedSecret }}
7469
- name: pull-secret
@@ -85,7 +80,7 @@ spec:
8580
volumeMounts:
8681
{{- if .Values.runner.customCerts.caCertificatesCrt }}
8782
- name: ca-certificates-crt
88-
mountPath: /etc/ssl/certs/ca-certificates.crt
83+
mountPath: /etc/ssl/certs/
8984
{{- end }}
9085
{{- if .Values.runner.kaniko.enabled }}
9186
- name: workspace-volume

charts/github-actions-runner/values.yaml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runner:
2222
# - name: TEST_ENV
2323
# value: "some value"
2424
kaniko:
25-
enabled: true
25+
enabled: false
2626
image:
2727
repository: ""
2828
mountedSecret: ""
@@ -41,27 +41,28 @@ runner:
4141
maven:
4242
# example settings.xml, will be placed in global .m2 folder
4343
settingsXml:
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>
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>
6566

6667
imagePullSecrets: []
6768
nameOverride: ""

0 commit comments

Comments
 (0)