Merge pull request #2251 from v1r7u/main

Fix fullnameOverride for Ingress & PriorityClass resources
jupyterhub · Jun 15, 2021 · 1a2ff68 · 1a2ff68
2 parents df039b0 + 4bc6888
commit 1a2ff68
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/jupyterhub/templates/_helpers-names.tpl b/jupyterhub/templates/_helpers-names.tpl
@@ -173,8 +173,8 @@
 
 {{- /* Ingress */}}
 {{- define "jupyterhub.ingress.fullname" -}}
-    {{- if (include "jupyterhub.fullname.dash" .) }}
-        {{- include "jupyterhub.fullname.dash" . }}
+    {{- if (include "jupyterhub.fullname" .) }}
+        {{- include "jupyterhub.fullname" . }}
     {{- else -}}
         jupyterhub
     {{- end }}
@@ -192,16 +192,16 @@
 
 {{- /* Priority */}}
 {{- define "jupyterhub.priority.fullname" -}}
-    {{- if (include "jupyterhub.fullname.dash" .) }}
-        {{- include "jupyterhub.fullname.dash" . }}
+    {{- if (include "jupyterhub.fullname" .) }}
+        {{- include "jupyterhub.fullname" . }}
     {{- else }}
         {{- .Release.Name }}-default-priority
     {{- end }}
 {{- end }}
 
 {{- /* user-placeholder Priority */}}
 {{- define "jupyterhub.user-placeholder-priority.fullname" -}}
-    {{- if (include "jupyterhub.fullname.dash" .) }}
+    {{- if (include "jupyterhub.fullname" .) }}
         {{- include "jupyterhub.user-placeholder.fullname" . }}
     {{- else }}
         {{- .Release.Name }}-user-placeholder-priority
@@ -210,7 +210,7 @@
 
 {{- /* user-scheduler's registered name */}}
 {{- define "jupyterhub.user-scheduler.fullname" -}}
-    {{- if (include "jupyterhub.fullname.dash" .) }}
+    {{- if (include "jupyterhub.fullname" .) }}
         {{- include "jupyterhub.user-scheduler-deploy.fullname" . }}
     {{- else }}
         {{- .Release.Name }}-user-scheduler