Skip to content

Commit

Permalink
operator: move kubebuilder comments back
Browse files Browse the repository at this point in the history
`kustomize edit fix` moved yaml around, breaking the in-line comments
needed for kubebuilder.

This just moves those comments back where they belong

(cherry picked from commit 3662022)
  • Loading branch information
joejulian authored and vbotbuildovich committed Oct 19, 2023
1 parent 1c0f6fe commit 519e26f
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/go/k8s/config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,31 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

#+kubebuilder:scaffold:crdkustomizeresource
resources:
- bases/redpanda.vectorized.io_clusters.yaml
- bases/redpanda.vectorized.io_consoles.yaml
- bases/cluster.redpanda.com_redpandas.yaml
- bases/cluster.redpanda.com_topics.yaml
#+kubebuilder:scaffold:crdkustomizeresource
- bases/toolkit.fluxcd.io/helm-controller.yaml
- bases/toolkit.fluxcd.io/source-controller.yaml

patches:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
- path: patches/webhook_in_clusters.yaml
- path: patches/webhook_in_redpanda_consoles.yaml
- path: patches/webhook_in_cluster.redpanda.com_topics.yaml
#+kubebuilder:scaffold:crdkustomizewebhookpatch

# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
# patches here are for enabling the CA injection for each CRD
patches:
- path: patches/webhook_in_clusters.yaml
- path: patches/webhook_in_redpanda_consoles.yaml
- path: patches/webhook_in_cluster.redpanda.com_topics.yaml
- path: patches/cainjection_in_clusters.yaml
- path: patches/cainjection_in_redpanda_consoles.yaml
- path: patches/cainjection_in_cluster.redpanda.com_topics.yaml
#+kubebuilder:scaffold:crdkustomizecainjectionpatch

# patches CRD to re-add removed fields from beta CRDs
- path: patches/re-add-checksum-field_in_source.toolkit.fluxcd.io.yaml
target:
kind: CustomResourceDefinition
Expand All @@ -40,9 +42,6 @@ patches:
kind: CustomResourceDefinition
name: ocirepositories.source.toolkit.fluxcd.io


# patches CRD to re-add removed fields from beta CRDs

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml

0 comments on commit 519e26f

Please sign in to comment.