Skip to content

Allow configuration of s3 region for registry backend #10208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Allow configuration of s3 region for registry backend #10208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5103828
Allow configuration of s3 region for registry backend
nandajavarma May 23, 2022
6eb9ba0
refactor to use metadata.region field
nandajavarma May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions install/kots/manifests/gitpod-installer-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/kots/manifests/gitpod-registry-s3-backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into this today, and this worked!

data:
s3AccessKey: '{{repl ConfigOption "reg_incluster_storage_s3_accesskey" | Base64Encode }}'
s3SecretKey: '{{repl ConfigOption "reg_incluster_storage_s3_secretkey" | Base64Encode }}'
7 changes: 7 additions & 0 deletions install/kots/manifests/kots-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we set local as default value?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good point! I will add it!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
type: text
type: text
value: "local"

I think it's value that we need here, right?

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
Expand Down