From 6304d195c2e2c80aafe0b7c673152980c969f65e Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Thu, 28 Jul 2022 09:05:57 +0200 Subject: Perhaps flux is happier if its called infrastructure? --- .../share/manifests/base-system/kustomization.yaml | 8 ------- .../share/manifests/base-system/namespace.yaml | 6 ------ .../releases/ingress-nginx/kustomization.yaml | 6 ------ .../releases/ingress-nginx/release.yaml | 25 ---------------------- .../base-system/releases/kustomization.yaml | 6 ------ .../base-system/sources/ingress-nginx.yaml | 10 --------- .../base-system/sources/kustomization.yaml | 6 ------ .../manifests/infrastructure/kustomization.yaml | 8 +++++++ .../share/manifests/infrastructure/namespace.yaml | 6 ++++++ .../releases/ingress-nginx/kustomization.yaml | 6 ++++++ .../releases/ingress-nginx/release.yaml | 25 ++++++++++++++++++++++ .../infrastructure/releases/kustomization.yaml | 6 ++++++ .../infrastructure/sources/ingress-nginx.yaml | 10 +++++++++ .../infrastructure/sources/kustomization.yaml | 6 ++++++ 14 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/kustomization.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/namespace.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/kustomization.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/release.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/releases/kustomization.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/sources/ingress-nginx.yaml delete mode 100644 playbooks.d/k3s-master/share/manifests/base-system/sources/kustomization.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/kustomization.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/release.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/releases/kustomization.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/sources/ingress-nginx.yaml create mode 100644 playbooks.d/k3s-master/share/manifests/infrastructure/sources/kustomization.yaml diff --git a/playbooks.d/k3s-master/share/manifests/base-system/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/base-system/kustomization.yaml deleted file mode 100644 index 17c2f31..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- namespace.yaml -- sources -- releases -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/namespace.yaml b/playbooks.d/k3s-master/share/manifests/base-system/namespace.yaml deleted file mode 100644 index 78d7ab7..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/namespace.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: base-system -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/kustomization.yaml deleted file mode 100644 index 3c7eaaa..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- release.yaml -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/release.yaml b/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/release.yaml deleted file mode 100644 index 457334a..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/releases/ingress-nginx/release.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: helm.toolkit.fluxcd.io/v2beta1 -kind: HelmRelease -metadata: - name: ingress-nginx - namespace: base-system -spec: - interval: 5m - chart: - spec: - chart: ingress-nginx - version: 4.2.0 - sourceRef: - kind: HelmRepository - name: ingress-nginx - namespace: flux-system - interval: 1m - values: - controller: - replicaCount: 1 - service: - ports: - http: 8080 - https: 8443 -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/releases/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/base-system/releases/kustomization.yaml deleted file mode 100644 index 859d840..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/releases/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ingress-nginx -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/sources/ingress-nginx.yaml b/playbooks.d/k3s-master/share/manifests/base-system/sources/ingress-nginx.yaml deleted file mode 100644 index cd006ac..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/sources/ingress-nginx.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: source.toolkit.fluxcd.io/v1beta2 -kind: HelmRepository -metadata: - name: ingress-nginx - namespace: flux-system -spec: - interval: 1m - url: https://kubernetes.github.io/ingress-nginx -... diff --git a/playbooks.d/k3s-master/share/manifests/base-system/sources/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/base-system/sources/kustomization.yaml deleted file mode 100644 index 2f7294a..0000000 --- a/playbooks.d/k3s-master/share/manifests/base-system/sources/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ingress-nginx.yaml -... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml new file mode 100644 index 0000000..17c2f31 --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/kustomization.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- namespace.yaml +- sources +- releases +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml new file mode 100644 index 0000000..78d7ab7 --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/namespace.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: base-system +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/kustomization.yaml new file mode 100644 index 0000000..3c7eaaa --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- release.yaml +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/release.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/release.yaml new file mode 100644 index 0000000..457334a --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/ingress-nginx/release.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: ingress-nginx + namespace: base-system +spec: + interval: 5m + chart: + spec: + chart: ingress-nginx + version: 4.2.0 + sourceRef: + kind: HelmRepository + name: ingress-nginx + namespace: flux-system + interval: 1m + values: + controller: + replicaCount: 1 + service: + ports: + http: 8080 + https: 8443 +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/releases/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/kustomization.yaml new file mode 100644 index 0000000..859d840 --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/releases/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ingress-nginx +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/sources/ingress-nginx.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/sources/ingress-nginx.yaml new file mode 100644 index 0000000..cd006ac --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/sources/ingress-nginx.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: HelmRepository +metadata: + name: ingress-nginx + namespace: flux-system +spec: + interval: 1m + url: https://kubernetes.github.io/ingress-nginx +... diff --git a/playbooks.d/k3s-master/share/manifests/infrastructure/sources/kustomization.yaml b/playbooks.d/k3s-master/share/manifests/infrastructure/sources/kustomization.yaml new file mode 100644 index 0000000..2f7294a --- /dev/null +++ b/playbooks.d/k3s-master/share/manifests/infrastructure/sources/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ingress-nginx.yaml +... -- cgit v1.1