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

MCO-643: MCO-645: Reintroduce MCS CA rotation #4735

Merged
merged 2 commits into from
Jan 24, 2025

Conversation

djoshy
Copy link
Contributor

@djoshy djoshy commented Dec 5, 2024

This PR re-applies the work done in #4669, which was reverted in #4713. We should only land this after openshift/installer#9309

How to verify:
In addition to passing existing e2es and verification done in #4669 , agent installations should succeed. The recently added test in the MCO repo which tests agent workflows(ci/prow/e2e-agent-compact-ipv4) should give us a good signal on this.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 5, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 5, 2024

@djoshy: This pull request references MCO-1457 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This PR does the following:

How to verify:
In addition to passing existing e2es and verification done in #4669 , agent installations should succeed. The recently added test in the MCO repo which tests agent workflows(ci/prow/e2e-agent-compact-ipv4) should give us a good signal on this.

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 openshift-eng/jira-lifecycle-plugin repository.

@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 Dec 5, 2024
Copy link
Contributor

openshift-ci bot commented Dec 5, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@djoshy djoshy force-pushed the reintroduce-mcs-ca-sync branch from 2b5c52e to 8c3e3a6 Compare December 5, 2024 15:05
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 11, 2024

@djoshy: This pull request references MCO-1457 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This PR re-applies the work done in #4669, which was reverted in #4713. We should only land this after openshift/installer#9309

How to verify:
In addition to passing existing e2es and verification done in #4669 , agent installations should succeed. The recently added test in the MCO repo which tests agent workflows(ci/prow/e2e-agent-compact-ipv4) should give us a good signal on this.

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 openshift-eng/jira-lifecycle-plugin repository.

@djoshy
Copy link
Contributor Author

djoshy commented Dec 11, 2024

/testwith openshift/machine-config-operator/master/e2e-agent-compact-ipv4 #4735 openshift/installer#9309

@djoshy djoshy changed the title [WIP] MCO-1457: Reintroduce MCS CA rotation with bootstrap support [WIP] MCO-1457: Reintroduce MCS CA rotation Dec 11, 2024
@djoshy djoshy changed the title [WIP] MCO-1457: Reintroduce MCS CA rotation MCO-643: MCO-645: Reintroduce MCS CA rotation Jan 8, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 8, 2025

@djoshy: This pull request references MCO-643 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This PR re-applies the work done in #4669, which was reverted in #4713. We should only land this after openshift/installer#9309

How to verify:
In addition to passing existing e2es and verification done in #4669 , agent installations should succeed. The recently added test in the MCO repo which tests agent workflows(ci/prow/e2e-agent-compact-ipv4) should give us a good signal on this.

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 openshift-eng/jira-lifecycle-plugin repository.

@djoshy djoshy marked this pull request as ready for review January 8, 2025 15:24
@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 Jan 8, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 8, 2025

openshift/installer#9309 has landed, so we should be good to go ahead with this.

@djoshy djoshy force-pushed the reintroduce-mcs-ca-sync branch from 8c3e3a6 to 6d9caed Compare January 8, 2025 15:38
@djoshy
Copy link
Contributor Author

djoshy commented Jan 8, 2025

/test unit

@djoshy
Copy link
Contributor Author

djoshy commented Jan 8, 2025

/retest-required

@djoshy djoshy force-pushed the reintroduce-mcs-ca-sync branch from 6d9caed to 5316a76 Compare January 8, 2025 17:13
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold

This should be good to go, the unrevert looks clean. Holding for a quick QE review just in case as we discussed, but only for the new behaviour now that the installer PR has merged so we aren't doing unnecessary rotations on installs.

@@ -29,7 +29,7 @@ require (
github.com/imdario/mergo v0.3.16
github.com/opencontainers/go-digest v1.0.0
github.com/openshift/api v0.0.0-20250102185430-d6d8306a24ec
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071
Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious, was the client-go bump needed for a test or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it's needed for a fake machine client for one of the units. I'm not sure when/how, but our current client-go vendor was missing them. I only semi-bumped it to 20241203091221 instead of the latest because it would bring in the OCL changes and that breaks a few devex units.

@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 Jan 8, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
@djoshy djoshy force-pushed the reintroduce-mcs-ca-sync branch from 5316a76 to 9117787 Compare January 9, 2025 15:05
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2025
Copy link
Contributor

openshift-ci bot commented Jan 18, 2025

@djoshy: 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-gcp-op-ocl 9117787 link false /test e2e-gcp-op-ocl
ci/prow/e2e-vsphere-ovn-upi 9117787 link false /test e2e-vsphere-ovn-upi

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-sigs/prow repository. I understand the commands that are listed here.

@ptalgulk01
Copy link

Pre-merge verification:
Steps To verify: https://polarion.engineering.redhat.com/polarion/#/project/OSE/workitem?id=OCP-77784

  • Verified using IPI based AWS, Baremetal cluster
  • For verifying on agent based Baremetal cluster using Cluster-Bot cmd
workflow-launch baremetal-lab-agent-install-pxe [registry.build05.ci.openshift.org/ci-ln-63i7b1b/release:latest](http://registry.build05.ci.openshift.org/ci-ln-63i7b1b/release:latest) "AUX_HOST=[openshift-qe-metal-ci.arm.eng.rdu2.redhat.com](http://openshift-qe-metal-ci.arm.eng.rdu2.redhat.com/)","architecture=amd64","DISCONNECTED=false","RESERVE_BOOTSTRAP=false","AGENT_PLATFORM_TYPE=none","ipv4_enabled=true","ipv6_enabled=false"
  • For non-machinesets based cluster certificate are not rotated
oc logs machine-config-controller-5c45b49479-5xw2d | grep -i cert
Defaulted container "machine-config-controller" out of: machine-config-controller, kube-rbac-proxy
I0116 05:48:05.614698       1 certrotation_controller.go:169] MCS CA/TLS cert rotator not added
....
I0116 05:48:05.621896       1 certrotation_controller.go:188] Starting machineconfigcontroller-certrotationcontroller
I0116 05:48:05.621907       1 certrotation_controller.go:176] Waiting for machineconfigcontroller-certrotationcontroller
I0116 05:48:05.722068       1 certrotation_controller.go:184] Finished waiting for machineconfigcontroller-certrotationcontroller
I0116 05:48:05.722073       1 certrotation_controller.go:194] No cert rotators needed, shutting down
I0116 05:48:05.722076       1 certrotation_controller.go:195] Shutting down machineconfigcontroller-certrotationcontroller

For agent based with machinesets cluster will verify after PR is merged.

Adding qe-approved label

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 22, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 22, 2025

@djoshy: This pull request references MCO-643 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

This PR re-applies the work done in #4669, which was reverted in #4713. We should only land this after openshift/installer#9309

How to verify:
In addition to passing existing e2es and verification done in #4669 , agent installations should succeed. The recently added test in the MCO repo which tests agent workflows(ci/prow/e2e-agent-compact-ipv4) should give us a good signal on this.

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 openshift-eng/jira-lifecycle-plugin repository.

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/payload-job
periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-compact-fips

/payload-job periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-ha-dualstack-conformance

/payload-job
periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-single-node-ipv6

Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@djoshy: trigger 3 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-compact-fips
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-ha-dualstack-conformance
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-agent-single-node-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/18bc7240-d8b8-11ef-8f3c-f26c3537d1f7-0

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/payload 4.19 nightly blocking

Copy link
Contributor

openshift-ci bot commented Jan 22, 2025

@djoshy: trigger 14 job(s) of type blocking for the nightly release of OCP 4.19

  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-upgrade-ovn-single-node
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.19-e2e-azure-ovn-upgrade
  • periodic-ci-openshift-release-master-ci-4.19-upgrade-from-stable-4.18-e2e-gcp-ovn-rt-upgrade
  • periodic-ci-openshift-hypershift-release-4.19-periodics-e2e-aws-ovn-conformance
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-aws-ovn-serial
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-release-master-ci-4.19-e2e-aws-ovn-techpreview-serial
  • periodic-ci-openshift-release-master-nightly-4.19-fips-payload-scan
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-bm
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-metal-ipi-ovn-ipv6
  • periodic-ci-openshift-microshift-release-4.19-periodics-e2e-aws-ovn-ocp-conformance
  • periodic-ci-openshift-microshift-release-4.19-periodics-e2e-aws-ovn-ocp-conformance-serial
  • periodic-ci-openshift-release-master-nightly-4.19-e2e-rosa-sts-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0bcee5c0-d8ba-11ef-8aae-230e8c73c24b-0

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/retest-required

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/label acknowledge-critical-fixes-only

/unhold

@openshift-ci openshift-ci bot added acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Jan 22, 2025
@yuqi-zhang
Copy link
Contributor

/lgtm

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

openshift-ci bot commented Jan 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, yuqi-zhang

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

@djoshy
Copy link
Contributor Author

djoshy commented Jan 22, 2025

/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 Jan 22, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 23, 2025

/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 Jan 23, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 23, 2025

/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 Jan 23, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 24, 2025

/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 Jan 24, 2025
@djoshy
Copy link
Contributor Author

djoshy commented Jan 24, 2025

/test e2e-agent-compact-ipv4

@djoshy
Copy link
Contributor Author

djoshy commented Jan 24, 2025

/test unit

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 9871a24 and 2 for PR HEAD 9117787 in total

@openshift-merge-bot openshift-merge-bot bot merged commit 38fb1b8 into openshift:master Jan 24, 2025
19 of 21 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.19.0-202501242239.p0.g38fb1b8.assembly.stream.el9.
All builds following this will include this PR.

@djoshy djoshy deleted the reintroduce-mcs-ca-sync branch January 28, 2025 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants