Skip to content

OCPCLOUD-2215,OCPBUGS-17289,OCPBUGS-21650: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main#25

Merged
JoelSpeed merged 149 commits into
openshift:mainfrom
damdo:rebase-atop-v0.6.0
Oct 18, 2023
Merged

OCPCLOUD-2215,OCPBUGS-17289,OCPBUGS-21650: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main#25
JoelSpeed merged 149 commits into
openshift:mainfrom
damdo:rebase-atop-v0.6.0

Conversation

@damdo

@damdo damdo commented Oct 2, 2023

Copy link
Copy Markdown
Member

Warning

This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

Fedosin and others added 30 commits June 28, 2023 17:32
🌱 Update helm chart index.yaml
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.50.1 to 1.53.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.50.1...v1.53.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/go_modules/hack/chart-update/google.golang.org/grpc-1.53.0

🌱 build(deps): bump google.golang.org/grpc from 1.50.1 to 1.53.0 in /hack/chart-update
✨Fetch latest provider version if it's not set in the spec
To work properly CAPI Operator needs cert-manager. To ensure it is
installed, we add a cert-manager dependency to the helm chart.
Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.9.0 to 0.10.0.
- [Commits](golang/oauth2@v0.9.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/go_modules/golang.org/x/oauth2-0.10.0

🌱 bump golang.org/x/oauth2 from 0.9.0 to 0.10.0
✨ Add cert-manager as a dependency to helm-chart
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
Now we compile it twice, which seems unnecessary.
🌱 compile capi operator binary only once in the Dockerfile
🌱 Bump Cluster API to v1.5.0-rc.0
✨ Create operator CRs based on helm values
@damdo damdo force-pushed the rebase-atop-v0.6.0 branch from d3a6506 to b4d1583 Compare October 11, 2023 12:25
@JoelSpeed JoelSpeed changed the title OCPCLOUD-2215: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main OCPCLOUD-2215,OCPBUGS-17286: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main Oct 12, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Oct 12, 2023
@openshift-ci-robot

openshift-ci-robot commented Oct 12, 2023

Copy link
Copy Markdown

@damdo: This pull request references OCPCLOUD-2215 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 task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17286, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

[!WARNING]
This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

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 openshift-ci Bot requested a review from sunzhaohua2 October 12, 2023 13:51
@JoelSpeed JoelSpeed changed the title OCPCLOUD-2215,OCPBUGS-17286: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main OCPCLOUD-2215: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main Oct 12, 2023
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Oct 12, 2023
@openshift-ci-robot

openshift-ci-robot commented Oct 12, 2023

Copy link
Copy Markdown

@damdo: This pull request references OCPCLOUD-2215 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 task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

[!WARNING]
This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

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 JoelSpeed changed the title OCPCLOUD-2215: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main OCPCLOUD-2215,OCPBUGS-17289: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main Oct 12, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Oct 12, 2023
@openshift-ci-robot

openshift-ci-robot commented Oct 12, 2023

Copy link
Copy Markdown

@damdo: This pull request references OCPCLOUD-2215 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 task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17289, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

[!WARNING]
This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

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 changed the title OCPCLOUD-2215,OCPBUGS-17289: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main OCPCLOUD-2215,OCPBUGS-17289,OCPBUGS-21650: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main Oct 16, 2023
@openshift-ci-robot

openshift-ci-robot commented Oct 16, 2023

Copy link
Copy Markdown

@damdo: This pull request references OCPCLOUD-2215 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 task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17289, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

This pull request references Jira Issue OCPBUGS-21650, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

[!WARNING]
This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

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

openshift-ci Bot commented Oct 16, 2023

Copy link
Copy Markdown

@damdo: 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-ovn-techpreview eba651b link true /test e2e-azure-ovn-techpreview
ci/prow/e2e-gcp-ovn-techpreview eba651b link true /test e2e-gcp-ovn-techpreview
ci/prow/e2e-aws-ovn-techpreview eba651b link true /test e2e-aws-ovn-techpreview

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.

@JoelSpeed

Copy link
Copy Markdown

/lgtm
/approve

/hold I would like to see a cluster-bot test to verify that this does indeed work with the paired PR as expected. If we can get green results from cluster bot then I think a green button merge to merge them simultaneously should be safe

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2023
@openshift-ci

openshift-ci Bot commented Oct 18, 2023

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, JoelSpeed

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

@JoelSpeed

Copy link
Copy Markdown

/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 Oct 18, 2023
@JoelSpeed JoelSpeed added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 18, 2023
@JoelSpeed JoelSpeed merged commit 88edc51 into openshift:main Oct 18, 2023
@JoelSpeed JoelSpeed removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 18, 2023
@openshift-ci-robot

Copy link
Copy Markdown

@damdo: Jira Issue OCPBUGS-17289: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-17289 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-21650: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-21650 has been moved to the MODIFIED state.

Details

In response to this:

[!WARNING]
This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-capi-operator [PR](https://github.com/openshift/cluster-api-operator/pull/25), as the new code of this operator references a new CRD (deployed by the other repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

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-merge-robot

Copy link
Copy Markdown

Fix included in accepted release 4.15.0-0.nightly-2023-10-24-230302

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.

10 participants