From 516c7e9422cf33728e601fb47496f1bc8e138346 Mon Sep 17 00:00:00 2001
From: Tarun Pothulapati <tarun@gitpod.io>
Date: Fri, 19 Aug 2022 04:59:01 +0000
Subject: [PATCH] [kots] show `s3` options only when `incluster` is enabled

Fixes https://github.com/gitpod-io/gitpod/issues/10257

This PR updates the `reg_incluster_storage_s3*` options to
only be enabled both when `incluster` is enabled, and `s3` is
selected, instead of only the latter being used currently.

Signed-off-by: Tarun Pothulapati <tarun@gitpod.io>
---
 install/kots/manifests/kots-config.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/install/kots/manifests/kots-config.yaml b/install/kots/manifests/kots-config.yaml
index 0f602f4bc0bfda..5cbdbd1941fe4e 100644
--- a/install/kots/manifests/kots-config.yaml
+++ b/install/kots/manifests/kots-config.yaml
@@ -49,7 +49,7 @@ spec:
           title: Storage region
           type: text
           required: true
-          when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
+          when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
           help_text: ID of the region where your storage exists, such as `eu-west-2`.
 
         - name: reg_incluster_storage_s3_endpoint
@@ -57,27 +57,27 @@ spec:
           type: text
           required: true
           value: s3.amazonaws.com
-          when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
+          when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
           help_text: The endpoint used to connect to the S3 storage.
 
         - name: reg_incluster_storage_s3_bucketname
           title: S3 bucket name
           type: text
           required: true
-          when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
+          when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
           help_text: The name of the bucket to act as your S3 storage backend.
 
         - name: reg_incluster_storage_s3_accesskey
           title: S3 access key
           type: text
           required: true
-          when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
+          when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
           help_text: The access key to use for authentication of your S3 storage backend.
 
         - name: reg_incluster_storage_s3_secretkey
           title: S3 secret key
           type: password
-          when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
+          when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
           required: true
           help_text: The secret key to use for authentication of your S3 storage backend.