Refactor cluster templates #1341

Amulyam24 · 2023-08-11T10:24:20Z

What this PR does / why we need it:
This PR refactors the construction of cluster templates by reducing code duplication.

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 #855

Special notes for your reviewer:

/area provider/ibmcloud

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

Refactor cluster templates

netlify · 2023-08-11T10:24:26Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Name	Link
🔨 Latest commit	`71c7903`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-ibmcloud/deploys/64da1db7653cf10008a3add2
😎 Deploy Preview	https://deploy-preview-1341--kubernetes-sigs-cluster-api-ibmcloud.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Prajyot-Parab · 2023-08-11T17:51:11Z

@Amulyam24
Is this the same behavior on your machine as well?

cluster-api-provider-ibmcloud % make generate-templates
./hack/version.sh: line 95: GIT_MAJOR: unbound variable
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-cloud-provider --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-cloud-provider.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-clusterclass --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-clusterclass.yaml
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-vpc-load-balancer --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-vpc-load-balancer.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.

Amulyam24 · 2023-08-12T07:29:41Z

@Amulyam24 Is this the same behavior on your machine as well?

cluster-api-provider-ibmcloud % make generate-templates
./hack/version.sh: line 95: GIT_MAJOR: unbound variable
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-cloud-provider --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-cloud-provider.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-clusterclass --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-powervs-clusterclass.yaml
hack/tools/bin/kustomize build /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-vpc-load-balancer --load-restrictor LoadRestrictionsNone > /Users/prajyotparab/Workspace/sandbox/cluster-api-provider-ibmcloud/templates/cluster-template-vpc-load-balancer.yaml
# Warning: 'patchesStrategicMerge' is deprecated. Please use 'patches' instead. Run 'kustomize edit fix' to update your Kustomization automatically.

yes @Prajyot-Parab. Made changes for the warning regarding deprecation of patchesStrategicMerge except for cluster-template-vpc-load-balancer since it has multiple patches in one, will see if that can be changed too.

Prajyot-Parab · 2023-08-14T08:18:03Z

@Amulyam24 Is this the same behavior on your machine as well?

yes @Prajyot-Parab. Made changes for the warning regarding deprecation of patchesStrategicMerge except for cluster-template-vpc-load-balancer since it has multiple patches in one, will see if that can be changed too.

@Amulyam24 Checked looking good, let me know if its possible to fix vpc-load-blancer template as well.

Amulyam24 · 2023-08-14T12:28:54Z

@Amulyam24 Is this the same behavior on your machine as well?

yes @Prajyot-Parab. Made changes for the warning regarding deprecation of patchesStrategicMerge except for cluster-template-vpc-load-balancer since it has multiple patches in one, will see if that can be changed too.

@Amulyam24 Checked looking good, let me know if its possible to fix vpc-load-blancer template as well.

@Prajyot-Parab, split the patches. PR is ready for review. PTAL

Prajyot-Parab

/lgtm

Amulyam24 · 2023-08-14T12:33:58Z

/cc @mkumatag

mkumatag

/lgtm

mkumatag · 2023-08-20T18:05:09Z

Makefile

@@ -174,6 +175,14 @@ generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code
 		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt

+.PHONY: generate-templates


We should explore how consume this target! @Amulyam24 can you create a follow up task for that?

mkumatag · 2023-08-20T18:05:57Z

lets merge this meanwhile

/approve

k8s-ci-robot · 2023-08-20T18:06:02Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Amulyam24, mkumatag, Prajyot-Parab

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:

~~OWNERS~~ [mkumatag]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Prajyot-Parab · 2023-08-22T09:04:24Z

templates/cluster-template-vpc-load-balancer.yaml

@@ -406,4 +403,7 @@ data:
                name: ibm-cloud-config
            - name: ibm-secret
              secret:
-                secretName: ibm-cloud-credential
+                secretName: ibm-cloud-credentia


ibm-cloud-credentia -> ibm-cloud-credential

@Amulyam24 typo error

Prajyot-Parab · 2023-08-22T09:05:03Z

templates/addons/crs.yaml

+                name: ibm-cloud-config
+            - name: ibm-secret
+              secret:
+                secretName: ibm-cloud-credentia


ibm-cloud-credentia -> ibm-cloud-credential

@Amulyam24 another one here

k8s-ci-robot added area/provider/ibmcloud Issues or PRs related to ibmcloud provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 11, 2023

k8s-ci-robot requested review from Prajyot-Parab and wentao-zh August 11, 2023 10:24

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Aug 11, 2023

Refactor cluster templates

71c7903

Prajyot-Parab approved these changes Aug 14, 2023

View reviewed changes

k8s-ci-robot assigned Prajyot-Parab Aug 14, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 14, 2023

k8s-ci-robot requested a review from mkumatag August 14, 2023 12:33

mkumatag approved these changes Aug 20, 2023

View reviewed changes

k8s-ci-robot assigned mkumatag Aug 20, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 20, 2023

mkumatag requested changes Aug 20, 2023

View reviewed changes

k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 20, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 20, 2023

k8s-ci-robot merged commit a402887 into kubernetes-sigs:main Aug 20, 2023

Prajyot-Parab reviewed Aug 22, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor cluster templates #1341

Refactor cluster templates #1341

Amulyam24 commented Aug 11, 2023 •

edited

Loading

netlify bot commented Aug 11, 2023 •

edited

Loading

Prajyot-Parab commented Aug 11, 2023

Amulyam24 commented Aug 12, 2023

Prajyot-Parab commented Aug 14, 2023 •

edited

Loading

Amulyam24 commented Aug 14, 2023

Prajyot-Parab left a comment

Amulyam24 commented Aug 14, 2023

mkumatag left a comment

mkumatag Aug 20, 2023

mkumatag commented Aug 20, 2023

k8s-ci-robot commented Aug 20, 2023

Prajyot-Parab Aug 22, 2023

Prajyot-Parab Aug 22, 2023

Refactor cluster templates #1341

Refactor cluster templates #1341

Conversation

Amulyam24 commented Aug 11, 2023 • edited Loading

netlify bot commented Aug 11, 2023 • edited Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Prajyot-Parab commented Aug 11, 2023

Amulyam24 commented Aug 12, 2023

Prajyot-Parab commented Aug 14, 2023 • edited Loading

Amulyam24 commented Aug 14, 2023

Prajyot-Parab left a comment

Choose a reason for hiding this comment

Amulyam24 commented Aug 14, 2023

mkumatag left a comment

Choose a reason for hiding this comment

mkumatag Aug 20, 2023

Choose a reason for hiding this comment

mkumatag commented Aug 20, 2023

k8s-ci-robot commented Aug 20, 2023

Prajyot-Parab Aug 22, 2023

Choose a reason for hiding this comment

Prajyot-Parab Aug 22, 2023

Choose a reason for hiding this comment

Amulyam24 commented Aug 11, 2023 •

edited

Loading

netlify bot commented Aug 11, 2023 •

edited

Loading

Prajyot-Parab commented Aug 14, 2023 •

edited

Loading