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

Manual rebase on upstream #252

Closed
wants to merge 1,353 commits into from
Closed

Manual rebase on upstream #252

wants to merge 1,353 commits into from

Conversation

EmilienM
Copy link
Member

mdbooth and others added 30 commits April 1, 2022 06:29
…ruct

⚠️ move loadbalancer opts to struct
✨Refactor CreateInstance and CreateBastion
Merge upstream kubernetes-sigs/cluster-api-provider-openstack
Update from kubernetes-sigs/cluster-api-provider-openstack
We currently require an explicit project_id field in the clouds.yaml.
This conflicts with the usual fields for Application Credentials, as
they already include a scope, and setting another conflicts with that.

In this commit, we instead save the returned project_id from the initial
auth api call, and pass it around to all services using the Scope
struct.
…dential-support

✨ Support Application Credential auth
…v1alpha5

⚠️ rename v1beta1 to v1alpha5
Previously we only waited for the loadbalancer to become active in case
we created a new loadbalancer. Through this change, we will also wait
for the loadbalancer to become active in case it already existed prior to
the current reconcile.
kubeadm v1.24 removes the deprecated control-plane node label
node-role.kubernetes.io/master. This PR introduces the new label
node-role.kubernetes.io/control-plane in the CAPO tests and bumps
the CAPI dependency for compatibility to nodes provisioned using
kubeadm v1.24.

* bumps CAPI to v1.1.3
* fixes k8s v1.24 compatibility
* fixes periodics conformance ci job
* adds tolerations and usage of the new control-plane node label
* bumps e2e k8s version to v1.23.5
* bumps capo version to v1.23.2

Signed-off-by: Christian Schlotter <schlotterc@vmware.com>
…-link

📖 replace dead link for cloud.conf details
…ore openstack data

* fixes nil pointer when reconcileDelete gets executed a second time and security groups already got deleted
* adds dump of existing ports at e2e tests
…formance-bastion-sec-nil

🐛 controllers/openstackcluster_controller.go fix nil pointer and dump openstack ports
k8s-ci-robot and others added 23 commits November 29, 2022 18:00
We have an issue with our ubuntu image where we're not able to update the apt sources
due to outdated public keys. To fix this issue we recreate the image via image-builder.

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
…ot/cherry-pick-1408-to-release-0.7

[release-0.7] 🐛 Update Ubuntu, CirrOS & Amphora image
…ot/cherry-pick-1405-to-release-0.7

[release-0.7] 🌱Release 0.7 patches
During this bump we must upgrade Golang to 1.19 as well.

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
This reverts commit 32a9fc9.

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>
…ot/cherry-pick-1406-to-release-0.7

[release-0.7] ✨ Bump CAPI to v1.3.0
The ClusterctlUpgradeSpec contains a BeforeEach block so it cannot be
nested in an It block.

(cherry picked from commit b2bdc35)
Revert the workaround in clusterctl upgrade

(cherry picked from commit c4229c9)
…ot/cherry-pick-1421-to-release-0.7

[release-0.7] ✨Add lentzi90 to reviewers
…ot/cherry-pick-1424-to-release-0.7

[release-0.7] 🌱Bump CAPI to v1.3.1
in the initial reconciliation loop, a nil-pointer occurs if the cluster
is configured with a bastion host. In this initial run the status field
is still empty.

Signed-off-by: Mario Constanti <mario@constanti.de>
…ot/cherry-pick-1445-to-release-0.7

[release-0.7] 🐛 fix nil-pointer in initial reconciliation loop with empty status field
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 31, 2023
@openshift-merge-robot
Copy link

PR needs rebase.

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

openshift-ci bot commented Jan 31, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from emilienm by writing /assign @emilienm in a comment. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@EmilienM EmilienM closed this Jan 31, 2023
@openshift-ci
Copy link

openshift-ci bot commented Jan 31, 2023

@EmilienM: 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-openstack baf5843 link true /test e2e-openstack
ci/prow/e2e-openstack-proxy baf5843 link false /test e2e-openstack-proxy
ci/prow/images baf5843 link true /test images
ci/prow/gofmt baf5843 link true /test gofmt
ci/prow/unit baf5843 link true /test unit
ci/prow/govet baf5843 link true /test govet
ci/prow/golint baf5843 link true /test golint

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.