Skip to content

Conversation

@mhanss
Copy link
Contributor

@mhanss mhanss commented Apr 7, 2022

Add support for installing pre created route53 cluster.

chain:
  as: cucushift-installer-rehearse-aws-ipi-byo-route53-provision
  steps:
    - ref: aws-provision-vpc-shared
    - ref: aws-provision-route53-private-hosted-zone
    - ref: ipi-conf
    - ref: ipi-conf-aws-custom-vpc
    - ref: ipi-conf-aws-byo-route53
    - ref: ipi-conf-aws
    - ref: ipi-install-monitoringpvc
    - chain: ipi-install
  documentation: |-
    Create an IPI cluster on AWS for QE e2e tests.

@mhanss mhanss changed the title Add support for installing pre create route53 hostedzone cluster on AWS WIP: Add support for installing pre create route53 hostedzone cluster on AWS Apr 7, 2022
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2022
@openshift-ci openshift-ci bot requested review from droslean and gpei April 7, 2022 14:03
@mhanss mhanss force-pushed the aws-route53 branch 9 times, most recently from 4b66749 to faf7717 Compare April 7, 2022 22:55
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest to move ipi-conf-aws behind ipi-conf-aws-route53 step.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

Choose a reason for hiding this comment

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

suggest to remove this irrelevant setting

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

Choose a reason for hiding this comment

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

I saw we did not install jq in ci-operator/step-registry/aws/deprovision/route53/aws-deprovision-route53-commands.sh, so shall we explicitly install it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, here it is required to get the hostedzone and change id from the json file.

Copy link
Contributor

@jianlinliu jianlinliu Apr 11, 2022

Choose a reason for hiding this comment

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

I meant jq should be already installed, if not, aws-deprovision-route53 ref would fail. So sounds like we do not need to install jq here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, no need to install jq.

Copy link
Contributor

Choose a reason for hiding this comment

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

sounds like we do not need this env var in this case

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed it from the file.

Copy link
Contributor

@jianlinliu jianlinliu Apr 8, 2022

Choose a reason for hiding this comment

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

  1. Personally I think we do not have to print install-config anywhere.
  2. Even we check the install-config.yaml files, this patch will add proxy and additionalTrustBundle there, especially when install-config.yaml never set these items, this will easily confuse our debugging.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed code to print install-config file

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO, it's better that update the name to reflect the AWS resources we are trying to create, like aws-provision-route53-private-hosted-zone (the private-hosted-zone is a subfolder of route53)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Contributor

Choose a reason for hiding this comment

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

publish will be controlled by system environment in *-provision chain, like https://github.com/openshift/release/pull/24888/files#diff-55d9cca8aaec70f1288e64a0af48754c084edcd57938c5b53ade1701ae6c4974R22-R24, so it should be removed from here.

there are some conflicts with #24888, the subnet and AZ should be set in ipi-conf-aws-custom-vpc, which is newly introduced in #24888, but it has not been merged yet, hope it can be merged within this week.

eventually, this part should be:

cat > "${CONFIG_ROUTE53_HOSTEDZONE}" << EOF
platform:
  aws:
    hostedZone: $(cat "${hostedzoneid}")
EOF

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I will update once this #24888 merged to the master.

Copy link
Contributor

Choose a reason for hiding this comment

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

as comment in https://github.com/openshift/release/pull/27656/files#r846992212, the step ipi-conf-aws-custom-vpc will be required before ipi-conf-aws

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@mhanss mhanss force-pushed the aws-route53 branch 6 times, most recently from 6ca4563 to 073c2a8 Compare April 11, 2022 17:26
@mhanss
Copy link
Contributor Author

mhanss commented Apr 11, 2022

/retest

@mhanss mhanss changed the title WIP: Add support for installing pre create route53 hostedzone cluster on AWS Add support for installing pre create route53 hostedzone cluster on AWS Apr 12, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 2, 2022
@mhanss
Copy link
Contributor Author

mhanss commented May 2, 2022

/retest-required

@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 2, 2022
@openshift-ci openshift-ci bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels May 2, 2022
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 2, 2022
@mhanss mhanss force-pushed the aws-route53 branch 4 times, most recently from 68d6a99 to 991d31d Compare May 2, 2022 08:40
@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 2, 2022
@mhanss mhanss force-pushed the aws-route53 branch 2 times, most recently from de01e57 to 67a0359 Compare May 2, 2022 08:47
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 2, 2022
Copy link
Member

Choose a reason for hiding this comment

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

No need to put this patch file in SHARED_DIR, is there? It's only consumed locally a few lines below. Maybe /tmp/install-config.yaml.patch?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianlinliu, mhanss, wking, yunjiang29

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

@mhanss
Copy link
Contributor Author

mhanss commented May 3, 2022

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 3, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 3, 2022

@mhanss: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 0032770 into openshift:master May 3, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 3, 2022

@mhanss: Updated the following 3 configmaps:

  • ci-operator-master-configs configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-verification-tests-master__installer-rehearse.yaml using file ci-operator/config/openshift/verification-tests/openshift-verification-tests-master__installer-rehearse.yaml
  • job-config-master-periodics configmap in namespace ci at cluster app.ci using the following files:
    • key openshift-verification-tests-master-periodics.yaml using file ci-operator/jobs/openshift/verification-tests/openshift-verification-tests-master-periodics.yaml
  • step-registry configmap in namespace ci at cluster app.ci using the following files:
    • key OWNERS using file ci-operator/step-registry/aws/deprovision/route53/OWNERS
    • key OWNERS using file ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/OWNERS
    • key aws-deprovision-route53-private-hosted-zone-commands.sh using file ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-commands.sh
    • key aws-deprovision-route53-private-hosted-zone-ref.metadata.json using file ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.metadata.json
    • key aws-deprovision-route53-private-hosted-zone-ref.yaml using file ci-operator/step-registry/aws/deprovision/route53/private-hosted-zone/aws-deprovision-route53-private-hosted-zone-ref.yaml
    • key OWNERS using file ci-operator/step-registry/aws/provision/route53/OWNERS
    • key OWNERS using file ci-operator/step-registry/aws/provision/route53/private-hosted-zone/OWNERS
    • key aws-provision-route53-private-hosted-zone-commands.sh using file ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-commands.sh
    • key aws-provision-route53-private-hosted-zone-ref.metadata.json using file ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.metadata.json
    • key aws-provision-route53-private-hosted-zone-ref.yaml using file ci-operator/step-registry/aws/provision/route53/private-hosted-zone/aws-provision-route53-private-hosted-zone-ref.yaml
    • key OWNERS using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/OWNERS
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-workflow.metadata.json using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/cucushift-installer-rehearse-aws-ipi-byo-route53-workflow.metadata.json
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-workflow.yaml using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/cucushift-installer-rehearse-aws-ipi-byo-route53-workflow.yaml
    • key OWNERS using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/deprovision/OWNERS
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-deprovision-chain.metadata.json using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/deprovision/cucushift-installer-rehearse-aws-ipi-byo-route53-deprovision-chain.metadata.json
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-deprovision-chain.yaml using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/deprovision/cucushift-installer-rehearse-aws-ipi-byo-route53-deprovision-chain.yaml
    • key OWNERS using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/provision/OWNERS
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.metadata.json using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/provision/cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.metadata.json
    • key cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.yaml using file ci-operator/step-registry/cucushift/installer/rehearse/aws/ipi/byo-route53/provision/cucushift-installer-rehearse-aws-ipi-byo-route53-provision-chain.yaml
    • key OWNERS using file ci-operator/step-registry/ipi/conf/aws/byo-route53/OWNERS
    • key ipi-conf-aws-byo-route53-commands.sh using file ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-commands.sh
    • key ipi-conf-aws-byo-route53-ref.metadata.json using file ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.metadata.json
    • key ipi-conf-aws-byo-route53-ref.yaml using file ci-operator/step-registry/ipi/conf/aws/byo-route53/ipi-conf-aws-byo-route53-ref.yaml
Details

In response to this:

Add support for installing pre created route53 cluster.

chain:
 as: cucushift-installer-rehearse-aws-ipi-byo-route53-provision
 steps:
   - ref: aws-provision-vpc-shared
   - ref: aws-provision-route53-private-hosted-zone
   - ref: ipi-conf
   - ref: ipi-conf-aws-custom-vpc
   - ref: ipi-conf-aws-byo-route53
   - ref: ipi-conf-aws
   - ref: ipi-install-monitoringpvc
   - chain: ipi-install
 documentation: |-
   Create an IPI cluster on AWS for QE e2e tests.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mhanss mhanss deleted the aws-route53 branch May 3, 2022 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants