Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Storage Class Annotation to Jenkins Chart #76

Merged
merged 11 commits into from
May 1, 2017
Merged

Add Storage Class Annotation to Jenkins Chart #76

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c1d9f55
Fix jenkins chart
goruha Mar 20, 2017
1bfa6d0
Made support alpha and beta PVC
goruha Mar 20, 2017
7c8e419
Merge branch 'master' into fix-jenkins
osterman Mar 22, 2017
b2ea0ea
Merge branch 'master' into fix-jenkins
goruha Mar 23, 2017
9b217fd
Address PR comments
goruha Apr 9, 2017
50a0c78
Address PR comments
goruha Apr 9, 2017
61e359a
Address PR comments
goruha Apr 9, 2017
7abff2f
Merge branch 'master' into fix-jenkins
goruha Apr 9, 2017
d8009f8
Merge branch 'master' into fix-jenkins
osterman Apr 24, 2017
3e41351
Merge branch 'master' into fix-jenkins
osterman Apr 25, 2017
7019644
Merge branch 'master' into fix-jenkins
osterman Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions incubator/jenkins/templates/home-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
annotations:
{{- if not (empty .Values.Persistence.StorageClass) }}
volume.beta.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass | quote }}
volume.alpha.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass | quote }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think volume.alpha.kubernetes.io/storage-class has been deprecated - but cannot find where I read that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kubernetes/website#2557

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
spec:
accessModes:
- {{ .Values.Persistence.AccessMode | quote }}
Expand Down
8 changes: 4 additions & 4 deletions incubator/jenkins/templates/jenkins-master-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ spec:
]
}
]'
checksum/config: {{ include (print $.Chart.Name "/templates/config.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Chart.Name "/templates/secret.yaml") . | sha256sum }}
spec:
securityContext:
runAsUser: 0
Expand Down Expand Up @@ -73,17 +75,15 @@ spec:
cpu: "{{.Values.Master.Cpu}}"
memory: "{{.Values.Master.Memory}}"
readinessProbe:
httpGet:
path: /login
tcpSocket:
port: {{.Values.Master.ContainerPort}}
initialDelaySeconds: 60
periodSeconds: 1
timeoutSeconds: 3
successThreshold: 1
failureThreshold: 10
livenessProbe:
httpGet:
path: /login
tcpSocket:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something suspect here... This has been working, why do we need to change it now? I prefer to stick with http health check. Can we ping a different URL? e.g. Image/CSS/JS asset?

port: {{.Values.Master.ContainerPort}}
initialDelaySeconds: 60
periodSeconds: 1
Expand Down
2 changes: 1 addition & 1 deletion incubator/jenkins/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ Agent:

Persistence:
Enabled: true
StorageClass: generic
StorageClass: default
AccessMode: ReadWriteOnce
Size: 8Gi