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.

Sign up for GitHub

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

Jump to bottom

OSASINFRA-3437: Rebase on CAPO v0.10 #305

Merged
merged 339 commits into from
Apr 26, 2024
Merged

OSASINFRA-3437: Rebase on CAPO v0.10 #305

merged 339 commits into from
Apr 26, 2024

Conversation

mdbooth
Copy link

@mdbooth mdbooth commented Apr 23, 2024 •
edited
Loading

bilbobrovall and others added 30 commits February 6, 2024 15:28
@bilbobrovall
Adds Kind to ipaddress pool name index
8fe1c8f
@okozachenko1203
fix: fix the block device type name in doc
3f806e0
@bilbobrovall
Make sure to keep availableIPs and is in sync
cca2213
@k8s-ci-robot
Merge pull request kubernetes-sigs#1858 from tormath1/tormath1/flatca…
77d1ad0 
…r-update

🌱 test: bump Flatcar version
@k8s-ci-robot
Merge pull request kubernetes-sigs#1865 from okozachenko1203/doc/fix-…
f128d15 
…block-device-volume-name

fix: fix the block device type name in doc
@tuminoid @as20203
add TLS configuration flags support
2c8a1a6 
Add --tls-min-version and --tls-max-versin configuration flags.
Same flags can be found in k8s, CAPI, CAPM3 etc.

Co-authored-by: Jawad Zaheer <jawad.zaheer@est.tech>
Signed-off-by: Tuomo Tanskanen <tuomo.tanskanen@est.tech>
@EmilienM
api: openstackcluster.status default to false
e6092b8 
When a reconcile loop for the bastion is requeued, we have
this error:
```
OpenStackCluster.infrastructure.cluster.x-k8s.io \"cluster-e2e-rha0r3\" is invalid: ready: Required value"
```

The OpenStackMachine.Status is false by default now, so if the status
has not been set to anything, patching the object will not fail with the
previous error.
@EmilienM
Prevent the bastion to be removed before it's been disabled
20f2a3c 
We now have a webhook that checks that a bastion has been disabled if a
change has to be made (update or delete) in the bastion field.
We also document it better.

Also, we added some code to prevent that we don't have a nil pointer if
the Spec.Bastion or Status.Bastion are unset.
@k8s-ci-robot
Merge pull request kubernetes-sigs#1842 from shiftstack/issue_1841
c9b628f 
🐛 api: openstackcluster.status default to false
@k8s-ci-robot
Merge pull request kubernetes-sigs#1864 from elastx/fix_pool_name_index
4d81532 
🐛 Adds Kind to ipaddress pool name index
@k8s-ci-robot
Merge pull request kubernetes-sigs#1867 from Nordix/tuomo/tls-configu…
7622602 
…ration-flags

✨ add TLS configuration flags
@k8s-ci-robot
Merge pull request kubernetes-sigs#1870 from elastx/ip_pool_duplicate…
ca15733 
…_addresses

OpenstackFloatingIPPool: Adds popped ip to claimedIPs kubernetes-sigs#1869
@k8s-ci-robot
Merge pull request kubernetes-sigs#1854 from elastx/compare-cidr-fix
622defd 
🐛Make sure that allowedCidrs lists are compared correctly to avoid patching LB listener when not needed
@EmilienM
loadbalancer: resolve ControlPlaneEndpoint.Host when needed
b319893 
`ControlPlaneEndpoint.Host` is not guaranteed to be an IP address, it
can also be an hostname.

Now we'll try to lookup the hostname if it's not an IP and set that for
the LB VipAddress.
@bilbobrovall
Adds MaxIPs to OpenstackFloatingIPPool
42c0ef9
@k8s-ci-robot
Merge pull request kubernetes-sigs#1866 from shiftstack/issue_1855
8ca470a 
🐛 Prevent the bastion to be removed before it's been disabled
@dulek
Move subnet options to SubnetSpec
12a7b72 
This commit introduces SubnetSpec field onto the OpenStackClusterSpec
that is supposed to hold all options related to subnets created by CAPO.
This means nodeCidr and DNSNameservers are moved into that struct.
@k8s-ci-robot
Merge pull request kubernetes-sigs#1856 from shiftstack/subnet-spec
3c07a7b 
✨ Move subnet options to SubnetSpec
@EmilienM
Bump Go to 1.22.0
a68d946
@k8s-ci-robot
Merge pull request kubernetes-sigs#1877 from shiftstack/go1.22
bd0c05c 
✨ Bump Go to 1.22.0
@dulek
Fix cluster network cleanup
2f3e5f4
@k8s-ci-robot
Merge pull request kubernetes-sigs#1880 from shiftstack/cluster-netwo…
88dcecf 
…rk-cleanup

🐛 Fix cluster network cleanup
@stephenfin
provider: Ignore environment variables
23e30c7 
Users should configure things via a secret, not via environment
variables.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
@mdbooth
Stop serving v1alpha5
d33c1bc
@k8s-ci-robot
Merge pull request kubernetes-sigs#1883 from shiftstack/issues-1881
522ed82 
🐛 Ignore 'OS_*' environment variables
@k8s-ci-robot
Merge pull request kubernetes-sigs#1888 from shiftstack/deprecations
05abe55 
⚠️ Stop serving v1alpha5
@mdbooth
Fix doc references to NodeCIDR in v1alpha8
4eec0e7
@k8s-ci-robot
Merge pull request kubernetes-sigs#1889 from shiftstack/nodecidr-docs
1b320cb 
🌱 Fix doc references to NodeCIDR in v1alpha8
@EmilienM
CI/e2e: stop testing upgrades from v1alpha5 (v0.6)
c51197e
@lentzi90
E2E: Add clusterctl upgrade test for v0.9 -> main
ce11691 
Signed-off-by: Lennart Jern <lennart.jern@est.tech>
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2024
@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test test-openshift

pierreprinetti and others added 2 commits April 25, 2024 17:11
@pierreprinetti @mdbooth
CHERRY-PICK: Refactoring: never assign unacceptable TLS versions
49c1705 
This commit makes security linting easier by never setting a TLS version
outside v1.2 or v1.3, even in case of an unacceptable user input.

Upstream PR: kubernetes-sigs#2037
(cherry picked from commit 27526d5)
@mdbooth
Merge remote-tracking branch 'openshift/main' into rebase-capo-v0.10
0a9e144
@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

I've speculatively cherry-picked kubernetes-sigs#2037 here in the expectation that it will merge. We should ensure that it does (and re-cherry-pick as required if it doesn't) before merging.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 25, 2024 •
edited by openshift-ci bot
Loading

@mdbooth: This pull request references OSASINFRA-3437 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.16.0" version, but no target version was set.

In response to this:

TODO:

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.

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security

Hello? Anybody home?

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security

Hello? Anybody home?

Looks like snyk is down/broken:

Starting snyk code scan
There was a problem running Code analysis. 
Contact support if the problem persists.

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 25, 2024 •
edited by openshift-ci bot
Loading

@mdbooth: This pull request references OSASINFRA-3437 which is a valid jira issue.

In response to this:

TODO:

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.

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security

@mdbooth
Copy link
Author

mdbooth commented Apr 25, 2024

/test security
/test e2e-techpreview

1 similar comment
@MaysaMacedo
Copy link

/test security
/test e2e-techpreview

@pierreprinetti
Copy link
Member

/test security

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 26, 2024

@mdbooth: The following test 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/security 0a9e144 link false /test security

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.

@mdbooth
Copy link
Author

mdbooth commented Apr 26, 2024

/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 Apr 26, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mdbooth

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 Apr 26, 2024
@pierreprinetti
Copy link
Member

The security scan succeeds locally.
Thanks @mdbooth for taking care of this.
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 26, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit c42a465 into openshift:main Apr 26, 2024
6 of 7 checks passed
@pierreprinetti pierreprinetti deleted the rebase-capo-v0.10 branch April 26, 2024 09:27
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build openstack-cluster-api-controllers-container-v4.16.0-202404261114.p0.gc42a465.assembly.stream.el9 for distgit openstack-cluster-api-controllers.
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
Reviewers

@mandre mandre Awaiting requested review from mandre

@MaysaMacedo MaysaMacedo Awaiting requested review from MaysaMacedo

@EmilienM EmilienM Awaiting requested review from EmilienM

Assignees

@pierreprinetti pierreprinetti

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.