Skip to content

Commit f458bba

Browse files
authored
feat: use GHA to deploy this onto a kind server (#202)
* feat: use GHA to deploy this onto a kind server * chore: merge matrix testing into lint test * chore: enable ingress for testing Signed-off-by: Gareth Evans <gareth@bryncynfelin.co.uk>
1 parent 4df064f commit f458bba

8 files changed

Lines changed: 42 additions & 9 deletions

.github/workflows/lint-test.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1+
---
12
name: Lint and Test Charts
23

34
on: pull_request
45

56
jobs:
67
lint-test:
78
runs-on: ubuntu-latest
9+
10+
strategy:
11+
matrix:
12+
kubernetes_version:
13+
- "kindest/node:v1.20.0"
14+
- "kindest/node:v1.19.1"
15+
- "kindest/node:v1.18.8"
16+
- "kindest/node:v1.17.11"
17+
- "kindest/node:v1.16.15"
18+
fail-fast: false
19+
820
steps:
921
- name: Checkout
1022
uses: actions/checkout@v2
@@ -46,6 +58,8 @@ jobs:
4658
- name: Create kind cluster
4759
uses: helm/kind-action@v1.1.0
4860
if: steps.list-changed.outputs.changed == 'true'
61+
with:
62+
node_image: ${{ matrix.kubernetes_version }}
4963

5064
- name: Run chart-testing (install)
5165
run: ct install --config ct.yaml

charts/jenkins/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
1212
The change log until v1.5.7 was auto-generated based on git commits.
1313
Those entries include a reference to the git commit to be able to get more details.
1414

15+
## 3.0.12
16+
17+
Added GitHub Action testing on Kind 1.16, 1.17, 1.18, 1.19 & 1.20
18+
1519
## 3.0.11
1620

1721
Fixes & unit tests for Ingress resources on Kubernetes 1.19 and above

charts/jenkins/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: jenkins
33
home: https://jenkins.io/
4-
version: 3.0.11
4+
version: 3.0.12
55
appVersion: 2.263.1
66
description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
77
sources:

charts/jenkins/ci/other-values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
controller:
23
overwritePluginsFromImage: false
34
runAsUser: 0
@@ -21,6 +22,9 @@ controller:
2122
- "method groovy.json.JsonSlurperClassic parseText java.lang.String"
2223
- "new groovy.json.JsonSlurperClassic"
2324

25+
ingress:
26+
enabled: true
27+
2428
persistence:
2529
enabled: false
2630

charts/jenkins/templates/jenkins-controller-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ spec:
3737
name: {{ template "jenkins.fullname" . }}
3838
port:
3939
number: {{ .Values.controller.servicePort }}
40+
pathType: ImplementationSpecific
4041
{{ else }}
4142
serviceName: {{ template "jenkins.fullname" . }}
4243
servicePort: {{ .Values.controller.servicePort }}

charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ spec:
4040
name: {{ $serviceName }}
4141
port:
4242
number: {{ $servicePort }}
43+
pathType: ImplementationSpecific
4344
{{ else }}
4445
serviceName: {{ $serviceName }}
4546
servicePort: {{ $servicePort }}

charts/jenkins/tests/jenkins-controller-ingress-1.19-test.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ tests:
5050
name: my-release-jenkins
5151
port:
5252
number: 8080
53+
pathType: ImplementationSpecific
5354
tls:
5455
- hosts:
5556
- jenkins.example.com
@@ -64,14 +65,18 @@ tests:
6465
kubernetes.io/tls-acme: "true"
6566
paths:
6667
- backend:
67-
serviceName: ssl-redirect
68-
servicePort: use-annotation
68+
service:
69+
name: ssl-redirect
70+
port:
71+
number: use-annotation
72+
pathType: ImplementationSpecific
6973
- backend:
7074
service:
7175
name: >-
72-
{{ template "jenkins.fullname" . }}
76+
{{ template "jenkins.fullname" . }}
7377
port:
7478
number: 8080
79+
pathType: ImplementationSpecific
7580
tls:
7681
- secretName: tlsSecret
7782
hosts:
@@ -94,11 +99,13 @@ tests:
9499
name: ssl-redirect
95100
port:
96101
number: use-annotation
102+
pathType: ImplementationSpecific
97103
- backend:
98104
service:
99105
name: my-release-jenkins
100106
port:
101107
number: 8080
108+
pathType: ImplementationSpecific
102109
tls:
103110
- hosts:
104111
- jenkins.example.com
@@ -133,3 +140,4 @@ tests:
133140
name: my-release-jenkins
134141
port:
135142
number: 8080
143+
pathType: ImplementationSpecific

charts/jenkins/tests/jenkins-controller-secondary-ingress-1.19-test.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ capabilities:
1010
tests:
1111
- it: test defaults
1212
asserts:
13-
- hasDocuments:
14-
count: 0
13+
- hasDocuments:
14+
count: 0
1515
- it: enabled
1616
set:
1717
controller.secondaryingress:
@@ -53,10 +53,11 @@ tests:
5353
port:
5454
number: 8080
5555
path: /github-webhook
56+
pathType: ImplementationSpecific
5657
tls:
57-
- hosts:
58-
- jenkins.example.com
59-
secretName: tlsSecret
58+
- hosts:
59+
- jenkins.example.com
60+
secretName: tlsSecret
6061
- it: disable helm.sh label
6162
set:
6263
renderHelmLabels: false

0 commit comments

Comments
 (0)