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-34137, OCPBUGS-34460, OCPBUGS-34113, OCPBUGS-35462: sync upstream on release-1.30/go1.22 #287

Merged
merged 34 commits into from
Jun 18, 2024

Conversation

EmilienM
Copy link
Member

Commands used:

git clone https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                               
cd cloud-provider-openstack                                                                                                                                                                                                                                                       
git remote add openshift https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                
git remote add kubernetes https://github.com/kubernetes/cloud-provider-openstack.git                                                                                                                                                                                              
git fetch kubernetes release-1.30                                                                                                                                                                                                                                                 
git fetch openshift master                                                                                                                                                                                                                                                        
git checkout -b sync-master openshift/master                                                                                                                                                                                                                                      
git rebase -i kubernetes/release-1.30                                                                                                                                                                                                                                             
# Drop any CARRY: Vendoring commit                                                                                                                                                                                                                                                
# Drop any conflicting CARRY commit related to upstream CI not required downstream

Then apply patches from:

dulek and others added 27 commits January 29, 2024 17:54
Seems like in 1.29 there are issues with cri-dockerd. There's no reason
to use Docker anymore and this commit makes sure k3s uses containerd.
This commit makes sure we're fetching and putting the logs of the
DevStack services as well as k3s into the artifacts for every CI job.
PR kubernetes#2468 used an incorrect condition when updating the listener timeout
values and only updates them when listener's allowedCIDRs are updated.
This commit fixes this by making sure timeout values are checked too.
* Add support to only run selected CSI services of the cinder CSI driver

* Add support to only run selected CSI services of the manila CSI driver

* Clean up source files to successfully complete linting

* Update description of the `nodeid` command line parameter

* Update documentation for the CSI service parameters

This commit updates the documentation for the CSI controller and node service providing parameters.
The test image was recently changed and now ships with go1.22rc2. We
need to use a version of golangci-lint that is compatible with it.
…rnetes#2480)

Signed-off-by: Sebastian-RG <fullmetalliferous@gmail.com>
* fix: add missing labels to resources
otherwise upgrades fail with `resource already exists, add missing labels`

* chore: bump version
…or specify an existing floating IP (kubernetes#2166)

* Add annotation to keep floationIP

* Add annotation to specify floating ip to use on LB when creating ingress

* Add doc for octavia.ingress.kubernetes.io/keep-floatingip & octavia.ingress.kubernetes.io/floatingip annotations

* Remove debug logs

* Change annotation syntax, don't create a new FIP, if user requested a particular one, add additional check if FIP already binded to correct port, add ability to update FIP of an existing ingress by updating annotation

* Add missing else

* Log format

* Create fonctions to attach/detach fips to port

* Fix bug when no fip provided in annotation the lb was created in private mode and improve openstack neutron fip logic
`subnet-id` is cumbersome to use in dual-stack environments, this commit
documents that.
KMS v1 API is deprecated and in v1.29 core K8s won't allow it with
default feature gates set. This commit makes sure we're proposing
configuration of v2 API in example EncryptionConfigs.
In OpenStack IPv6 that uses GUAs don't require NAT
to access the outside world, so IPv6 can be
rechable without Floating IPs, which makes the
enforcement of IPv6 LB as internal in CPO not necessary.
This commit removes this enforcement, which results in
IPv6 load-balancers being allowed to be shared between
Services. Also, now it's possible to make the load-balancer
use the IPv6 stateful address defined in the loadBalancerIP
of the Service.
* magnum-auto-healer: Stop registering klog options

Per [1], this is no longer desirable. We are already registering the
minimal options that the KEP suggests so we can simply stop registering
the others.

[1] https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/2845-deprecate-klog-specific-flags-in-k8s-components

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* client-keystone-auth: Stop registering klog options

As with magnum-auto-healer, we don't need/want to do this anymore.
Don't.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* cinder-csi-plugin: Use binary name in help page

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* client-keystone-auth: Migrate to cobra

This one is relatively trivial since the 'Run' function in
'k8s.io/component-base/cli' does most of the heavy lifting for us now,
including registering logging arguments.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* k8s-keystone-auth: Migrate to cobra

This one is slightly trickier due to how we're doing configuration but
there's still nothing crazy confusing here.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* occm: Remove unnecessary flag handling code

k8s.io/cloud-provider switched to cobra some time back [1] and cobra
uses 'pflag' rather than 'flag' under the hood. As such, there's no
reason to keep the handling code for 'flag' options around. Remove it.

[1] https://github.com/kubernetes/cloud-provider/blob/v0.28.0/app/controllermanager.go#L87-L124

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* occm: Register additional options correctly

The 'NewCloudControllerManagerCommand' function, which generates the cobra
Command that forms the basis of a cloud provider binary, accepts an
'additionalFlags' argument that allows us to (surprise) pass in
additional provider-specific arguments. We were not making use of this,
which means our options were not showing in the usage string shown on
e.g. '--help'. Correct this on our end, while we wait for the fix in
k8s.io/cloud-provider [1] to close the loop fully.

In additional, move our 'InitLogs' call higher up the function to before
our first logging call so that everything is initialised correctly.

[1] kubernetes/kubernetes#120522

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* magnum-auto-healer: Remove use of 'init' methods

Instead, register the health checks and cloud provider plugins on
controller start up. This avoids side-effects from merely importing the
modules - which are polluting the output of '--help' - and is generally
"less weird".

To do this, we must make the registration methods part of the public API
and remove the 'pkg/autohealing/cloudprovider/register' package in
favour of a public registration method in the
'pkg/autohealing/cloudprovider/openstack' package.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

---------

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Seems like the point explaining how to promote images from staging is
gone, this commit adds it back, fixes formatting and moves the file into
the `docs` directory.
It's a common issue that clusters are deployed with the default
`--cluster-name=kubernetes` and later on it's discovered that next
deployments on the same cloud will have conflicts when trying to manage
LBs of the same namespace and name.

This commit aims at allowing to change the cluster-name on a running
environment and handling all the renames of the LB resources and their
tags.
…ernetes#2569)

* define availability zone for snapshot backup

* fix to volume backup & restore creation

* add doc
The above option seems to be causing CCM to create clients using
ServiceAccount from the `kube-system` namespace, so requires users to
either run in `kube-system` namespace, or manage 2 ServiceAccounts, one
in `kube-system` and other in regular CCM namespace. See [1].

This commit changes this setting.

[1] https://github.com/kubernetes/cloud-provider/blob/c3862938334ba18226098015193374fda40ab7a9/options/options.go#L230-L237
The GitHub account brtknr does not exist anymore and our chart linter
complains about this. This commit adds Matt and Michał as the maintainers.

Co-authored-by: Michał Dulko <mdulko@redhat.com>
I also needed to flip order of mocks in Cinder CSI nodeserver tests and
honestly I'm not exactly sure why.
* KEP-1860: Add support for LoadBalancer ipMode

* cleaner: use assertEqual for test
* Bump versions for 1.30

* use rc2 for k3s

---------

Co-authored-by: Michał Dulko <mdulko@redhat.com>
…rvices (kubernetes#2603)

* POC of TargetNodeLabels selector on OpenStack LB

* Fix type errors

* Update implementation of getKeyValuePropertiesFromServiceAnnotation

* gofmt -w -s ./pkg

* Polish the code and add documentation

---------

Co-authored-by: Ririko Nakamura <ririko.nakamura@outlook.com>
Co-authored-by: kayrus <kay.diam@gmail.com>
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 14, 2024
@openshift-ci-robot
Copy link

@EmilienM: This pull request references Jira Issue OCPBUGS-34137, which is valid.

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

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

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

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

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

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

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

This pull request references Jira Issue OCPBUGS-34113, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified 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.

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

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

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

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

In response to this:

Commands used:

git clone https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                               
cd cloud-provider-openstack                                                                                                                                                                                                                                                       
git remote add openshift https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                
git remote add kubernetes https://github.com/kubernetes/cloud-provider-openstack.git                                                                                                                                                                                              
git fetch kubernetes release-1.30                                                                                                                                                                                                                                                 
git fetch openshift master                                                                                                                                                                                                                                                        
git checkout -b sync-master openshift/master                                                                                                                                                                                                                                      
git rebase -i kubernetes/release-1.30                                                                                                                                                                                                                                             
# Drop any CARRY: Vendoring commit                                                                                                                                                                                                                                                
# Drop any conflicting CARRY commit related to upstream CI not required downstream

Then apply patches from:

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.

@EmilienM
Copy link
Member Author

/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 Jun 14, 2024
@openshift-ci-robot
Copy link

@EmilienM: This pull request references Jira Issue OCPBUGS-34137, which is valid.

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

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

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

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

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

This pull request references Jira Issue OCPBUGS-34113, 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.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

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

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

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

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.

@EmilienM
Copy link
Member Author

/test e2e-openstack-csi-cinder e2e-openstack-csi-manila

@EmilienM
Copy link
Member Author

/override ci/prow/e2e-openstack
The only failure is fixed via openshift/openstack-test#175

Copy link

openshift-ci bot commented Jun 17, 2024

@EmilienM: Overrode contexts on behalf of EmilienM: ci/prow/e2e-openstack

In response to this:

/override ci/prow/e2e-openstack
The only failure is fixed via openshift/openstack-test#175

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.

@EmilienM
Copy link
Member Author

/test e2e-openstack-csi-manila
timeout :/

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.

LGTM on principle, still I'd like so see the results from the Manila CSI job.

@EmilienM
Copy link
Member Author

/test e2e-openstack-csi-manila

@EmilienM
Copy link
Member Author

/override ci/prow/e2e-openstack-csi-cinder
The results indicates a failure on a LOW impact test that fails all the time (we should fix or skip it).

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cloud-provider-openstack/287/pull-ci-openshift-cloud-provider-openstack-master-e2e-openstack-csi-cinder/1802697896110329856

Copy link

openshift-ci bot commented Jun 17, 2024

@EmilienM: Overrode contexts on behalf of EmilienM: ci/prow/e2e-openstack-csi-cinder

In response to this:

/override ci/prow/e2e-openstack-csi-cinder
The results indicates a failure on a LOW impact test that fails all the time (we should fix or skip it).

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cloud-provider-openstack/287/pull-ci-openshift-cloud-provider-openstack-master-e2e-openstack-csi-cinder/1802697896110329856

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.

@EmilienM
Copy link
Member Author

/override ci/prow/e2e-openstack-csi-manila
The error is low

Copy link

openshift-ci bot commented Jun 18, 2024

@EmilienM: Overrode contexts on behalf of EmilienM: ci/prow/e2e-openstack-csi-manila

In response to this:

/override ci/prow/e2e-openstack-csi-manila
The error is low

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.

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.

The failure in the CSI jobs is a known issue (OCPBUGS-31738) and is unrelated to this change.
/lgtm
/approve

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

openshift-ci bot commented Jun 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, mandre

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

Copy link

openshift-ci bot commented Jun 18, 2024

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

@openshift-merge-bot openshift-merge-bot bot merged commit 92021a2 into openshift:master Jun 18, 2024
7 checks passed
@openshift-ci-robot
Copy link

@EmilienM: Jira Issue OCPBUGS-34137: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Jira Issue OCPBUGS-34460: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Jira Issue OCPBUGS-34113: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

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

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

In response to this:

Commands used:

git clone https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                               
cd cloud-provider-openstack                                                                                                                                                                                                                                                       
git remote add openshift https://github.com/openshift/cloud-provider-openstack.git                                                                                                                                                                                                
git remote add kubernetes https://github.com/kubernetes/cloud-provider-openstack.git                                                                                                                                                                                              
git fetch kubernetes release-1.30                                                                                                                                                                                                                                                 
git fetch openshift master                                                                                                                                                                                                                                                        
git checkout -b sync-master openshift/master                                                                                                                                                                                                                                      
git rebase -i kubernetes/release-1.30                                                                                                                                                                                                                                             
# Drop any CARRY: Vendoring commit                                                                                                                                                                                                                                                
# Drop any conflicting CARRY commit related to upstream CI not required downstream

Then apply patches from:

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

[ART PR BUILD NOTIFIER]

This PR has been included in build csi-driver-manila-container-v4.17.0-202406182241.p0.g92021a2.assembly.stream.el9 for distgit csi-driver-manila.
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-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.