From 3cd7fecf4d1248042b307226a4e663834527c98e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Brunk?= Date: Sat, 20 Mar 2021 23:54:09 +0100 Subject: [PATCH] Helm - Add kubernetes dashboard and update deployments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on the following kustomize changes: - a14fd47f Update deployments with latest k8s library deps (#826) - f149af8e Add kubernetes dashboard to sandbox overlay (#789) Signed-off-by: Sören Brunk --- .gitignore | 1 + helm/Chart.yaml | 5 +++-- helm/templates/admin/cronjob.yaml | 1 - helm/templates/admin/deployment.yaml | 4 ---- helm/templates/datacatalog/deployment.yaml | 2 -- helm/values-sandbox.yaml | 15 ++++++++++++++- helm/values.yaml | 17 +++++++++-------- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index bdde967a1d..62bdea5a24 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ docs/flytekit/flytekit.interfaces.html docs/searchindex.js docs/ __pycache__/ +/helm/charts/ \ No newline at end of file diff --git a/helm/Chart.yaml b/helm/Chart.yaml index b6bb75125a..efbd9675f3 100644 --- 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 index 68477543ed..28fe50d395 100644 --- 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 index f5b6178a32..1f7003c88d 100644 --- 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 index 23981b1c0a..1e3e2b6c6a 100644 --- 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 index ece51fe09a..b4324a194f 100644 --- 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 index f48c07c97d..02bce6577e 100644 --- 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