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.

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

Conversation

goruha
Copy link
Member

@goruha goruha commented Mar 20, 2017

what

  • Add annotation volume.beta.kubernetes.io/storage-class -
  • Added sha256 annotation to config map and secret
  • Made liveness check based on tcpSocket because with github oauth /login always returns redirect and it breaks it.

why

  • Annotation required for support nfs provisioner and is good for support versions k8s
  • trigger automatic deployment restart

@@ -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.

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

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?

Copy link
Member

@osterman osterman left a comment

Choose a reason for hiding this comment

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

See inline comments. Bump chart version.

@osterman osterman changed the title Fix jenkins chart Add Storage Class Annotation Mar 22, 2017
@osterman osterman changed the title Add Storage Class Annotation Add Storage Class Annotation to Jenkins Chart Mar 22, 2017
osterman and others added 9 commits March 22, 2017 12:44
* master: (24 commits)
  Revert back exporter-kube-state into kube-prometheus deps (#105)
  Fix charts CI\CD (#104)
  Add Support for Email Alerts in Prometheus Alert Manager (#103)
  Prometheus 2.1 (#80)
  Added prometheus custom alerts chart (#102)
  Added prometheus exporter kubelets (#93)
  Added prometheus exporter kube state (#94)
  Added prometheus exporter kube scheduler (#95)
  Added prometheus exporter kube etcd (#96)
  Added prometheus exporter kube controller manager (#98)
  Added prometheus exporter kube api (#99)
  Added prometheus exporter kubernetes (#100)
  Added prometheus exporter node (#101)
  Added prometheus exporter kube dns (#97)
  Added prometheus default selectors for rules and service Monitors (#92)
  Support Operator 0.7.0 (#91)
  Bump Grafana Chart Version (#90)
  Add Kubernetes State Exporter for Prometheus (#85)
  Add Grafana (#86)
  Add Prometheus Operator (#81)
  ...
@osterman osterman merged commit d0b29c7 into master May 1, 2017
@osterman osterman deleted the fix-jenkins branch August 18, 2017 05:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants