diff --git a/Taskfile.dist.yaml b/Taskfile.dist.yaml index e66053af..6068a1d1 100644 --- a/Taskfile.dist.yaml +++ b/Taskfile.dist.yaml @@ -38,6 +38,16 @@ tasks: silent: true cmds: ["task -l"] + gitconfig: + desc: Configure Git. + cmds: + - git config commit.gpgSign true + - git config pull.rebase true + - git config rebase.autostash true + - git config push.autoSetupRemote true + - git config remote.origin.pushurl git@github.com:JJGadgets/Biohazard.git + - test -d $HOME/../usr/etc/termux/ && git config gpg.program $HOME/../usr/bin/okc-gpg || true + n: desc: Create new folder and file within new folder at the same time. vars: diff --git a/kube/clusters/biohazard/flux/flux-repo.yaml b/kube/clusters/biohazard/flux/flux-repo.yaml index a4799945..c1aa3521 100644 --- a/kube/clusters/biohazard/flux/flux-repo.yaml +++ b/kube/clusters/biohazard/flux/flux-repo.yaml @@ -122,6 +122,16 @@ spec: version: v1 kind: Kustomization labelSelector: kustomization.flux.home.arpa/default notin (false) + - patch: | + - op: add + path: /spec/dependsOn/- + value: + name: zzz-flux-repos-helm + target: + group: kustomize.toolkit.fluxcd.io + version: v1 + kind: Kustomization + labelSelector: kustomization.flux.home.arpa/default notin (false) - patch: |- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization diff --git a/kube/clusters/biohazard/flux/kustomization.yaml b/kube/clusters/biohazard/flux/kustomization.yaml index a0c5c546..509c9c57 100644 --- a/kube/clusters/biohazard/flux/kustomization.yaml +++ b/kube/clusters/biohazard/flux/kustomization.yaml @@ -7,7 +7,7 @@ resources: - ../config/ - flux-install.yaml - flux-repo.yaml - - ../../../repos/ + - ../../../repos/flux/ - ../../../deploy/core/_networking/cilium/ - ../../../deploy/core/_networking/multus/ - ../../../deploy/core/_networking/tailscale/ diff --git a/kube/clusters/nuclear/flux/kustomization.yaml b/kube/clusters/nuclear/flux/kustomization.yaml index c37649de..579394e9 100644 --- a/kube/clusters/nuclear/flux/kustomization.yaml +++ b/kube/clusters/nuclear/flux/kustomization.yaml @@ -7,7 +7,7 @@ resources: - ../config/ - flux-install.yaml - flux-repo.yaml - - ../../../repos/ + - ../../../repos/flux/ - ../../../deploy/core/_networking/cilium/ - ../../../deploy/core/kyverno/_deps/ - ../../../deploy/core/kyverno/ diff --git a/kube/deploy/core/_networking/cilium/kustomization.yaml b/kube/deploy/core/_networking/cilium/kustomization.yaml index fc69935c..70a77029 100644 --- a/kube/deploy/core/_networking/cilium/kustomization.yaml +++ b/kube/deploy/core/_networking/cilium/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/deploy/core/_networking/multus/kustomization.yaml b/kube/deploy/core/_networking/multus/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/_networking/multus/kustomization.yaml +++ b/kube/deploy/core/_networking/multus/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/_networking/tailscale/kustomization.yaml b/kube/deploy/core/_networking/tailscale/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/_networking/tailscale/kustomization.yaml +++ b/kube/deploy/core/_networking/tailscale/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/db/pg/kustomization.yaml b/kube/deploy/core/db/pg/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/db/pg/kustomization.yaml +++ b/kube/deploy/core/db/pg/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/dns/external-dns/kustomization.yaml b/kube/deploy/core/dns/external-dns/kustomization.yaml index 04f7071c..593ffe6f 100644 --- a/kube/deploy/core/dns/external-dns/kustomization.yaml +++ b/kube/deploy/core/dns/external-dns/kustomization.yaml @@ -3,6 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - crds.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/deploy/core/dns/internal/k8s-gateway/kustomization.yaml b/kube/deploy/core/dns/internal/k8s-gateway/kustomization.yaml index fc69935c..70a77029 100644 --- a/kube/deploy/core/dns/internal/k8s-gateway/kustomization.yaml +++ b/kube/deploy/core/dns/internal/k8s-gateway/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/deploy/core/hardware/intel-device-plugins/kustomization.yaml b/kube/deploy/core/hardware/intel-device-plugins/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/hardware/intel-device-plugins/kustomization.yaml +++ b/kube/deploy/core/hardware/intel-device-plugins/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/hardware/node-feature-discovery/kustomization.yaml b/kube/deploy/core/hardware/node-feature-discovery/kustomization.yaml index fc69935c..70a77029 100644 --- a/kube/deploy/core/hardware/node-feature-discovery/kustomization.yaml +++ b/kube/deploy/core/hardware/node-feature-discovery/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/deploy/core/ingress/external-proxy-x/kustomization.yaml b/kube/deploy/core/ingress/external-proxy-x/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/ingress/external-proxy-x/kustomization.yaml +++ b/kube/deploy/core/ingress/external-proxy-x/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/ingress/ingress-nginx/kustomization.yaml b/kube/deploy/core/ingress/ingress-nginx/kustomization.yaml index fc69935c..70a77029 100644 --- a/kube/deploy/core/ingress/ingress-nginx/kustomization.yaml +++ b/kube/deploy/core/ingress/ingress-nginx/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/deploy/core/kyverno/kustomization.yaml b/kube/deploy/core/kyverno/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/kyverno/kustomization.yaml +++ b/kube/deploy/core/kyverno/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/monitoring/_deps/kustomization.yaml b/kube/deploy/core/monitoring/_deps/kustomization.yaml index eb2a5b1b..9e7cd6bd 100644 --- a/kube/deploy/core/monitoring/_deps/kustomization.yaml +++ b/kube/deploy/core/monitoring/_deps/kustomization.yaml @@ -4,6 +4,4 @@ kind: Kustomization resources: - ns.yaml - _crds-prometheus.yaml - - prometheus-community-charts.yaml - - repo-grafana.yaml - netpol.yaml diff --git a/kube/deploy/core/monitoring/metrics-server/kustomization.yaml b/kube/deploy/core/monitoring/metrics-server/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/monitoring/metrics-server/kustomization.yaml +++ b/kube/deploy/core/monitoring/metrics-server/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/secrets/external-secrets/kustomization.yaml b/kube/deploy/core/secrets/external-secrets/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/secrets/external-secrets/kustomization.yaml +++ b/kube/deploy/core/secrets/external-secrets/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/spegel/kustomization.yaml b/kube/deploy/core/spegel/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/spegel/kustomization.yaml +++ b/kube/deploy/core/spegel/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/storage/csi-driver-nfs/kustomization.yaml b/kube/deploy/core/storage/csi-driver-nfs/kustomization.yaml index eab801a8..70a77029 100644 --- a/kube/deploy/core/storage/csi-driver-nfs/kustomization.yaml +++ b/kube/deploy/core/storage/csi-driver-nfs/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/storage/democratic-csi/_deps/kustomization.yaml b/kube/deploy/core/storage/democratic-csi/_deps/kustomization.yaml index cb14159f..8a167488 100644 --- a/kube/deploy/core/storage/democratic-csi/_deps/kustomization.yaml +++ b/kube/deploy/core/storage/democratic-csi/_deps/kustomization.yaml @@ -3,4 +3,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml diff --git a/kube/deploy/core/storage/rook-ceph/kustomization.yaml b/kube/deploy/core/storage/rook-ceph/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/storage/rook-ceph/kustomization.yaml +++ b/kube/deploy/core/storage/rook-ceph/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/storage/volsync/kustomization.yaml b/kube/deploy/core/storage/volsync/kustomization.yaml index ed061416..5eeb2657 100644 --- a/kube/deploy/core/storage/volsync/kustomization.yaml +++ b/kube/deploy/core/storage/volsync/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - ks.yaml diff --git a/kube/deploy/core/tls/cert-manager/kustomization.yaml b/kube/deploy/core/tls/cert-manager/kustomization.yaml index 04f7071c..593ffe6f 100644 --- a/kube/deploy/core/tls/cert-manager/kustomization.yaml +++ b/kube/deploy/core/tls/cert-manager/kustomization.yaml @@ -3,6 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ns.yaml - - repo.yaml - crds.yaml - - ks.yaml \ No newline at end of file + - ks.yaml diff --git a/kube/repos/helm/app-template/helmrepo.yaml b/kube/repos/flux/helm/app-template/helmrepo.yaml similarity index 100% rename from kube/repos/helm/app-template/helmrepo.yaml rename to kube/repos/flux/helm/app-template/helmrepo.yaml diff --git a/kube/deploy/core/tls/cert-manager/repo.yaml b/kube/repos/flux/helm/cert-manager.yaml similarity index 100% rename from kube/deploy/core/tls/cert-manager/repo.yaml rename to kube/repos/flux/helm/cert-manager.yaml diff --git a/kube/deploy/core/_networking/cilium/repo.yaml b/kube/repos/flux/helm/cilium.yaml similarity index 100% rename from kube/deploy/core/_networking/cilium/repo.yaml rename to kube/repos/flux/helm/cilium.yaml diff --git a/kube/deploy/core/db/pg/repo.yaml b/kube/repos/flux/helm/crunchydata.yaml similarity index 100% rename from kube/deploy/core/db/pg/repo.yaml rename to kube/repos/flux/helm/crunchydata.yaml diff --git a/kube/deploy/core/storage/csi-driver-nfs/repo.yaml b/kube/repos/flux/helm/csi-driver-nfs.yaml similarity index 100% rename from kube/deploy/core/storage/csi-driver-nfs/repo.yaml rename to kube/repos/flux/helm/csi-driver-nfs.yaml diff --git a/kube/deploy/core/storage/democratic-csi/_deps/repo.yaml b/kube/repos/flux/helm/democratic-csi.yaml similarity index 100% rename from kube/deploy/core/storage/democratic-csi/_deps/repo.yaml rename to kube/repos/flux/helm/democratic-csi.yaml diff --git a/kube/deploy/core/dns/external-dns/repo.yaml b/kube/repos/flux/helm/external-dns.yaml similarity index 100% rename from kube/deploy/core/dns/external-dns/repo.yaml rename to kube/repos/flux/helm/external-dns.yaml diff --git a/kube/deploy/core/secrets/external-secrets/repo.yaml b/kube/repos/flux/helm/external-secrets.yaml similarity index 100% rename from kube/deploy/core/secrets/external-secrets/repo.yaml rename to kube/repos/flux/helm/external-secrets.yaml diff --git a/kube/deploy/core/monitoring/_deps/repo-grafana.yaml b/kube/repos/flux/helm/grafana.yaml similarity index 100% rename from kube/deploy/core/monitoring/_deps/repo-grafana.yaml rename to kube/repos/flux/helm/grafana.yaml diff --git a/kube/deploy/core/ingress/external-proxy-x/repo.yaml b/kube/repos/flux/helm/haproxy.yaml similarity index 100% rename from kube/deploy/core/ingress/external-proxy-x/repo.yaml rename to kube/repos/flux/helm/haproxy.yaml diff --git a/kube/deploy/core/ingress/ingress-nginx/repo.yaml b/kube/repos/flux/helm/ingress-nginx.yaml similarity index 100% rename from kube/deploy/core/ingress/ingress-nginx/repo.yaml rename to kube/repos/flux/helm/ingress-nginx.yaml diff --git a/kube/deploy/core/hardware/intel-device-plugins/repo.yaml b/kube/repos/flux/helm/intel.yaml similarity index 100% rename from kube/deploy/core/hardware/intel-device-plugins/repo.yaml rename to kube/repos/flux/helm/intel.yaml diff --git a/kube/deploy/core/dns/internal/k8s-gateway/repo.yaml b/kube/repos/flux/helm/k8s-gateway.yaml similarity index 100% rename from kube/deploy/core/dns/internal/k8s-gateway/repo.yaml rename to kube/repos/flux/helm/k8s-gateway.yaml diff --git a/kube/deploy/core/kyverno/repo.yaml b/kube/repos/flux/helm/kyverno.yaml similarity index 100% rename from kube/deploy/core/kyverno/repo.yaml rename to kube/repos/flux/helm/kyverno.yaml diff --git a/kube/deploy/core/monitoring/metrics-server/repo.yaml b/kube/repos/flux/helm/metrics-server.yaml similarity index 100% rename from kube/deploy/core/monitoring/metrics-server/repo.yaml rename to kube/repos/flux/helm/metrics-server.yaml diff --git a/kube/deploy/core/_networking/multus/repo.yaml b/kube/repos/flux/helm/multus.yaml similarity index 100% rename from kube/deploy/core/_networking/multus/repo.yaml rename to kube/repos/flux/helm/multus.yaml diff --git a/kube/deploy/core/hardware/node-feature-discovery/repo.yaml b/kube/repos/flux/helm/node-feature-discovery.yaml similarity index 100% rename from kube/deploy/core/hardware/node-feature-discovery/repo.yaml rename to kube/repos/flux/helm/node-feature-discovery.yaml diff --git a/kube/deploy/core/monitoring/_deps/prometheus-community-charts.yaml b/kube/repos/flux/helm/prometheus-community.yaml similarity index 100% rename from kube/deploy/core/monitoring/_deps/prometheus-community-charts.yaml rename to kube/repos/flux/helm/prometheus-community.yaml diff --git a/kube/deploy/core/storage/rook-ceph/repo.yaml b/kube/repos/flux/helm/rook-ceph.yaml similarity index 100% rename from kube/deploy/core/storage/rook-ceph/repo.yaml rename to kube/repos/flux/helm/rook-ceph.yaml diff --git a/kube/deploy/core/spegel/repo.yaml b/kube/repos/flux/helm/spegel.yaml similarity index 100% rename from kube/deploy/core/spegel/repo.yaml rename to kube/repos/flux/helm/spegel.yaml diff --git a/kube/repos/helm/stakater/helmrepo.yaml b/kube/repos/flux/helm/stakater/helmrepo.yaml similarity index 100% rename from kube/repos/helm/stakater/helmrepo.yaml rename to kube/repos/flux/helm/stakater/helmrepo.yaml diff --git a/kube/deploy/core/_networking/tailscale/repo.yaml b/kube/repos/flux/helm/tailscale.yaml similarity index 100% rename from kube/deploy/core/_networking/tailscale/repo.yaml rename to kube/repos/flux/helm/tailscale.yaml diff --git a/kube/deploy/core/storage/volsync/repo.yaml b/kube/repos/flux/helm/volsync.yaml similarity index 100% rename from kube/deploy/core/storage/volsync/repo.yaml rename to kube/repos/flux/helm/volsync.yaml diff --git a/kube/repos/flux/ks.yaml b/kube/repos/flux/ks.yaml new file mode 100644 index 00000000..a6249dbe --- /dev/null +++ b/kube/repos/flux/ks.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: zzz-flux-repos-helm + namespace: flux-system +spec: + path: ./kube/repos/flux/helm + dependsOn: [] + wait: true + prune: true diff --git a/kube/repos/kustomization.yaml b/kube/repos/flux/kustomization.yaml similarity index 52% rename from kube/repos/kustomization.yaml rename to kube/repos/flux/kustomization.yaml index 941b3c12..70a77029 100644 --- a/kube/repos/kustomization.yaml +++ b/kube/repos/flux/kustomization.yaml @@ -1,5 +1,5 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helm/app-template/helmrepo.yaml - - helm/stakater/helmrepo.yaml + - ks.yaml