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

OCPBUGS-25805: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.26 into release-4.13 #246

Merged

Conversation

shiftstack-merge-bot[bot]
Copy link

No description provided.

…chart (kubernetes#2449)

* Use standard service account name in OCCM helm chart (kubernetes#2332)

This removes the `openstack-` prefix from the service account name
used by the cloud-controller-manager and moves the default values into
the values file.

The change is motivated by the following:

- Create suitable service accounts, cluster roles and cluster role
  bindings for use with `--use-service-accounts-credentials=true`
- Normalise service account names in the helm chart and plain
  manifests
- Adhere to naming conventions across external cloud controller
  managers for different clouds (e.g. AWS, GCP, ...)

Specifically the first point deserves further details. Prior to this
change, users who install the cloud controller manager with helm,
would run into the following error when creating load balancers:

```
E0818 08:27:33.802407      11 controller.go:291] error processing service default/hello-bug (will retry): failed to ensure load balancer: failed to patch service object default/hello-bug: services "hello-bug" is forbidden: User "system:serviceaccount:kube-system:cloud-controller-manager" cannot patch resource "services" in API group "" in the namespace "default"
```

Which is due to the fact that the controller is running with the
`cloud-controller-manager` service account because
`--use-service-account-credentials` is set to `true` by default and
the client is initialised with:

```
clientset := clientBuilder.ClientOrDie("cloud-controller-manager")
```

Whilst users can work around this by passing
`--use-service-account-credentials=false`, the desired behaviour would
be to install suitable RBAC in the first place.

See:

- https://kubernetes.io/docs/concepts/architecture/cloud-controller/
- https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
- kubernetes#2049
- kubernetes#1722
- kubernetes#1755

Signed-off-by: Wolodja Wentland <wwentland@wavecon.de>

* Remove spurious whitespace in OCCM values file (kubernetes#2347)

The space character was sadly introduced in an earlier PR and had not
been picked up by the helm linter, presumably because the GHA did
not run.

Signed-off-by: Wolodja Wentland <w@wentland.dev>

---------

Signed-off-by: Wolodja Wentland <wwentland@wavecon.de>
Signed-off-by: Wolodja Wentland <w@wentland.dev>
@openshift-ci openshift-ci bot requested review from gryf and mandre November 9, 2023 12:11
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 9, 2023
Copy link

openshift-ci bot commented Nov 9, 2023

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed 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.

@dulek
Copy link

dulek commented Nov 9, 2023

This doesn't affect us, no need to merge it.

/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 Nov 9, 2023
@dulek
Copy link

dulek commented Nov 16, 2023

/hold cancel
/ok-to-test

Okay, this is a nice one.

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 16, 2023
Copy link
Member

@gryf gryf 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 lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 16, 2023
@dulek
Copy link

dulek commented Nov 30, 2023

/label backport-risk-assessed

Copy link

openshift-ci bot commented Nov 30, 2023

@dulek: Can not set label backport-risk-assessed: Must be member in one of these teams: [openshift-patch-managers]

In response to this:

/label backport-risk-assessed

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.

…etes#2498)

* [occm] update k8s.io/kubernetes to v1.26.11 in go.mod

* Fix "go list -m all" execution

* remove rand seed

---------

Co-authored-by: Jesse Haka <haka.jesse@gmail.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2023
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

Same as the 4.14 sync, we're interested in the barbican secret validation fix and the library bump.

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 21, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2023
Copy link

openshift-ci bot commented Dec 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gryf, mandre, shiftstack-merge-bot[bot]

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

@pierreprinetti
Copy link
Member

/jira cherrypick OCPBUGS-25804

@openshift-ci-robot
Copy link

@pierreprinetti: Jira Issue OCPBUGS-25804 has been cloned as Jira Issue OCPBUGS-25805. Will retitle bug to link to clone.
/retitle OCPBUGS-25805: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.26 into release-4.13

In response to this:

/jira cherrypick OCPBUGS-25804

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 changed the title Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.26 into release-4.13 OCPBUGS-25805: Merge https://github.com/kubernetes/cloud-provider-openstack:release-1.26 into release-4.13 Dec 21, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Dec 21, 2023
@openshift-ci-robot
Copy link

@shiftstack-merge-bot[bot]: This pull request references Jira Issue OCPBUGS-25805, which is invalid:

  • expected dependent Jira Issue OCPBUGS-25804 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 21, 2023
@pierreprinetti
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@pierreprinetti: This pull request references Jira Issue OCPBUGS-25805, which is invalid:

  • expected dependent Jira Issue OCPBUGS-25804 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@eurijon
Copy link

eurijon commented Dec 22, 2023

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 22, 2023
@pierreprinetti
Copy link
Member

/jira refresh

@openshift-ci-robot
Copy link

@pierreprinetti: This pull request references Jira Issue OCPBUGS-25805, which is invalid:

  • expected dependent Jira Issue OCPBUGS-25804 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@pierreprinetti
Copy link
Member

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 25, 2024
@openshift-ci-robot
Copy link

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.z) matches configured target version for branch (4.13.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-25804 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-25804 targets the "4.14.z" version, which is one of the valid target versions: 4.14.0, 4.14.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

In response to this:

/jira refresh

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-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 6c8236f and 2 for PR HEAD 12a5ea4 in total

@pierreprinetti
Copy link
Member

/retest-required

@mandre
Copy link
Member

mandre commented Feb 6, 2024

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit dd43577 into openshift:release-4.13 Feb 6, 2024
4 of 5 checks passed
@openshift-ci-robot
Copy link

@shiftstack-merge-bot[bot]: Jira Issue OCPBUGS-25805: All pull requests linked via external trackers have merged:

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

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

@mandre mandre deleted the merge-bot-release-4.13 branch February 6, 2024 10:47
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build csi-driver-manila-container-v4.13.0-202402061238.p0.gdd43577.assembly.stream.el8 for distgit csi-driver-manila.
All builds following this will include this PR.

@openshift-merge-robot
Copy link

Fix included in accepted release 4.13.0-0.nightly-2024-02-06-230816

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet