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

Adjust to new kustomize syntax. #348

Merged
merged 2 commits into from
Mar 5, 2023
Merged

Adjust to new kustomize syntax. #348

merged 2 commits into from
Mar 5, 2023

Conversation

garloff
Copy link
Member

@garloff garloff commented Mar 1, 2023

Use resources rather than base.
Insert path: before filenames referenced in patches. Reference: kubernetes-sigs/kustomize#4911 Supercedes: #329

@garloff
Adjust to new kustomize syntax.
91d0ca9 
Use resources rather than base.
Insert path: before filenames referenced in patches.
Reference: kubernetes-sigs/kustomize#4911
Supercedes: #329

Signed-off-by: Kurt Garloff <kurt@garloff.de>
@garloff garloff added bug Something isn't working Container Issues or pull requests relevant for Team 2: Container Infra and Tooling labels Mar 1, 2023
@garloff garloff self-assigned this Mar 1, 2023
@garloff garloff mentioned this pull request Mar 1, 2023
Closed
@garloff
Copy link
Member Author

garloff commented Mar 3, 2023

Your reviews would be welcome!

jschoone
jschoone approved these changes Mar 5, 2023
View reviewed changes
Copy link
Contributor

@jschoone jschoone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested and works for me.
I closed #329 without merging.

@garloff garloff merged commit 57f662b into main Mar 5, 2023
@garloff garloff deleted the fix/kustomize-new-syntax branch March 5, 2023 21:30
@garloff garloff mentioned this pull request Mar 5, 2023
Closed
@Nils98Ar
Copy link
Member

Nils98Ar commented Mar 9, 2023

@garloff Can this also be merged into maintained/v4.x? Otherwise we would need to switch to main.

garloff added a commit that referenced this pull request Mar 10, 2023
@garloff
Adjust to new kustomize syntax. (#348)
aac4f76 
Use resources rather than base.
Insert path: before filenames referenced in patches.
Reference: kubernetes-sigs/kustomize#4911
Supercedes: #329

Signed-off-by: Kurt Garloff <kurt@garloff.de>
garloff added a commit that referenced this pull request Mar 10, 2023
@garloff
Adjust to new kustomize syntax. (#348)
9e2a9aa 
Use resources rather than base.
Insert path: before filenames referenced in patches.
Reference: kubernetes-sigs/kustomize#4911
Supercedes: #329

Signed-off-by: Kurt Garloff <kurt@garloff.de>
@garloff
Copy link
Member Author

garloff commented Mar 10, 2023 •
edited
Loading

Thanks, @Nils98Ar, this bugfix should definitely go to maintained/v4.x and also maintained/v4.0.x branches.
I have already merged (cherry-picked) this kustomize fix into both branches.

Honestly, I was a bit unsure how much those maintained branches are in use and we have not given them as much attention lately.
I opened issue #369 and #370 to discuss and track what we backport in terms of bugfixes and (in case of v4.x) minor updates. If you have any input, it is definitely welcome!

@Nils98Ar
Copy link
Member

Thanks, @Nils98Ar, this bugfix should definitely go to maintained/v4.x and also maintained/v4.0.x branches. I have already merged (cherry-picked) this kustomize fix into both branches.

Honestly, I was a bit unsure how much those maintained branches are in use and we have not given them as much attention lately. I opened issue #369 and #370 to discuss and track what we backport in terms of bugfixes and (in case of v4.x) minor updates. If you have any input, it is definitely welcome!

Sorry for the delay. Our idea was to use a maintained branch that is associated with the SCS release that we are running.

I will let you know in #369/#370 if I am missing a bug fix that needs to be cherry-picked!

@matofeder matofeder mentioned this pull request Jun 28, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jschoone jschoone jschoone approved these changes

@joshmue joshmue Awaiting requested review from joshmue

@batistein batistein Awaiting requested review from batistein

@chess-knight chess-knight Awaiting requested review from chess-knight

Assignees

@garloff garloff

Labels
bug Something isn't working Container Issues or pull requests relevant for Team 2: Container Infra and Tooling
Projects
Sovereign Cloud Stack
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@garloff @Nils98Ar @jschoone