diff --git a/install/kots/manifests/gitpod-installation-status.yaml b/install/kots/manifests/gitpod-installation-status.yaml index 29eb1a4d54a372..e797af6eeafcd8 100644 --- a/install/kots/manifests/gitpod-installation-status.yaml +++ b/install/kots/manifests/gitpod-installation-status.yaml @@ -30,7 +30,7 @@ spec: containers: - name: installation-status # This will normally be the release tag - image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-airgap-openssh.0" + image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-registry-s3-fork.3" command: - /bin/sh - -c diff --git a/install/kots/manifests/gitpod-installer-job.yaml b/install/kots/manifests/gitpod-installer-job.yaml index 14e5ad1aa771a8..43219a6d7678db 100644 --- a/install/kots/manifests/gitpod-installer-job.yaml +++ b/install/kots/manifests/gitpod-installer-job.yaml @@ -28,7 +28,7 @@ spec: containers: - name: installer # This will normally be the release tag - image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-airgap-openssh.0" + image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-registry-s3-fork.3" volumeMounts: - mountPath: /config-patch name: config-patch @@ -167,6 +167,8 @@ spec: then echo "Gitpod: configuring container registry S3 backend" + yq e -i ".containerRegistry.s3storage.region = \"{{repl ConfigOption "reg_incluster_storage_s3_region" }}\"" "${CONFIG_FILE}" + yq e -i ".containerRegistry.s3storage.endpoint = \"{{repl ConfigOption "reg_incluster_storage_s3_endpoint" }}\"" "${CONFIG_FILE}" yq e -i ".containerRegistry.s3storage.bucket = \"{{repl ConfigOption "reg_incluster_storage_s3_bucketname" }}\"" "${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}" diff --git a/install/kots/manifests/kots-config.yaml b/install/kots/manifests/kots-config.yaml index a752dae3626a26..9e0116115af863 100644 --- a/install/kots/manifests/kots-config.yaml +++ b/install/kots/manifests/kots-config.yaml @@ -45,6 +45,22 @@ spec: - name: s3 title: S3 + # S3 help_text + - name: reg_incluster_storage_s3_region + title: Storage region + type: text + required: true + when: '{{repl (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 + title: Endpoint + type: text + required: true + value: s3.amazonaws.com + when: '{{repl (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