Skip to content

Add Support for Bahrain me-south-1 AWS region #2826

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

Jump to bottom
Merged
openshift-merge-robot merged 4 commits into from
Jan 7, 2020
Merged

Add Support for Bahrain me-south-1 AWS region #2826

openshift-merge-robot merged 4 commits into from
Jan 7, 2020

Conversation

@patrickdillon
Copy link
Contributor

@patrickdillon patrickdillon commented Dec 16, 2019

Updates validation to allow installing in the me-south-1 Bahrain region in AWS.

/hold
Depends on RHCOS images being published for this region.

JIRA: CORS-1313

cc @miabbott

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 16, 2019
@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 19, 2019
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Dec 19, 2019 •
edited
Loading

support for the me-south-1 region was added to the AWS Terraform provider in v2.22

This PR needs #2676

see hashicorp/terraform-provider-aws#9545

@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 19, 2019
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 20, 2019
@patrickdillon patrickdillon force-pushed the aws-me-south-cors-1313 branch 2 times, most recently from fd0a8f5 to 322c8a4 Compare December 20, 2019 18:31
@patrickdillon patrickdillon force-pushed the aws-me-south-cors-1313 branch from 322c8a4 to 6f339f9 Compare January 2, 2020 16:54
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 2, 2020

Gets to 100% but image-registry fails:

DEBUG Still waiting for the cluster to initialize: Working towards 4.4.0-0.nightly-2019-12-20-210709: 100% complete, waiting on image-registry 
DEBUG Still waiting for the cluster to initialize: Cluster operator image-registry is still updating 
INFO Cluster operator image-registry Available is False with NoReplicasAvailable: The deployment does not have available replicas 
INFO Cluster operator image-registry Progressing is True with DeploymentNotCompleted: The deployment has not completed 
INFO Cluster operator insights Disabled is False with :

@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 2, 2020

/hold cancel
I think issue in #2826 (comment) is unrelated to this PR, but does need to be resolved.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 2, 2020
@patrickdillon patrickdillon force-pushed the aws-me-south-cors-1313 branch from 6f339f9 to a9ce06d Compare January 3, 2020 13:47
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 3, 2020 •
edited
Loading

/hold
Seems like this will indeed depend on image registry adding me-south-1 region:

$ oc get pods -n openshift-image-registry
NAME                                               READY   STATUS             RESTARTS   AGE
cluster-image-registry-operator-7796d787ff-clggk   2/2     Running            0          68m
image-registry-79c5b59b8-jqqct                     0/1     CrashLoopBackOff   17         67m
image-registry-dcfb7bb6f-kcw2b                     0/1     CrashLoopBackOff   17         67m
node-ca-2s9lb                                      1/1     Running            0          65m
node-ca-4vq26                                      1/1     Running            0          64m
node-ca-67kfz                                      1/1     Running            0          67m
node-ca-j4985                                      1/1     Running            0          67m
node-ca-s2v8g                                      1/1     Running            0          65m
node-ca-xr8tx                                      1/1     Running            0          67m

$ oc logs image-registry-79c5b59b8-jqqct -n openshift-image-registry
time="2020-01-03T14:59:40.84698399Z" level=info msg="start registry" distribution_version=v2.6.0+unknown go.version=go1.12.12 openshift_version=v4.4.0-201912200058+2c3bfc0-dirty
time="2020-01-03T14:59:40.847679595Z" level=info msg="caching project quota objects with TTL 1m0s" go.version=go1.12.12
panic: Invalid region provided: me-south-1

goroutine 1 [running]:
github.com/openshift/image-registry/vendor/github.com/docker/distribution/registry/handlers.NewApp(0x1e30260, 0xc000048090, 0xc000291c00, 0xc00009d9e0)
	/go/src/github.com/openshift/image-registry/vendor/github.com/docker/distribution/registry/handlers/app.go:127 +0x31ac
github.com/openshift/image-registry/pkg/dockerregistry/server/supermiddleware.NewApp(0x1e30260, 0xc000048090, 0xc000291c00, 0x1e37de0, 0xc0002d9950, 0x1e42c00)
	/go/src/github.com/openshift/image-registry/pkg/dockerregistry/server/supermiddleware/app.go:96 +0x85
github.com/openshift/image-registry/pkg/dockerregistry/server.NewApp(0x1e30260, 0xc000048090, 0x1e03aa0, 0xc00010c2e0, 0xc000291c00, 0xc000206280, 0x0, 0x0, 0x0, 0xc00004e000)
	/go/src/github.com/openshift/image-registry/pkg/dockerregistry/server/app.go:138 +0x2d4
github.com/openshift/image-registry/pkg/cmd/dockerregistry.NewServer(0x1e30260, 0xc000048090, 0xc000291c00, 0xc000206280, 0x0, 0x0, 0x1e6fd00)
	/go/src/github.com/openshift/image-registry/pkg/cmd/dockerregistry/dockerregistry.go:210 +0x1c2
github.com/openshift/image-registry/pkg/cmd/dockerregistry.Execute(0x1deda00, 0xc00010c020)
	/go/src/github.com/openshift/image-registry/pkg/cmd/dockerregistry/dockerregistry.go:164 +0xa42
main.main()
	/go/src/github.com/openshift/image-registry/cmd/dockerregistry/main.go:93 +0x49c

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 3, 2020
@patrickdillon patrickdillon mentioned this pull request Jan 3, 2020
Merged
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 3, 2020

/hold cancel
Despite image-registry issue installer code should be ready for review/merge

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 3, 2020
@cgwalters
Copy link
Member

cgwalters commented Jan 3, 2020

/approve

@wking
Copy link
Member

wking commented Jan 3, 2020

support for the me-south-1 region was added to the AWS Terraform provider in v2.22

This PR needs #2676

And that PR is still open, and in turn depends on Go 1.13. 4.4+ CI builds use 1.13 since openshift/release#5928, and 4.4+ ART builds use 1.13 since openshift-eng/ocp-build-data@a407152, so we should be clear to move forward with the Terraform bump and then circle back to this one.

@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 3, 2020

And that PR is still open, and in turn depends on Go 1.13. 4.4+ CI builds use 1.13 since openshift/release#5928, and 4.4+ ART builds use 1.13 since openshift-eng/ocp-build-data@a407152, so we should be clear to move forward with the Terraform bump and then circle back to this one.

@wking sorry I addressed this on slack but forgot to update the PR. 82f1ee9520b0fd8f3abac8d9ed8cce5fc8ad4f87 was my temporary solution to this in 4.4. I think it will be a permanent solution in 4.3 & 4.2

@sdodson
Copy link
Member

sdodson commented Jan 3, 2020

/approve

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 3, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2020
wking
wking reviewed Jan 4, 2020
View reviewed changes
@patrickdillon patrickdillon force-pushed the aws-me-south-cors-1313 branch from a9ce06d to d13ad22 Compare January 5, 2020 01:16
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 5, 2020
@patrickdillon
Add Support for Bahrain me-south-1 AWS region
39a1539 
Updates validation to allow installing in the me-south-1 Bahrain region in AWS.
@patrickdillon
Skip verification of aws me-south-1 Bahrain region in Terraform provi…
9904e16 
…der.

Support for me-south-1 was added in the v2.22 aws terraform provider. This commit can be reverted if provider is updated.
@patrickdillon
Bump RHCOS to 44.81.202001030903.0
068e3df 
Add AWS Bahrain region me-south-1.

This commit is a result of running:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.4/44.81.202001030903.0/x86_64/meta.json
@patrickdillon
Vendor: bump AWS SDK to allow cluster destroy in me-south-1 (Bahrain)…
e01424e 
… region.

This vendoring was a result of updating Gopkg.toml and running dep ensure.
@patrickdillon patrickdillon force-pushed the aws-me-south-cors-1313 branch from d13ad22 to e01424e Compare January 5, 2020 01:18
@openshift-ci-robot openshift-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jan 5, 2020
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 5, 2020

/retest

2 similar comments
@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 5, 2020

/retest

@patrickdillon
Copy link
Contributor Author

patrickdillon commented Jan 5, 2020

/retest

@wking
Copy link
Member

wking commented Jan 6, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2020
@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 6, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 6, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 7, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 7, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 7, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 7, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 30f852d into openshift:master Jan 7, 2020
@wking wking mentioned this pull request Jan 9, 2020
Merged
wking added a commit to wking/openshift-docs that referenced this pull request Jan 9, 2020
@wking
modules/installation-aws-user-infra-rhcos-ami: Bump to RHCOS 44.81.20…
0cc4ba1 
…2001030903.0

Catching up with openshift/installer@068e3df3f7 (Bump RHCOS to
44.81.202001030903.0, 2020-01-03, openshift/installer#2826).

Generated with:

  $ date --iso=m --utc
  2020-01-09T03:43+0000
  $ git fetch origin
  $ git --no-pager log -1 --oneline origin/master -- data/data/rhcos.json
  068e3df3f Bump RHCOS to 44.81.202001030903.0
  $ git cat-file -p 068e3df3f:data/data/rhcos.json | jq -r '.amis | to_entries | sort_by(.key)[] | "\n|`" + .key + "`\n|`" + .value.hvm + "`"'

and pasting the output into the module doc.
@wking wking mentioned this pull request Jan 24, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wking wking wking left review comments

@jhixson74 jhixson74 Awaiting requested review from jhixson74

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

Assignees

@wking wking

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@patrickdillon @cgwalters @wking @sdodson @openshift-ci-robot @openshift-bot @openshift-merge-robot