diff --git a/install/kots/manifests/gitpod-installer-job.yaml b/install/kots/manifests/gitpod-installer-job.yaml index 1f0a5c20f6d515..aa9d590a15e0c7 100644 --- a/install/kots/manifests/gitpod-installer-job.yaml +++ b/install/kots/manifests/gitpod-installer-job.yaml @@ -156,6 +156,7 @@ spec: echo "Gitpod: configuring container registry S3 backend" yq e -i ".containerRegistry.s3storage.bucket = \"{{repl ConfigOption "reg_incluster_storage_s3_bucketname" }}\"" "${CONFIG_FILE}" + yq e -i ".metadata.region = \"{{repl ConfigOption "reg_incluster_storage_s3_region" }}\"" "${CONFIG_FILE}" yq e -i ".containerRegistry.s3storage.certificate.kind = \"secret\"" "${CONFIG_FILE}" yq e -i ".containerRegistry.s3storage.certificate.name = \"container-registry-s3-backend\"" "${CONFIG_FILE}" fi diff --git a/install/kots/manifests/gitpod-registry-s3-backend.yaml b/install/kots/manifests/gitpod-registry-s3-backend.yaml index 2eef65090d2189..33df230f5b72d7 100644 --- a/install/kots/manifests/gitpod-registry-s3-backend.yaml +++ b/install/kots/manifests/gitpod-registry-s3-backend.yaml @@ -9,7 +9,7 @@ metadata: app: gitpod component: gitpod-installer annotations: - kots.io/when: '{{repl and (ConfigOptionEquals "reg_incluster" "0") (ConfigOptionEquals "reg_incluster_storage" "s3") }}' + kots.io/when: '{{repl ConfigOptionEquals "reg_incluster_storage" "s3" }}' data: s3AccessKey: '{{repl ConfigOption "reg_incluster_storage_s3_accesskey" | Base64Encode }}' s3SecretKey: '{{repl ConfigOption "reg_incluster_storage_s3_secretkey" | Base64Encode }}' diff --git a/install/kots/manifests/kots-config.yaml b/install/kots/manifests/kots-config.yaml index 70228c1dea6376..d53a8e15ac4402 100644 --- a/install/kots/manifests/kots-config.yaml +++ b/install/kots/manifests/kots-config.yaml @@ -52,6 +52,13 @@ spec: when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}' help_text: The name of the bucket to act as your S3 storage backend. + - name: reg_incluster_storage_s3_region + title: S3 bucket region + type: text + required: true + when: '{{repl (ConfigOptionEquals "reg_incluster_storage" "s3") }}' + help_text: The AWS region of the S3 bucket. Eg. `eu-central-1`. + - name: reg_incluster_storage_s3_accesskey title: S3 access key type: text