Skip to content

Commit

Permalink
chore: Update generated files via
Browse files Browse the repository at this point in the history
  • Loading branch information
012xx committed Aug 29, 2024
1 parent e70591d commit 754e547
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
10 changes: 6 additions & 4 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/cattage.cybozu.io_tenants.yaml
- bases/cattage.cybozu.io_tenants.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
- patches/fix-crd.yaml
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
#- patches/webhook_in_tenants.yaml
Expand All @@ -19,4 +17,8 @@ patchesStrategicMerge:

# the following config is for teaching kustomize how to do kustomization for CRDs.
configurations:
- kustomizeconfig.yaml
- kustomizeconfig.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
patches:
- path: patches/fix-crd.yaml
10 changes: 7 additions & 3 deletions config/helm/crds/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
resources:
- ../../crd
- ../../crd

commonLabels:
app.kubernetes.io/name: cattage
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/name: cattage
18 changes: 11 additions & 7 deletions config/helm/templates/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
resources:
- ../../rbac
- ../../webhook
- ../../rbac
- ../../webhook

namespace: '{{ .Release.Namespace }}'

namePrefix: '{{ template "cattage.fullname" . }}-'

commonLabels:
app.kubernetes.io/name: '{{ include "cattage.name" . }}'

patchesStrategicMerge:
- webhookcainjection_patch.yaml

transformers:
- label-transformer.yaml
- label-transformer.yaml
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
labels:
- includeSelectors: true
pairs:
app.kubernetes.io/name: '{{ include "cattage.name" . }}'
patches:
- path: webhookcainjection_patch.yaml

0 comments on commit 754e547

Please sign in to comment.