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

Jump to bottom

Fix bugs related to installing chart multiple times in the same namespace #3032

Merged
merged 3 commits into from
Mar 15, 2023
Merged

Fix bugs related to installing chart multiple times in the same namespace #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b7b900
Fix existing secret
HoseonRyu Feb 17, 2023
c93be60
Add appLable to proxy service
HoseonRyu Feb 17, 2023
5b9f7ac
Fix implementation of proxy-public Service's selector
consideRatio Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion jupyterhub/templates/_helpers-names.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@
{{- /* A hack to avoid issues from invoking this from a parent Helm chart. */}}
{{- $existing_secret := .Values.hub.existingSecret }}
{{- if ne .Chart.Name "jupyterhub" }}
{{- $existing_secret = .Values.jupyterhub.hub.existingSecret }}
{{- if .Values.jupyterhub }}
{{- $existing_secret = .Values.jupyterhub.hub.existingSecret }}
{{- end }}
{{- end }}
{{- if $existing_secret }}
{{- $existing_secret }}
Expand Down
9 changes: 6 additions & 3 deletions jupyterhub/templates/proxy/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ metadata:
{{- end }}
spec:
selector:
# This service will target the autohttps pod if autohttps is configured, and
# the proxy pod if not. When autohttps is configured, the service proxy-http
# will be around to target the proxy pod directly.
{{- if $autoHTTPS }}
component: autohttps
{{- $_ := merge (dict "componentLabel" "autohttps") . -}}
{{- include "jupyterhub.matchLabels" $_ | nindent 4 }}
{{- else }}
component: proxy
{{- include "jupyterhub.matchLabels" . | nindent 4 }}
{{- end }}
release: {{ .Release.Name }}
ports:
{{- if $HTTPS }}
- name: https
Expand Down