Skip to content

[OSPRH-19353] Remove deprecated Kustomize fields in config dir#1577

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
abays:OSPRH-19353
Aug 28, 2025
Merged

[OSPRH-19353] Remove deprecated Kustomize fields in config dir#1577
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
abays:OSPRH-19353

Conversation

@abays

@abays abays commented Aug 25, 2025

Copy link
Copy Markdown
Contributor

Update all deprecated Kustomize fields to their modern equivalents across the config directory to ensure compatibility with Kustomize v5.3+ and future versions.

Changes made:

config/default/kustomization.yaml:

  • Replace 'patchesStrategicMerge:' with 'patches:'
  • Convert patch entries to use 'path:' format
  • Split webhook CA injection patch into separate mutating and validating patches for compatibility with modern Kustomize

config/crd/kustomization.yaml:

  • Replace 'patchesStrategicMerge:' with 'patches:'
  • Update commented patch entries to use 'path:' format for both webhook and cainjection patches

config/manifests/kustomization.yaml:

  • Replace commented '#patchesJson6902:' with '#patches:'

config/scorecard/kustomization.yaml:

  • Replace 'patchesJson6902:' with 'patches:'
  • Update kubebuilder scaffold comment from 'patchesJson6902' to 'patches'

config/default/mutatingwebhookcainjection_patch.yaml:

  • New file: separate mutating webhook configuration for CA injection

config/default/validatingwebhookcainjection_patch.yaml:

  • Renamed from webhookcainjection_patch.yaml: separate validating webhook configuration for CA injection

These changes eliminate deprecation warnings and align with the modern Kustomize field syntax while maintaining full backward compatibility. The webhook configuration split ensures certificate injection works properly with the modernized Kustomize patches field.

Jira: https://issues.redhat.com/browse/OSPRH-19353

Co-authored-by: Claude claude@anthropic.com

Update all deprecated Kustomize fields to their modern equivalents across
the config directory to ensure compatibility with Kustomize v5.3+ and
future versions.

Changes made:

config/default/kustomization.yaml:
- Replace 'patchesStrategicMerge:' with 'patches:'
- Convert patch entries to use 'path:' format
- Update commented 'commonLabels:' to modern 'labels:' syntax with
  includeSelectors/includeTemplates structure
- Split webhook CA injection patch into separate mutating and validating
  patches for compatibility with modern Kustomize

config/crd/kustomization.yaml:
- Replace 'patchesStrategicMerge:' with 'patches:'
- Update commented patch entries to use 'path:' format for both
  webhook and cainjection patches

config/manifests/kustomization.yaml:
- Replace commented '#patchesJson6902:' with '#patches:'

config/scorecard/kustomization.yaml:
- Replace 'patchesJson6902:' with 'patches:'
- Update kubebuilder scaffold comment from 'patchesJson6902' to 'patches'

config/default/mutatingwebhookcainjection_patch.yaml:
- New file: separate mutating webhook configuration for CA injection

config/default/validatingwebhookcainjection_patch.yaml:
- Renamed from webhookcainjection_patch.yaml: separate validating webhook
  configuration for CA injection

These changes eliminate deprecation warnings and align with the modern
Kustomize field syntax while maintaining full backward compatibility.
The webhook configuration split ensures certificate injection works
properly with the modernized Kustomize patches field.

Jira: https://issues.redhat.com/browse/OSPRH-19353

Co-authored-by: Claude <claude@anthropic.com>
@abays abays requested a review from dprince August 25, 2025 12:45
@openshift-ci openshift-ci Bot requested review from olliewalsh and slagle August 25, 2025 12:45
@abays

abays commented Aug 25, 2025

Copy link
Copy Markdown
Contributor Author

@abays: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:
Test name Commit Details Required Rerun command
ci/prow/openstack-operator-build-deploy-kuttl 6c51650 link true /test openstack-operator-build-deploy-kuttl

Full PR test history. Your PR dashboard.

Build openstack-operator failed to complete. Current status is Running. Aborting...

This may be a legitimate failure. It builds for me locally though. Will try again to verify.

/test openstack-operator-build-deploy-kuttl

@ratailor ratailor left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@olliewalsh olliewalsh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci

openshift-ci Bot commented Aug 28, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, olliewalsh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-merge-bot openshift-merge-bot Bot merged commit 0ba3a6d into openstack-k8s-operators:main Aug 28, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants