Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Commit

Permalink
Update kube dashboard version, allow download link to be configurable (
Browse files Browse the repository at this point in the history
…#409)

* Fixes after merge

* Fix build

* Update Kube Dashboard, allow download link to be configurable
- Default download link updated to v2.0.3
- Can configured link by setting env var `STRATOS_KUBERNETES_DASHBOARD_IMAGE`
- Can configure env var in helm via `console.kubeDashboardImage`
- Kube Dashboard now expanded by default (to show namespace drop down)

* Fix after merge

* Changes following review

* Fix expand of kube dashboard header by default

* Revert package-lock.json to master version
  • Loading branch information
richard-cox committed Jul 10, 2020
1 parent aa5352c commit 0543700
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 265 deletions.
2 changes: 1 addition & 1 deletion deploy/kubernetes/console/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ helm install my-console stratos/console --namespace=console --set console.localA

In some scenarios it is useful to be able to add custom annotations and/or labels to the Kubernetes resources that the Stratos Helm chart creates.

The Stratos Helm chart exposes a number of Helm chart values that cabe specified in order to do this - they are:
The Stratos Helm chart exposes a number of Helm chart values that can be specified in order to do this - they are:

|Parameter|Description|Default|
|----|---|---|
Expand Down
4 changes: 0 additions & 4 deletions deploy/kubernetes/console/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ spec:
value: "{{.Values.consoleVersion}}:{{ .Release.Revision }}"
- name: STRATOS_HELM_RELEASE
value: "{{ .Release.Name }}"
- name: STRATOS_KUBERNETES_NAMESPACE
value: "{{ .Release.Namespace }}"
- name: STRATOS_KUBERNETES_TERMINAL_IMAGE
value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
- name: DB_USER
valueFrom:
secretKeyRef:
Expand Down
3 changes: 3 additions & 0 deletions deploy/kubernetes/console/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ console:

# Node Selector for console Pod
nodeSelector: {}

# Download link when installing the Kubernetes Dashboard in a targetted Kube Endpoint
kubeDashboardImage:

images:
console: stratos-console
Expand Down
4 changes: 3 additions & 1 deletion deploy/kubernetes/custom/__stratos.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
- name: SYNC_SERVER_URL
value: "http://{{ .Release.Name }}-chartsync:8080"
- name: STRATOS_KUBERNETES_NAMESPACE
value: "{{ .Release.Namespace }}"
value: "{{ .Release.Namespace }}"
- name: STRATOS_KUBERNETES_TERMINAL_IMAGE
value: "{{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/stratos-kube-terminal:{{.Values.consoleVersion}}"
- name: STRATOS_KUBERNETES_DASHBOARD_IMAGE
value: "{{.Values.console.kubeDashboardImage}}"
{{- end }}
Loading

0 comments on commit 0543700

Please sign in to comment.