Skip to content

Conversation

@abays
Copy link
Contributor

@abays abays commented Aug 14, 2025

Summary:

  • Replace deprecated Kustomize fields with the unified patches format.
  • Switch bases to resources in config/default.

Changes:

  • config/default/kustomization.yaml:
    • bases -> resources
    • patchesStrategicMerge -> patches; entries converted to - path: ...
  • config/crd/kustomization.yaml:
    • patchesStrategicMerge -> patches; entries converted to - path: ...
  • config/scorecard/kustomization.yaml:
    • patchesJson6902 -> patches; JSON 6902 ops preserved under path with target
    • update scaffold marker to #+kubebuilder:scaffold:patches
  • config/manifests/kustomization.yaml:
    • comment example updated to use #patches:

Validation:

  • kustomize build passes for config/default, config/crd, config/scorecard, and config/manifests.

Motivation:

  • patchesStrategicMerge and patchesJson6902 are deprecated in Kustomize; using patches avoids subtle generation differences and aligns with other operators.

References:

Co-authored-by: GPT-5 (AI Assistant) [email protected]

@openshift-ci openshift-ci bot requested review from lewisdenny and stuggi August 14, 2025 14:35
@stuggi
Copy link
Contributor

stuggi commented Aug 15, 2025

lgtm

Summary:
- Replace deprecated Kustomize fields with the unified patches format.
- Switch bases to resources in config/default.

Changes:
- config/default/kustomization.yaml:
  - bases -> resources
  - patchesStrategicMerge -> patches; entries converted to - path: ...
- config/crd/kustomization.yaml:
  - patchesStrategicMerge -> patches; entries converted to - path: ...
- config/scorecard/kustomization.yaml:
  - patchesJson6902 -> patches; JSON 6902 ops preserved under path with target
  - update scaffold marker to #+kubebuilder:scaffold:patches
- config/manifests/kustomization.yaml:
  - comment example updated to use #patches:

Validation:
- kustomize build passes for config/default, config/crd, config/scorecard, and config/manifests.

Motivation:
- patchesStrategicMerge and patchesJson6902 are deprecated in Kustomize; using patches avoids subtle generation differences and aligns with other operators.

References:
- Jira: https://issues.redhat.com/browse/OSPRH-19099
- Upstream inspiration: openstack-k8s-operators/keystone-operator#610

Co-authored-by: GPT-5 (AI Assistant) <[email protected]>
Copy link
Contributor

@stuggi stuggi left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-merge-bot openshift-merge-bot bot merged commit bb2012d into openstack-k8s-operators:main Aug 18, 2025
7 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.

2 participants