Skip to content
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.

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

Azure Stack: add CA support in bootstrap ign stub #5430

Merged

Conversation

patrickdillon
Copy link
Contributor

On Azure Stack, this adds CAs from the additionalTrustBundle to the ignition stub. Azure Stack uses shared-access signatures (SAS) to manage access to the ignition storage account. Creating a SAS requires an existing storage account, so we cannot use a similar approach to AWS, which creates a pre-signed URL and passes it through the tfvars.

Instead, this approach manipulates the ignition stub in the Terraform config to append the SAS to the storage account URL.


custom_data = base64encode(replace(var.azure_bootstrap_ignition_stub,
azurestack_storage_blob.ignition.url,
"${azurestack_storage_blob.ignition.url}${data.azurestack_storage_account_sas.ignition.sas}"))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a complicated line so I tried to make it more readable with formatting. I also considered handling this in a local. Not sure if there is any way to make this easier to read.

@patrickdillon
Copy link
Contributor Author

/cc @staebler

@openshift-ci openshift-ci bot requested a review from staebler November 30, 2021 03:44
Copy link
Contributor

@staebler staebler left a comment

Choose a reason for hiding this comment

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

Just a nit. Otherwise, it looks good.
/approve

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2021
On Azure Stack, this adds CAs from the additionalTrustBundle to the
ignition stub.

Azure Stack uses shared-access signatures (SAS) to
manage access to the ignition storage account. Creating a SAS
requires an existing storage account, so we cannot use a similar
approach to AWS, which creates a pre-signed URL and passes it
through the tfvars.

Instead, this approach manipulates the ignition stub in the Terraform
config to append the SAS to the storage account URL.
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2021
@patrickdillon
Copy link
Contributor Author

/test e2e-azure

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2021
Fixing tf-fmt issues in azure variables.
@patrickdillon
Copy link
Contributor Author

Ok tf-fmt is now passing and I have rebased and removed optional tf vars. I think this is ready for review

/test e2e-azure

Copy link
Contributor

@staebler staebler 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 Dec 15, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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

The pull request process is described here

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-bot
Copy link
Contributor

/retest-required

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-merge-robot openshift-merge-robot merged commit f957dbe into openshift:master Dec 15, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2021

@patrickdillon: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure 247d2b2 link false /test e2e-azure
ci/prow/e2e-metal-ipi-ovn-ipv6 247d2b2 link false /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws-workers-rhel7 247d2b2 link false /test e2e-aws-workers-rhel7
ci/prow/e2e-openstack 247d2b2 link false /test e2e-openstack
ci/prow/e2e-aws-workers-rhel8 247d2b2 link false /test e2e-aws-workers-rhel8
ci/prow/e2e-crc 247d2b2 link false /test e2e-crc
ci/prow/e2e-ibmcloud 247d2b2 link false /test e2e-ibmcloud
ci/prow/e2e-metal-single-node-live-iso 247d2b2 link false /test e2e-metal-single-node-live-iso
ci/prow/e2e-aws-fips 247d2b2 link false /test e2e-aws-fips
ci/prow/e2e-libvirt 247d2b2 link false /test e2e-libvirt
ci/prow/e2e-aws-single-node 247d2b2 link false /test e2e-aws-single-node
ci/prow/e2e-openstack-kuryr 247d2b2 link false /test e2e-openstack-kuryr
ci/prow/e2e-ovirt 247d2b2 link false /test e2e-ovirt

Full PR test history. Your PR dashboard.

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.

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.

4 participants