From d205b84c94a7085f520dc1b5f0349e73f3e4a76d Mon Sep 17 00:00:00 2001
From: Angel Misevski <amisevsk@redhat.com>
Date: Tue, 29 Oct 2019 17:53:17 -0400
Subject: [PATCH] Remove/update deprecated machine start timeout env var in
templates
Signed-off-by: Angel Misevski <amisevsk@redhat.com>
---
deploy/kubernetes/helm/che/templates/configmap.yaml | 2 +-
deploy/openshift/templates/che-server-template.yaml | 2 +-
.../test/resources/projects/nodejs-with-yaml/deployment.yaml | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/deploy/kubernetes/helm/che/templates/configmap.yaml b/deploy/kubernetes/helm/che/templates/configmap.yaml
index 8dcbc1d3ee..e4ce845e5b 100644
--- a/deploy/kubernetes/helm/che/templates/configmap.yaml
+++ b/deploy/kubernetes/helm/che/templates/configmap.yaml
@@ -30,7 +30,7 @@ data:
CHE_DEBUG_SERVER: "true"
CHE_INFRASTRUCTURE_ACTIVE: "kubernetes"
CHE_INFRA_KUBERNETES_INGRESS_DOMAIN: {{ .Values.global.ingressDomain }}
- CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN: "5"
+ CHE_INFRA_KUBERNETES_WORKSPACE__START__TIMEOUT__MIN: "5"
CHE_INFRA_KUBERNETES_MASTER__URL: ""
{{- if and .Values.global.tls .Values.global.tls.enabled }}
CHE_INFRA_KUBERNETES_TLS__ENABLED: {{ .Values.global.tls.enabled | quote}}
diff --git a/deploy/openshift/templates/che-server-template.yaml b/deploy/openshift/templates/che-server-template.yaml
index 6e626538d2..c6e1b3514f 100644
--- a/deploy/openshift/templates/che-server-template.yaml
+++ b/deploy/openshift/templates/che-server-template.yaml
@@ -104,7 +104,7 @@ objects:
value: "openshift"
- name: CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL
value: "${PROTOCOL}://che-${NAMESPACE}.${ROUTING_SUFFIX}/agent-binaries/linux_amd64/bootstrapper/bootstrapper"
- - name: CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN
+ - name: CHE_INFRA_KUBERNETES_WORKSPACE__START__TIMEOUT__MIN
value: "5"
- name: CHE_INFRA_KUBERNETES_MASTER__URL
value: "${CHE_INFRA_KUBERNETES_MASTER__URL}"
diff --git a/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml b/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
index 411c9fa410..c0ce37db46 100644
--- a/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
+++ b/selenium/che-selenium-test/src/test/resources/projects/nodejs-with-yaml/deployment.yaml
@@ -87,8 +87,6 @@ spec:
- name: CHE_INFRA_KUBERNETES_BOOTSTRAPPER_BINARY__URL
value: >-
http://che-${NAMESPACE}.172.0.0.1.nip.io/agent-binaries/linux_amd64/bootstrapper/bootstrapper
- - name: CHE_INFRA_KUBERNETES_MACHINE__START__TIMEOUT__MIN
- value: '5'
- name: CHE_INFRA_KUBERNETES_OAUTH__TOKEN
- name: CHE_INFRA_KUBERNETES_USERNAME
- name: CHE_INFRA_KUBERNETES_PASSWORD
--
GitLab