From f6aaf1a34f0ccbf35a654a39af3c1766d29e20f2 Mon Sep 17 00:00:00 2001
From: Georgi Dankov <gddankov@gmail.com>
Date: Tue, 22 Jan 2019 09:51:22 +0200
Subject: [PATCH] Make Diego optional in SCF again

Signed-off-by: Julian Skupnjak <skupnjak@de.ibm.com>
---
 scf/helm/cf/templates/diego-api.yaml   | 2 +-
 scf/helm/cf/templates/diego-brain.yaml | 2 +-
 scf/helm/cf/templates/diego-cell.yaml  | 2 +-
 scf/helm/cf/templates/diego-ssh.yaml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scf/helm/cf/templates/diego-api.yaml b/scf/helm/cf/templates/diego-api.yaml
index 3665e450..3c00a3e0 100644
--- a/scf/helm/cf/templates/diego-api.yaml
+++ b/scf/helm/cf/templates/diego-api.yaml
@@ -50,7 +50,7 @@ metadata:
     helm.sh/chart: {{ printf "%s-%s" .Chart.Name (.Chart.Version | replace "+" "_") | quote }}
 spec:
   podManagementPolicy: "OrderedReady"
-  replicas: {{ if and .Values.config.HA (eq (int .Values.sizing.diego_api.count) 0) -}} 2 {{- else -}} {{ .Values.sizing.diego_api.count }} {{- end }}
+  replicas: {{ if .Values.env.ENABLE_OPI_STAGING -}} 0 {{- else -}} {{ .Values.sizing.diego_api.count }} {{- end }}
   selector:
     matchLabels:
       skiff-role-name: "diego-api"
diff --git a/scf/helm/cf/templates/diego-brain.yaml b/scf/helm/cf/templates/diego-brain.yaml
index d8cf9685..7241c4bc 100644
--- a/scf/helm/cf/templates/diego-brain.yaml
+++ b/scf/helm/cf/templates/diego-brain.yaml
@@ -50,7 +50,7 @@ metadata:
     helm.sh/chart: {{ printf "%s-%s" .Chart.Name (.Chart.Version | replace "+" "_") | quote }}
 spec:
   podManagementPolicy: "Parallel"
-  replicas: {{ if and .Values.config.HA (eq (int .Values.sizing.diego_brain.count) 0) -}} 2 {{- else -}} {{ .Values.sizing.diego_brain.count }} {{- end }}
+  replicas: {{ if .Values.env.ENABLE_OPI_STAGING -}} 0 {{- else -}} {{ .Values.sizing.diego_brain.count }} {{- end }}
   selector:
     matchLabels:
       skiff-role-name: "diego-brain"
diff --git a/scf/helm/cf/templates/diego-cell.yaml b/scf/helm/cf/templates/diego-cell.yaml
index 4bcc39a6..de090342 100644
--- a/scf/helm/cf/templates/diego-cell.yaml
+++ b/scf/helm/cf/templates/diego-cell.yaml
@@ -116,7 +116,7 @@ metadata:
     helm.sh/chart: {{ printf "%s-%s" .Chart.Name (.Chart.Version | replace "+" "_") | quote }}
 spec:
   podManagementPolicy: "Parallel"
-  replicas: {{ if and .Values.config.HA (eq (int .Values.sizing.diego_cell.count) 0) -}} 3 {{- else -}} {{ .Values.sizing.diego_cell.count }} {{- end }}
+  replicas: {{ if .Values.env.ENABLE_OPI_STAGING -}} 0 {{- else -}} {{ .Values.sizing.diego_cell.count }} {{- end }}
   selector:
     matchLabels:
       skiff-role-name: "diego-cell"
diff --git a/scf/helm/cf/templates/diego-ssh.yaml b/scf/helm/cf/templates/diego-ssh.yaml
index 2e3607be..6f64d8fb 100644
--- a/scf/helm/cf/templates/diego-ssh.yaml
+++ b/scf/helm/cf/templates/diego-ssh.yaml
@@ -47,7 +47,7 @@ metadata:
     helm.sh/chart: {{ printf "%s-%s" .Chart.Name (.Chart.Version | replace "+" "_") | quote }}
 spec:
   podManagementPolicy: "Parallel"
-  replicas: {{ if and .Values.config.HA (eq (int .Values.sizing.diego_ssh.count) 0) -}} 2 {{- else -}} {{ .Values.sizing.diego_ssh.count }} {{- end }}
+  replicas: {{ if .Values.env.ENABLE_OPI_STAGING -}} 0 {{- else -}} {{ .Values.sizing.diego_ssh.count }} {{- end }}
   selector:
     matchLabels:
       skiff-role-name: "diego-ssh"