Adding support for CHE_LIMITS_USER_WORKSPACES_RUN_COUNT and CHE_WORKSPACE_POD_NODE__SELECTOR in helm chart (#18528)

* Added support for Keycloak admin secret
Added support to change endpoint-watcher image

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

* Added user feedback and validation for Keycloak password

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

* Apply suggestions from code review

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

Co-authored-by: Anatolii Bazko <abazko@redhat.com>

* Apply suggestions from code review

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

Co-authored-by: Anatolii Bazko <abazko@redhat.com>

* Added nodeSelector feature to helm chart (was simply missing from chart)
Fixed the CHE_LIMITS_USER_WORKSPACES_RUN_COUNT name

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

* Fixed location of workspace.number field in values.yaml

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

* Apply suggestions from code review

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

Co-authored-by: Anatolii Bazko <abazko@redhat.com>

* Update deploy/kubernetes/helm/che/templates/configmap.yaml

Signed-off-by: Eric Ladouceur <eric.ladouceur@cyber.gc.ca>

Co-authored-by: Anatolii Bazko <abazko@redhat.com>

Co-authored-by: Anatolii Bazko <abazko@redhat.com>
7.24.x
cccs-eric 2020-12-07 09:24:32 -05:00 committed by GitHub
parent 3af8a5b090
commit f28085dae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions

View File

@ -92,6 +92,9 @@ data:
CHE_WORKSPACE_HTTPS__PROXY: {{ .Values.cheWorkspaceHttpsProxy | quote}}
CHE_WORKSPACE_NO__PROXY: {{ .Values.cheWorkspaceNoProxy | quote}}
CHE_LIMITS_WORKSPACE_IDLE_TIMEOUT: '{{ .Values.global.workspaceIdleTimeout }}'
{{- if .Values.che.limits.userWorkspacesRunCount }}
CHE_LIMITS_USER_WORKSPACES_RUN_COUNT: {{ .Values.che.limits.userWorkspacesRunCount | quote }}
{{- end }}
{{- if .Values.workspaceDefaultRamRequest }}
CHE_WORKSPACE_DEFAULT_MEMORY_REQUEST_MB: {{ .Values.workspaceDefaultRamRequest | quote }}
{{- end }}
@ -118,6 +121,9 @@ data:
{{- end }}
{{- if .Values.global.cheWorkspaceClusterRole }}
CHE_INFRA_KUBERNETES_CLUSTER__ROLE__NAME: {{ .Values.global.cheWorkspaceClusterRole }}
{{- end }}
{{- if .Values.che.workspace.podNodeSelector }}
CHE_WORKSPACE_POD_NODE__SELECTOR: {{ .Values.che.workspace.podNodeSelector | quote }}
{{- end }}
CHE_CORS_ENABLED: "false"
CHE_CORS_ALLOW__CREDENTIALS: "false"

View File

@ -109,7 +109,12 @@ global:
chePluginRegistryUrlFormat: "plugin-registry-%s.%s"
che:
limits: {
# userWorkspacesRunCount
}
workspace: {}
# This variable may contain a set of comma-separated key=value pairs to form the nodeSelector rule
# podNodeSelector: "key1=value1,key2=value2"
# devfileRegistryUrl: "https://che-devfile-registry.openshift.io/"
# pluginBroker:
# waitTimeoutMin: "3"