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-2257: Use manifests generation tool from provider repo #471

Merged
merged 2 commits into from Nov 27, 2023

Conversation

damdo
Copy link
Member

@damdo damdo commented Jul 4, 2023

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-gen tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

Note:

Manual testing for this combination of PRs ✅ PASSED: see here:

@damdo damdo marked this pull request as draft July 4, 2023 14:59
@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 Jul 4, 2023
@damdo damdo force-pushed the manifests-generation branch 3 times, most recently from 4ed79e4 to 72f48a7 Compare July 5, 2023 10:56
@damdo damdo changed the title [DNM][WIP] Manifests generation from provider OCPCLOUD-2257: Use manifests generation tool from provider repo Nov 22, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 22, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to 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 kubernetes/test-infra repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to this:

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-generation tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

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.

@damdo damdo marked this pull request as ready for review November 22, 2023 12:50
@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 Nov 22, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to this:

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-generation tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

Note:

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.

@damdo
Copy link
Member Author

damdo commented Nov 22, 2023

/hold
until happy with manual testing

@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 Nov 22, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to this:

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-gen tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

Note:

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.

@damdo
Copy link
Member Author

damdo commented Nov 22, 2023

/retest

@damdo
Copy link
Member Author

damdo commented Nov 22, 2023

Manual e2e testing with a ClusterBot cluster:
launch openshift/cluster-capi-operator#121,openshift/cluster-api-provider-aws#471,openshift/cluster-api#179 aws,techpreview

[~/src/cluster-capi-operator git:(refactor)] $ oc -n openshift-cluster-api get pods
NAME                                       READY   STATUS    RESTARTS      AGE
capa-controller-manager-59fd59867b-g6twb   1/1     Running   1 (16m ago)   22m
capi-controller-manager-5bbf765989-t27xv   1/1     Running   1 (16m ago)   22m
cluster-capi-operator-b66cc849b-rrq6x      1/1     Running   0             26m

[~/src/cluster-capi-operator git:(refactor)] $ make e2e
./hack/test.sh "./e2e/..." 30m
go run ./hack/../vendor/github.com/onsi/ginkgo/v2/ginkgo -r -v --randomize-all --randomize-suites --keep-going --race --trace --timeout=30m ./e2e/...
Running Suite: Cluster API Suite - /Users/ddonati/src/cluster-capi-operator/e2e
===============================================================================
Random Seed: 1700664807 - will randomize all specs

Will run 3 of 3 specs
------------------------------
[BeforeSuite]
/Users/ddonati/src/cluster-capi-operator/e2e/e2e_test.go:49
[BeforeSuite] PASSED [0.826 seconds]
------------------------------
Cluster API AWS MachineSet should be able to run a machine with a default provider spec
/Users/ddonati/src/cluster-capi-operator/e2e/aws_test.go:62
  STEP: Creating core cluster @ 11/22/23 15:53:39.77
  STEP: Creating AWS cluster @ 11/22/23 15:53:40.366
  STEP: Creating AWS machine template @ 11/22/23 15:53:40.957
  STEP: Creating MachineSet "aws-machineset" @ 11/22/23 15:53:41.162
  STEP: Waiting for MachineSet machines "aws-machineset" to enter Running phase @ 11/22/23 15:53:41.372
  STEP: Comparing instances created by MAPI and CAPI @ 11/22/23 15:58:04.622
  STEP: Deleting MachineSet "aws-machineset" @ 11/22/23 15:58:06.264
  STEP: Waiting for MachineSet "aws-machineset" to be deleted @ 11/22/23 15:58:06.461
  STEP: Deleting /aws-machine-template @ 11/22/23 15:59:09.206
• [330.502 seconds]
------------------------------

Ran 1 of 3 Specs in 331.336 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 2 Skipped
PASS

Ginkgo ran 1 suite in 5m41.98215617s
Test Suite Passed

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to this:

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-gen tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

Note:

Manual testing for this combination ✅ PASSED: see here:

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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 22, 2023

@damdo: This pull request references OCPCLOUD-2257 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.15.0" version, but no target version was set.

In response to this:

This PR implements the provider part of the work defined in the Installing Cluster API components in OpenShift enhancement.

Notably it:

  • adds (vendors in) a manifests-gen tool hosted as a separate module under the cluster-capi-operator repo
  • extends a Make target to invoke the tool
  • creates an openshift/manifests dir where the generated manifests will be dumped and extends the Dockerfile to load the content of this directory in the payload image accordingly (these manifests will then be deployed by the CVO).

Note:

Manual testing for this combination of PRs ✅ PASSED: see here:

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.

@JoelSpeed
Copy link

/lgtm
/approve

Copy link

openshift-ci bot commented Nov 24, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2023
Copy link

openshift-ci bot commented Nov 24, 2023

@damdo: all tests passed!

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.

@damdo
Copy link
Member Author

damdo commented Nov 27, 2023

/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 Nov 27, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit 98d1fe2 into openshift:master Nov 27, 2023
9 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-aws-cluster-api-controllers-container-v4.15.0-202311271455.p0.g98d1fe2.assembly.stream for distgit ose-aws-cluster-api-controllers.
All builds following this will include this PR.

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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants