Helm - Add kubernetes dashboard and update deployments

Based on the following kustomize changes: - a14fd47 Update deployments with latest k8s library deps (#826) - f149af8 Add kubernetes dashboard to sandbox overlay (#789) Signed-off-by: Sören Brunk <[email protected]> Signed-off-by: Haytham Abuelfutuh <[email protected]>
flyteorg · May 28, 2021 · ddbdaeb · ddbdaeb
1 parent 08a4581
commit ddbdaeb
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ docs/flytekit/flytekit.interfaces.html
 docs/searchindex.js
 docs/
 __pycache__/
+/helm/charts/
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -14,5 +14,6 @@ dependencies:
     version: 1.0.6
     repository: https://googlecloudplatform.github.io/spark-on-k8s-operator
     condition: spark.enabled
-
-
+  - name: kubernetes-dashboard
+    version: 4.0.2
+    repository: https://kubernetes.github.io/dashboard/
diff --git a/helm/templates/admin/cronjob.yaml b/helm/templates/admin/cronjob.yaml
@@ -17,7 +17,6 @@ spec:
           containers:
           - command:
             - flyteadmin
-            - --logtostderr
             - --config
             - {{ .Values.flyteadmin.configPath }}
             - clusterresource

diff --git a/helm/templates/admin/deployment.yaml b/helm/templates/admin/deployment.yaml
@@ -28,7 +28,6 @@ spec:
       {{- end }}
       - command:
         - flyteadmin
-        - --logtostderr
         - --config
         - {{ .Values.flyteadmin.configPath }}
         - migrate
@@ -41,7 +40,6 @@ spec:
           name: config-volume
       - command:
         - flyteadmin
-        - --logtostderr
         - --config
         - {{ .Values.flyteadmin.configPath }}
         - migrate
@@ -57,7 +55,6 @@ spec:
           name: config-volume
       - command:
         - flyteadmin
-        - --logtostderr
         - --config
         - {{ .Values.flyteadmin.configPath }}
         - clusterresource
@@ -73,7 +70,6 @@ spec:
       containers:
       - command:
         - flyteadmin
-        - --logtostderr
         - --config
         - {{ .Values.flyteadmin.configPath }}
         {{- with .Values.flyteadmin.extraArgs }}

diff --git a/helm/templates/datacatalog/deployment.yaml b/helm/templates/datacatalog/deployment.yaml
@@ -20,7 +20,6 @@ spec:
       initContainers:
       - command:
         - datacatalog
-        - --logtostderr
         - --config
         - {{ .Values.datacatalog.configPath }}
         - migrate
@@ -34,7 +33,6 @@ spec:
       containers:
       - command:
         - datacatalog
-        - --logtostderr
         - --config
         - {{ .Values.datacatalog.configPath }}
         {{- with .Values.datacatalog.extraArgs }}

diff --git a/helm/values-sandbox.yaml b/helm/values-sandbox.yaml
@@ -73,6 +73,19 @@ sparkoperator:
 pytorchoperator:
   enabled: false
 
+#
+# KUBERNETES DASHBOARD
+#
+kubernetes-dashboard:
+  extraArgs:
+   - --enable-skip-login
+   - --enable-insecure-login
+   - --disable-settings-authorizer
+  protocolHttp: true
+  service:
+    type: NodePort
+    externalPort: 30082
+
 #
 # COMMON
 #
@@ -138,7 +151,7 @@ configmap:
     plugins:
       logs:
         kubernetes-enabled: true
-        kubernetes-url: http://localhost:30082
+        kubernetes-template-uri: "http://localhost:30082/#/log/{{ .namespace }}/{{ .podName }}/pod?namespace={{ .namespace }}"
 
   logger:
     logger:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -8,8 +8,8 @@ flyteadmin:
   replicaCount: 1
   image:
     # -- Docker image for Flyteadmin deployment
-    repository: ghcr.io/lyft/flyteadmin
-    tag: v0.3.29
+    repository: ghcr.io/flyteorg/flyteadmin
+    tag: v0.3.38
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flyteadmin deployment
   resources:
@@ -48,8 +48,8 @@ datacatalog:
   replicaCount: 1
   image:
     # -- Docker image for Datacatalog deployment
-    repository: ghcr.io/lyft/datacatalog
-    tag: v0.2.130
+    repository: ghcr.io/flyteorg/datacatalog
+    tag: v0.3.0
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Datacatalog deployment
   resources:
@@ -89,7 +89,7 @@ flytepropeller:
   image:
     # -- Docker image for Flytepropeller deployment
     repository: ghcr.io/flyteorg/flytepropeller
-    tag: v0.5.13
+    tag: v0.7.1
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flytepropeller deployment
   resources:
@@ -123,8 +123,8 @@ flyteconsole:
   replicaCount: 1
   image:
     # -- Docker image for Flyteconsole deployment
-    repository: ghcr.io/lyft/flyteconsole
-    tag: v0.19.1
+    repository: ghcr.io/flyteorg/flyteconsole
+    tag: v0.19.6
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flyteconsole deployment
   resources:
@@ -361,7 +361,8 @@ common:
   ingress:
     # --- enable or disable creating Ingress for Flyte. Relevant to disable when using e.g. Istio as ingress controller.
     enabled: true
-    annotations: {}
+    annotations:
+      nginx.ingress.kubernetes.io/ssl-redirect: "false"
   flyteNamespaceTemplate:
     # --- enable or disable creating Flyte namespace in template. Enable when using helm as template-engine only. Disable when using `helm install ...`.
     enabled: false