From a39704d95da6994b95fa61d6a4c71c90163b8624 Mon Sep 17 00:00:00 2001 From: Frederic Wilhelm Date: Thu, 16 Jan 2025 17:02:34 +0100 Subject: [PATCH] deploy source-controller --- config/crd/kustomization.yaml | 3 ++- config/default/kustomization.yaml | 10 +++------- config/manager/kustomization.yaml | 3 +-- config/prometheus/kustomization.yaml | 1 + config/rbac/kustomization.yaml | 4 +++- config/source-controller/kustomization.yaml | 5 +++++ 6 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 config/source-controller/kustomization.yaml diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 73f37caa..aa4d2649 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -12,7 +12,8 @@ resources: - bases/delivery.ocm.software_resourceconfigs.yaml # +kubebuilder:scaffold:crdkustomizeresource -patches: +namePrefix: ocm-k8s-toolkit- + # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD # +kubebuilder:scaffold:crdkustomizewebhookpatch diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 9f7aad69..5342a727 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,13 +1,6 @@ # Adds namespace to all resources. namespace: ocm-k8s-toolkit-system -# Value of this field is prepended to the -# names of all resources, e.g. a deployment named -# "wordpress" becomes "alices-wordpress". -# Note that it should also match with the prefix (text before '-') of the namespace -# field above. -namePrefix: ocm-k8s-toolkit- - # Labels to add to all resources and selectors. #labels: #- includeSelectors: true @@ -18,6 +11,9 @@ resources: - ../crd - ../rbac - ../manager +- ../source-controller + + # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in # crd/kustomization.yaml #- ../webhook diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 2530fc60..01ebff7e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,9 +1,8 @@ resources: - manager.yaml - service.yaml +namePrefix: ocm-k8s-toolkit- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: localhost:31000/ocm.software/ocm-controller - newTag: v0.0.1 diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml index ed137168..9c055f82 100644 --- a/config/prometheus/kustomization.yaml +++ b/config/prometheus/kustomization.yaml @@ -1,2 +1,3 @@ resources: - monitor.yaml +namePrefix: ocm-k8s-toolkit- diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 087bea97..c99fe733 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -22,4 +22,6 @@ resources: - component_editor_role.yaml - component_viewer_role.yaml - ocmrepository_editor_role.yaml -- ocmrepository_viewer_role.yaml \ No newline at end of file +- ocmrepository_viewer_role.yaml + +namePrefix: ocm-k8s-toolkit- diff --git a/config/source-controller/kustomization.yaml b/config/source-controller/kustomization.yaml new file mode 100644 index 00000000..a5a486f0 --- /dev/null +++ b/config/source-controller/kustomization.yaml @@ -0,0 +1,5 @@ +resources: +# - https://github.com/fluxcd/source-controller//config/default #Problem with overlapping namespace + - https://github.com/fluxcd/source-controller//config/crd + - https://github.com/fluxcd/source-controller//config/rbac + - https://github.com/fluxcd/source-controller//config/manager