Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kube dashboard version, allow download link to be configurable #409

Merged
merged 10 commits into from
Jul 10, 2020
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 }}
2 changes: 1 addition & 1 deletion docs/customizing.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To aid in migrating we've provided these instructions.
1) Check that your ts config file defines the public api file.
- `src/tsconfig.json` file's `compilerOptions/paths` section should contain something like `"@custom/extensions": ["frontend/packages/custom_extensions/src/public-api.ts"]`.
1) Check that your new package's package.json defines your custom module and if application custom-routing module.
- See `src/frontend/packages/suse_extensions/package.json` file's `stratos` section.
- See `src/frontend/packages/custom_extensions/package.json` file's `stratos` section.
- Note your `routingModule` entry label should not have a preceding `_`.
1) Build Stratos in your usual way, for instance `npm run build`.
- It could be that this fails due to TypeScript import issues, if so go through these and fix.
Expand Down
Loading