OCPBUGS-66948: Pin IPAM CRDs to release-4.20 #253
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||||||
| kind: Kustomization | ||||||
|
|
||||||
| # MAPV uses the CAPI IPAM CRDs. Until CAPI reaches GA, these CRDs must be | ||||||
| # separately installed in production clusters. This workaround can be removed | ||||||
| # when CAPI reaches GA: they will be installed via the CAPI Operator manifests | ||||||
| # along with all other CAPI CRDs. | ||||||
| # | ||||||
| # In 4.21 we bumped CAPI to a version which includes v1beta2, and therefore | ||||||
| # requires a conversion webhook. This would break production vsphere clusters | ||||||
| # using IPAM, because we are not yet deploying this webhook in production | ||||||
| # clusters. As MAPV does not require the v1beta2 IPAM CRDs, we pin them at the | ||||||
| # versions shipped in 4.20 for now. | ||||||
|
|
||||||
| commonAnnotations: | ||||||
| # Boilerplate annotations | ||||||
| exclude.release.openshift.io/internal-openshift-hosted: "true" | ||||||
| include.release.openshift.io/self-managed-high-availability: "true" | ||||||
| include.release.openshift.io/single-node-developer: "true" | ||||||
|
|
||||||
| # Instructs CVO to only install these resources in clusters with the Default | ||||||
| # featureset. Specifically this means that they will not be installed in | ||||||
| # (TechPreview|Custom|Dev)NoUpgrade clusters. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| release.openshift.io/feature-set: Default | ||||||
|
|
||||||
| resources: | ||||||
| # Pinned at 4.20, as that was the last release which didn't have v1beta2 | ||||||
| - https://github.com/openshift/cluster-api/config/crd?ref=de1db2970e7fede7101e5a8188e74942ab6665e3 | ||||||
|
|
||||||
| # Together these 2 patches remove all CRDs except those with the name suffix | ||||||
| # '.ipam.cluster.x-k8s.io' | ||||||
| patches: | ||||||
|
|
||||||
| # First add the local-config annotation to all CRDs. | ||||||
| # kustomize will not emit resources with this annotation | ||||||
| - target: | ||||||
| kind: CustomResourceDefinition | ||||||
| patch: | | ||||||
| - op: "add" | ||||||
| path: "/metadata/annotations/config.kubernetes.io~1local-config" | ||||||
| value: "true" | ||||||
|
|
||||||
| # Then selectively remove the local-config annotation from CRDs in | ||||||
| # ipam.cluster.x-k8s.io, meaning they will be emitted | ||||||
| - target: | ||||||
| kind: CustomResourceDefinition | ||||||
| name: '.*\.ipam\.cluster\.x-k8s\.io$' | ||||||
| patch: | | ||||||
| - op: remove | ||||||
| path: "/metadata/annotations/config.kubernetes.io~1local-config" | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't feel like it's going to age well, or is the intention for this not to age well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we can ever go beyond 4.20 without a radically new approach. We're really hoping that radically new approach is going to be the CAPI Operator 😅 At that point we don't need any of this.