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

Cherry-pick patches to ske-v1.38 #47

Merged
merged 12 commits into from
Jan 10, 2024
Merged

Cherry-pick patches to ske-v1.38 #47

merged 12 commits into from
Jan 10, 2024

Conversation

maboehm
Copy link
Collaborator

@maboehm maboehm commented Jan 4, 2024 •
edited
Loading

Started with gardener/gardener-extension-provider-openstack@gardener:gardener-extension-provider-openstack:v1.35.1...stackitcloud:gardener-extension-provider-openstack:ske-v1.35

Instead of 7a228c4, I squashed the most recent changes of that feature, which includes an implementation for infraflow as well

but dropped:

  • 2d24b2b terraform move blocks are no longer needed
  • 73ac4c4 old version bump
  • 2386623 comment says this can be removed after 1.73
  • f9a3b1f vendor of older forked gardener version. I believe newer gardener version should be fine @nschad

I also commented out calls to the Loadbalancer API in b2b7e91 since they break the deletion flow on STACKIT, see gardener#672

@maboehm maboehm changed the title Cherry picks Cherry-pick patches to ske-v1.38 Jan 4, 2024
rgroemmer
rgroemmer previously approved these changes Jan 9, 2024
View reviewed changes
@maboehm
Copy link
Collaborator Author

maboehm commented Jan 9, 2024 •
edited
Loading

holding to clarify if we should update cherry-picked commit b6bf225 (useExistingSubnet) to include all changes from gardener#671

clarified: added new squashed commit.

@maboehm maboehm marked this pull request as draft January 9, 2024 14:46
Kai Kummerer and others added 2 commits January 10, 2024 11:10
@maboehm
Cherry-pick useExistingSubnet feature (10-01-2024)
13ff499 
add SubnetID to APIs (15bdb26)

implement 'use existing subnet' for terraform (8fac4ae)

implement 'use existing subnet' for infraflow (80f0836)

extend integration tests (3678da4)

extend infrastructureConfig validation (fa83256)

extend configValidator (547389c)
@maboehm
bump version file
1f3f59d
@maboehm maboehm marked this pull request as ready for review January 10, 2024 10:16
@maboehm maboehm merged commit aabcb86 into ske-v1.38 Jan 10, 2024
1 check passed
@timebertt timebertt deleted the cherry-picks branch January 11, 2024 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgroemmer rgroemmer rgroemmer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maboehm @rgroemmer @einfachnuralex