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

Merges upstream and updates the vendor folder #133

Merged
merged 17 commits into from Sep 27, 2022

Conversation

MaysaMacedo
Copy link

All the currently maintained binaries are:

  • openstack-cloud-controller-manager (occm)
  • cinder-csi-plugin
  • manila-csi-plugin
  • k8s-keystone-auth
  • client-keystone-auth
  • octavia-ingress-controller
  • magnum-auto-healer
  • barbican-kms-plugin

What this PR does / why we need it:
Merges with upstream kubernetes/cloud-provider-openstack and updated the vendor folder.

NONE

shaardie and others added 17 commits August 29, 2022 21:21
This patch introduces the usage of the /healthz Endpoint in the monitor.

Documentation for this is hard to find, but you can see in the kubernetes
repository
https://github.com/kubernetes/kubernetes/blob/26842bb0c8fcf89885798a2ebd9a97cd104e78bf/staging/src/k8s.io/cloud-provider/service/helpers/helper.go#L87
that /healthz is the prefered endpoint here.
This patch makes it possible to explicitly configure the hostname of a
load balancer via annotation.

This hostname is used in the load balancer instead of the IP address or the
*fake* hostname.

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>
This patches fixes a small inconsistency in `getMemberSubnetID` where
`svcConf.configClassName` is used instead of `configClassName`.

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>
* Bump k8s deps to 1.25

* Replace deprecated grpc credentials

* Bump module go version to 1.19

* Remove both direct and indirect dependency on ginkgo v1

* Add .go to gitignore
When dealing with some older clouds we need to allow for ignoring the cinder microversion.
With this change, cloud users pre OpenStack Pike can once again create volumes by setting the new `ignore-volume-microversion` to `true`.
This patch make the `EnsureLoadbalancer` honor the settings for network-id and
subnet-id made in the load balancer classes.

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>

Signed-off-by: Sven Haardiek <sven.haardiek@uni-muenster.de>
…1992)

OpenStack does not support creation of floating IPs
with IPv6. However, it's still possible to exist external
networks with IPv6 Subnets, which could break the creation
of Floating IPs for a load-balancer if CCM uses it.
This commit avoids this issue by making sure only external
networks with IPv4 Subnets are used when creating a Floating IP.
@MaysaMacedo
Copy link
Author

/hold for CI

@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 Sep 26, 2022
@MaysaMacedo MaysaMacedo changed the title Merge upstream and updates the vendor folder Merges upstream and updates the vendor folder Sep 26, 2022
@mandre
Copy link
Member

mandre commented Sep 26, 2022

/retest

@openshift-ci
Copy link

openshift-ci bot commented Sep 26, 2022

@MaysaMacedo: 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.

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
/approve
/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 Sep 27, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 27, 2022
@openshift-ci
Copy link

openshift-ci bot commented Sep 27, 2022

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Sep 27, 2022
@openshift-merge-robot openshift-merge-robot merged commit eea3c76 into openshift:master Sep 27, 2022
@pierreprinetti pierreprinetti deleted the merge-upstream branch October 20, 2023 11:07
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. 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

9 participants