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

🌱 Update Kustomize deprecated syntax #1625

Merged
merged 1 commit into from
May 30, 2024
Merged

🌱 Update Kustomize deprecated syntax #1625

merged 1 commit into from
May 30, 2024

Conversation

peppi-lotta
Copy link
Member

Update Kustomize deprecated syntax:

  • patchesStrategicMerge -> patches
  • patchesJson6902 -> patches
  • vars and varReference -> replacements
  • bases -> resources

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@metal3-io-bot metal3-io-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 24, 2024
@peppi-lotta peppi-lotta changed the title Update Kustomize depricated syntax 🌱 Update Kustomize depricated syntax Apr 24, 2024
@tuminoid
Copy link
Member

/ok-to-test

@metal3-io-bot metal3-io-bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Apr 24, 2024
@tuminoid
Copy link
Member

/retitle 🌱 Update Kustomize deprecated syntax

@metal3-io-bot metal3-io-bot changed the title 🌱 Update Kustomize depricated syntax 🌱 Update Kustomize deprecated syntax Apr 24, 2024
@peppi-lotta
Copy link
Member Author

/metal3-centos-e2e-integration-test-main
/metal3-ubuntu-e2e-integration-test-main

@kashifest
Copy link
Member

cc @lentzi90 @Rozzii @mboukhalfa @smoshiur1237 @adilGhaffarDev @kashifest

@kashifest
Copy link
Member

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main

smoshiur1237
smoshiur1237 reviewed Apr 25, 2024
View reviewed changes
config/certmanager/certificate.yaml
@@ -21,4 +21,4 @@ spec:
issuerRef:
kind: Issuer
name: selfsigned-issuer
secretName: $(SERVICE_NAME)-cert # this secret will not be prefixed, since it's not managed by kustomize
secretName: capm3-webhook-service-cert # this secret will not be prefixed, since it's not managed by kustomize
Copy link
Member

Choose a reason for hiding this comment

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

is there any reason to hard code it?

Copy link
Member Author

Choose a reason for hiding this comment

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

@lentzi90 had a comment on this other PR about this: kubernetes-sigs/cluster-api#9223 (comment)

Basically replacements doesn't work exactly the same way as vars and dynamic values don't work out of the box.

@peppi-lotta peppi-lotta force-pushed the peppi-lotta/fix/Update-Kustomize-depricated-syntax branch from bba6dcc to e07c307 Compare April 25, 2024 09:43
@peppi-lotta
Copy link
Member Author

/metal3-centos-e2e-integration-test-main
/metal3-ubuntu-e2e-integration-test-main

lentzi90
lentzi90 reviewed Apr 25, 2024
View reviewed changes
Copy link
Member

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/approve

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 25, 2024
@peppi-lotta peppi-lotta mentioned this pull request Apr 26, 2024
Merged
kashifest
kashifest requested changes Apr 29, 2024
View reviewed changes
config/crd/patches/cainjection_in_metal3datas.yaml Outdated
@@ -4,5 +4,5 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE)/CERTIFICATE_NAME
Copy link
Member

Choose a reason for hiding this comment

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

This seems like incorrect to me, theres a closing ) but no matching (, may be remove the ) ?

config/crd/patches/cainjection_in_metal3machines.yaml Outdated
@@ -4,5 +4,5 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE)/CERTIFICATE_NAME
Copy link
Member

Choose a reason for hiding this comment

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

same as before

@peppi-lotta peppi-lotta force-pushed the peppi-lotta/fix/Update-Kustomize-depricated-syntax branch 2 times, most recently from 49faec5 to b117d59 Compare April 29, 2024 07:40
@peppi-lotta
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main

2 similar comments
@peppi-lotta
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main

@peppi-lotta
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main

@peppi-lotta peppi-lotta force-pushed the peppi-lotta/fix/Update-Kustomize-depricated-syntax branch 2 times, most recently from 7522cf9 to 7af9a73 Compare May 2, 2024 11:47
@peppi-lotta peppi-lotta mentioned this pull request May 3, 2024
Merged
@Rozzii
Copy link
Member

Rozzii commented May 6, 2024

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main

Rozzii
Rozzii approved these changes May 6, 2024
View reviewed changes
Copy link
Member

@Rozzii Rozzii left a comment

Choose a reason for hiding this comment

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

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label May 6, 2024
@tuminoid
Copy link
Member

/test metal3-centos-e2e-integration-test-main metal3-ubuntu-e2e-integration-test-main

/hold
To fix merge pool

@metal3-io-bot metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2024
@tuminoid
Copy link
Member

/unhold

@metal3-io-bot metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2024
@tuminoid
Copy link
Member

/hold
Requested changes from @kashifest blocks merge pool.

@metal3-io-bot metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2024
@tuminoid tuminoid mentioned this pull request May 13, 2024
Merged
@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kashifest, lentzi90, Rozzii

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

@lentzi90
Copy link
Member

/test metal3-ubuntu-e2e-integration-test-main

1 similar comment
@peppi-lotta
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main

@peppi-lotta
Update Kustomize depricated syntax
c586a7e 
Signed-off-by: Peppi-Lotta <peppi-lotta.saari@est.tech>
@peppi-lotta peppi-lotta force-pushed the peppi-lotta/fix/Update-Kustomize-depricated-syntax branch from 7af9a73 to c586a7e Compare May 29, 2024 07:49
@metal3-io-bot metal3-io-bot removed the lgtm Indicates that a PR is ready to be merged. label May 29, 2024
@peppi-lotta
Copy link
Member Author

/test metal3-ubuntu-e2e-integration-test-main
/test metal3-centos-e2e-integration-test-main

@Rozzii
Copy link
Member

Rozzii commented May 29, 2024

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label May 29, 2024
@peppi-lotta
Copy link
Member Author

/test metal3-centos-e2e-integration-test-main

@Rozzii
Copy link
Member

Rozzii commented May 30, 2024

Looks like it has passed every test I will remove the hold
/hold cancel

@metal3-io-bot metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 30, 2024
@metal3-io-bot metal3-io-bot merged commit 352d293 into metal3-io:main May 30, 2024
16 checks passed
@metal3-io-bot metal3-io-bot deleted the peppi-lotta/fix/Update-Kustomize-depricated-syntax branch May 30, 2024 05:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lentzi90 lentzi90 lentzi90 left review comments

@smoshiur1237 smoshiur1237 smoshiur1237 left review comments

@Rozzii Rozzii Rozzii approved these changes

@kashifest kashifest kashifest approved these changes

Assignees
No one assigned
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@peppi-lotta @tuminoid @kashifest @Rozzii @metal3-io-bot @lentzi90 @smoshiur1237