diff --git a/apps/apps.yaml b/apps/apps.yaml index 244a528..941b294 100644 --- a/apps/apps.yaml +++ b/apps/apps.yaml @@ -11,17 +11,6 @@ resources: apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: kube-system -metadata: - name: flux-webhook -resources: - - flux/webhook-service.yaml - - flux/webhook-route.yaml - - flux/webhook-sealedsecret.yaml - - flux/webhook-receiver.yaml ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: kube-system metadata: name: traefik resources: diff --git a/apps/flux/app.yaml b/apps/flux/app.yaml new file mode 100644 index 0000000..f522aba --- /dev/null +++ b/apps/flux/app.yaml @@ -0,0 +1,10 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: kube-system +metadata: + name: flux-webhook +resources: + - flux/webhook-service.yaml + - flux/webhook-route.yaml + - flux/webhook-sealedsecret.yaml + - flux/webhook-receiver.yaml diff --git a/apps/flux/webhook-receiver.yaml b/apps/flux/app/webhook-receiver.yaml similarity index 100% rename from apps/flux/webhook-receiver.yaml rename to apps/flux/app/webhook-receiver.yaml diff --git a/apps/flux/webhook-route.yaml b/apps/flux/app/webhook-route.yaml similarity index 100% rename from apps/flux/webhook-route.yaml rename to apps/flux/app/webhook-route.yaml diff --git a/apps/flux/webhook-sealedsecret.yaml b/apps/flux/app/webhook-sealedsecret.yaml similarity index 100% rename from apps/flux/webhook-sealedsecret.yaml rename to apps/flux/app/webhook-sealedsecret.yaml diff --git a/cluster/apps.yaml b/cluster/apps.yaml index 1ab269f..e5a589d 100644 --- a/cluster/apps.yaml +++ b/cluster/apps.yaml @@ -12,3 +12,18 @@ spec: prune: true wait: true timeout: 5m0s +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: apps-flux + namespace: flux-system +spec: + interval: 5m + sourceRef: + kind: GitRepository + name: flux-system + path: ./apps/flux + prune: true + wait: true + timeout: 5m0s