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

remove -deployment from binder pod name #363

Merged
merged 2 commits into from
Dec 20, 2017
Merged

remove -deployment from binder pod name #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8df88f0
remove -deployment from binder pod name
minrk Dec 18, 2017
3d319ad
Fix service object to match new labels
yuvipanda Dec 20, 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
2 changes: 1 addition & 1 deletion helm-chart/binderhub/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: jupyterhub
version: "0.5.0-66934b6"
version: "0.5.0-f963312"
repository: "https://jupyterhub.github.io/helm-chart"
8 changes: 6 additions & 2 deletions helm-chart/binderhub/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: binderhub-deployment
name: binder
spec:
replicas: 1
strategy:
Expand All @@ -14,7 +14,11 @@ spec:
template:
metadata:
labels:
name: binder-pod
app: binder
name: binder
component: binder
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{ if .Values.deployment.labels -}}
# Because toYaml + indent is super flaky
{{ range $key, $value := .Values.deployment.labels -}}
Expand Down
4 changes: 4 additions & 0 deletions helm-chart/binderhub/templates/dind/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ spec:
metadata:
labels:
name: {{ .Release.Name }}-dind
app: binder
component: dind
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
{{ if .Values.dind.initContainers -}}
initContainers:
Expand Down
6 changes: 5 additions & 1 deletion helm-chart/binderhub/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ spec:
loadBalancerIP: {{ .Values.service.loadBalancerIP | quote }}
{{- end }}
selector:
name: binder-pod
app: binder
name: binder
component: binder
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
ports:
- protocol: TCP
port: 80
Expand Down