Skip to content

Commit fac87c0

Browse files
authored
Merge pull request #384 from ahmedmansour5/jenkins-chart-update
fixes the Jenkins chart old version dependancies
2 parents 7080962 + 18d2331 commit fac87c0

File tree

3 files changed

+32
-24
lines changed

3 files changed

+32
-24
lines changed

deploy/complete/helm-chart/setup/requirements.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ dependencies:
3030
repository: https://charts.jetstack.io
3131
# jenkins
3232
- name: jenkins
33-
version: 2.1.0
33+
version: 4.3.23
3434
condition: jenkins.enabled
35-
repository: https://charts.helm.sh/stable
35+
repository: https://charts.jenkins.io

deploy/complete/helm-chart/setup/templates/NOTES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ how to access the Jenkins application.
6969
kubectl get secret -n {{ .Release.Namespace }} {{ .Release.Name }}-jenkins \
7070
-o jsonpath="{.data.jenkins-admin-password}" | base64 --decode ; echo
7171

72-
- Ensure that Jenkins is up and running
72+
- Ensure that Jenkins is up and running
7373

74-
kubectl get deployment -n {{ .Release.Namespace }} {{ .Release.Name }}-jenkins
74+
kubectl get StatefulSet -n {{ .Release.Namespace }} {{ .Release.Name }}-jenkins
7575

7676
- Access Jenkins with admin/<password>:
7777

78-
- {{ if .Values.jenkins.master.ingress.enabled -}}
78+
- {{ if .Values.jenkins.controller.ingress.enabled -}}
7979
Open http://<external-ip>/jenkins ( See above for how to locate the <external-ip> )
8080
Or alternatively,
8181
{{ end -}}

deploy/complete/helm-chart/setup/values.yaml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,39 @@ grafana:
123123
- grafana-piechart-panel
124124
- btplc-status-dot-panel
125125

126-
# https://github.com/helm/charts/blob/master/stable/jenkins/README.md
126+
# https://github.com/jenkinsci/helm-charts/blob/main/charts/jenkins/README.md
127127
jenkins:
128128
enabled: false
129-
master:
129+
#https://github.com/jenkinsci/helm-charts/blob/main/charts/jenkins/values.yaml
130+
controller:
130131
serviceType: ClusterIP
131132
jenkinsUriPrefix: "/jenkins"
132133
ingress:
133134
# enable ingress only if the ingress-controller `nginx-ingress` is enabled.
134135
enabled: true
135-
paths:
136-
- path: /jenkins
137-
backend:
138-
serviceName: >-
139-
{{ template "jenkins.fullname" . }}
140-
servicePort: 8080
141-
apiVersion: "networking.k8s.io/v1beta1"
136+
apiVersion: networking.k8s.io/v1
137+
metadata:
138+
annotations:
139+
kubernetes.io/ingress.class: nginx
140+
nginx.ingress.kubernetes.io/rewrite-target: /$2
142141
labels: {}
143-
annotations:
144-
kubernetes.io/ingress.class: nginx
142+
spec:
143+
rules:
144+
- http:
145+
paths:
146+
- path: /jenkins(/|$)(.*)
147+
pathType: Prefix
148+
backend:
149+
service:
150+
name: mushop-setup-jenkins
151+
port:
152+
number: 8080
145153
installPlugins:
146-
- kubernetes:1.26.1
147-
- workflow-job:2.39
148-
- workflow-aggregator:2.6
149-
- credentials-binding:1.23
150-
- git:4.2.2
151-
- configuration-as-code:1.41
152-
- blueocean:1.23.2
153-
154+
- kubernetes:3900.va_dce992317b_4
155+
- workflow-aggregator:596.v8c21c963d92d
156+
- git:5.0.1
157+
- configuration-as-code:1625.v27444588cc3d
158+
- blueocean:1.27.3
159+
- credentials-binding:604.vb_64480b_c56ca_
160+
- workflow-job:1292.v27d8cc3e2602
161+

0 commit comments

Comments
 (0)