Skip to content

Commit 516c7e9

Browse files
committed
[kots] show s3 options only when incluster is enabled
Fixes #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 <[email protected]>
1 parent 3102716 commit 516c7e9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

install/kots/manifests/kots-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,35 +49,35 @@ spec:
4949
title: Storage region
5050
type: text
5151
required: true
52-
when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
52+
when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
5353
help_text: ID of the region where your storage exists, such as `eu-west-2`.
5454

5555
- name: reg_incluster_storage_s3_endpoint
5656
title: Endpoint
5757
type: text
5858
required: true
5959
value: s3.amazonaws.com
60-
when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
60+
when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
6161
help_text: The endpoint used to connect to the S3 storage.
6262

6363
- name: reg_incluster_storage_s3_bucketname
6464
title: S3 bucket name
6565
type: text
6666
required: true
67-
when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
67+
when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
6868
help_text: The name of the bucket to act as your S3 storage backend.
6969

7070
- name: reg_incluster_storage_s3_accesskey
7171
title: S3 access key
7272
type: text
7373
required: true
74-
when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
74+
when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
7575
help_text: The access key to use for authentication of your S3 storage backend.
7676

7777
- name: reg_incluster_storage_s3_secretkey
7878
title: S3 secret key
7979
type: password
80-
when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
80+
when: '{{repl and (ConfigOptionEquals "reg_incluster" "1") (ConfigOptionEquals "reg_incluster_storage" "s3") }}'
8181
required: true
8282
help_text: The secret key to use for authentication of your S3 storage backend.
8383

0 commit comments

Comments
 (0)