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

OCPCLOUD-1194: Implement cloud-config-file flag in CCCMO render #55

Merged

Conversation

Danil-Grigorev
Copy link
Contributor

@Danil-Grigorev Danil-Grigorev commented Jun 7, 2021

Based on #56 and #48, both are required to merge before that.

Introduces a new flag:

Flags:
      --cloud-config-file string             Input path for the cloud config config map file generated by cluster-config-operator.

This implementation will unconditionally create a {destination_dir}/config directory which would be used as a source of files to copy into /etc/kubernetes/bootstrap-configs directory on bootstrap VM.

Based on the information from the Infrastructure resource provided from --cluster-infrastructure-file the --cloud-config-file configMap would be read, unpacked and stored into {destination_dir}/config/cloud.config. Each provider explicitly requiring this, would be able to mount /etc/kubernetes/bootstrap-configs directory, and read the content from cloud.conf. example is Azure CCM.

Implementation is copied from MCO which served as a mean to pass cloud config to master ignition file.

To test this PR on Azure, check out installer PR, and do:

cd <your-installer-dir>
./hack/build.sh
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=quay.io/dgrigore/release:azure-bootstrap ./bin/openshift-install create cluster

@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 Jun 7, 2021
@openshift-ci openshift-ci bot requested review from JoelSpeed and mdbooth June 7, 2021 13:39
@Danil-Grigorev Danil-Grigorev changed the title [WIP] Render cloud config Render cloud config Jun 8, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 8, 2021
@Danil-Grigorev Danil-Grigorev changed the title Render cloud config OCPCLOUD-1194: Implement cloud-config-file flag in CCCMO render Jun 9, 2021
@lobziik
Copy link
Contributor

lobziik commented Jun 11, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2021
Copy link
Contributor

@Fedosin Fedosin left a comment

Choose a reason for hiding this comment

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

/approve
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 11, 2021
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2021
Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

mostly looks good, i just have a minor suggestion for the help text.

cmd/render/main.go Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2021
@Danil-Grigorev
Copy link
Contributor Author

@elmiko Added your suggestion. PTAL
/hold cancel

@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 Jun 11, 2021
Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

thanks @Danil-Grigorev !
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko, Fedosin

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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 11, 2021
@openshift-bot
Copy link

/retest

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 11, 2021

@Danil-Grigorev: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-ccm 8ad771f link /test e2e-aws-ccm

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.

@openshift-bot
Copy link

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 8d1e009 into openshift:master Jun 12, 2021
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.

None yet

6 participants