fixes

scc-digitalhub · Dec 11, 2023 · 1cc7e38 · 1cc7e38
1 parent 52b0e1e
commit 1cc7e38
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/helm/digitalhub/Chart.yaml b/helm/digitalhub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: digitalhub
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.26
+version: 0.2.27
 appVersion: "0.1.0"
 dependencies:
 - name: docker-registry

diff --git a/helm/digitalhub/charts/coder/templates/_helpers.tpl b/helm/digitalhub/charts/coder/templates/_helpers.tpl
@@ -60,7 +60,7 @@ false
 Coder ingress TLS enabled.
 */}}
 {{- define "coder.ingressTlsEnabled" -}}
-{{- if .Values.coder.ingress.tls -}}
+{{- if .Values.coder.ingress.tls.enable -}}
 true
 {{- else -}}
 false

diff --git a/helm/digitalhub/confs/coder/dashboard-main.tf b/helm/digitalhub/confs/coder/dashboard-main.tf
@@ -15,14 +15,14 @@ provider "coder" {
 }
 
 locals {
-  digitalhub_dashboard = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}dashboard--${data.coder_workspace.me.name}--digitalhub-dashboard--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
-  mlrun_ui             = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}mlrun-ui--${data.coder_workspace.me.name}--digitalhub-dashboard--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30060%{endif}"
-  mlrun_api            = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}mlrun-api--${data.coder_workspace.me.name}--digitalhub-dashboard--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30070%{endif}"
+  digitalhub_dashboard = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}dashboard--digitalhub-dashboard--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
+  mlrun_ui             = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}mlrun-ui--digitalhub-dashboard--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30060%{endif}"
+  mlrun_api            = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}mlrun-api--digitalhub-dashboard--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30070%{endif}"
   minio                = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}minio.${var.external_url}%{else}${var.external_url}:30080%{endif}"
-  nuclio_dashboard     = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}nuclio-ui--${data.coder_workspace.me.name}--digitalhub-dashboard--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30040%{endif}"
-  kubeflow_ui          = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}kubeflow-ui--${data.coder_workspace.me.name}--digitalhub-dashboard--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30100%{endif}"
+  nuclio_dashboard     = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}nuclio-ui--digitalhub-dashboard--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30040%{endif}"
+  kubeflow_ui          = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}kubeflow-ui--digitalhub-dashboard--${data.coder_workspace.me.name}--{data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:30100%{endif}"
   grafana              = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}dashboard.${replace(var.external_url, "coder.", "")}%{else}${var.external_url}:30210%{endif}"
-  crm                  = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}crm.${replace(var.external_url, "coder.", "")}%{else}${var.external_url}:30220%{endif}"
+  crm                  = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}krm.${replace(var.external_url, "coder.", "")}%{else}${var.external_url}:30220%{endif}"
 }
 
 variable "use_kubeconfig" {

diff --git a/helm/digitalhub/confs/coder/dremio-main.tf b/helm/digitalhub/confs/coder/dremio-main.tf
@@ -15,7 +15,7 @@ provider "coder" {
 }
 
 locals {
-  dremio_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}dremio--${data.coder_workspace.me.name}--dremio--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
+  dremio_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}dremio--dremio--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
 }
 
 variable "use_kubeconfig" {

diff --git a/helm/digitalhub/confs/coder/grafana-main.tf b/helm/digitalhub/confs/coder/grafana-main.tf
@@ -15,7 +15,7 @@ provider "coder" {
 }
 
 locals {
-  grafana_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}grafana--${data.coder_workspace.me.name}--grafana--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
+  grafana_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}grafana--grafana--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
 }
 
 variable "namespace" {

diff --git a/helm/digitalhub/confs/coder/jupyter-main.tf b/helm/digitalhub/confs/coder/jupyter-main.tf
@@ -15,7 +15,7 @@ provider "coder" {
 }
 
 locals {
-  jupyter_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}jupyter--${data.coder_workspace.me.name}--jupyter--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
+  jupyter_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}jupyter--jupyter--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
 }
 
 variable "use_kubeconfig" {

diff --git a/helm/digitalhub/confs/coder/sqlpad-main.tf b/helm/digitalhub/confs/coder/sqlpad-main.tf
@@ -15,7 +15,7 @@ provider "coder" {
 }
 
 locals {
-  sqlpad_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}sqlpad--${data.coder_workspace.me.name}--sqlpad--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
+  sqlpad_url = "%{if var.https == true}https://%{else}http://%{endif}%{if var.service_type == "ClusterIP"}sqlpad--sqlpad--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}.${var.external_url}%{else}${var.external_url}:${var.node_port}%{endif}"
 }
 
 variable "namespace" {