diff --git a/casa-limbosolutions-com/deploy/flux/.env.d/.gitignore b/cluster/monitoring/.env.d/.gitignore similarity index 100% rename from casa-limbosolutions-com/deploy/flux/.env.d/.gitignore rename to cluster/monitoring/.env.d/.gitignore diff --git a/cluster/monitoring/alloy-global-sync.yaml b/cluster/monitoring/alloy-global-sync.yaml new file mode 100644 index 0000000..65e2e2a --- /dev/null +++ b/cluster/monitoring/alloy-global-sync.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: alloy-global +spec: + interval: 1m + sourceRef: + kind: GitRepository + name: casa + namespace: casa-limbosolutions-com + path: services/monitoring/deploy/alloy + prune: true + decryption: + provider: sops + secretRef: + name: flux-sops-age diff --git a/cluster/monitoring/kustomization.yaml b/cluster/monitoring/kustomization.yaml new file mode 100644 index 0000000..93b700a --- /dev/null +++ b/cluster/monitoring/kustomization.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: monitoring +resources: + - alloy-global-sync.yaml + - myinfra-kubernetes-shared-monitoring-sync.yaml +secretGenerator: + - name: flux-sops-age + files: + - "age.agekey=./.env.d/age.agekey" +generatorOptions: + disableNameSuffixHash: true \ No newline at end of file diff --git a/cluster/monitoring/myinfra-kubernetes-shared-monitoring-sync.yaml b/cluster/monitoring/myinfra-kubernetes-shared-monitoring-sync.yaml new file mode 100644 index 0000000..951e9df --- /dev/null +++ b/cluster/monitoring/myinfra-kubernetes-shared-monitoring-sync.yaml @@ -0,0 +1,12 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: myinfra-kubernetes-shared-monitoring +spec: + interval: 1m + sourceRef: + kind: GitRepository + name: myinfra-kubernetes-shared + namespace: casa-limbosolutions-com + path: monitoring/overlays/complete-stack + prune: true \ No newline at end of file diff --git a/casa-limbosolutions-com/README.md b/cluster/repositories/casa-limbosolutions-com/README.md similarity index 100% rename from casa-limbosolutions-com/README.md rename to cluster/repositories/casa-limbosolutions-com/README.md diff --git a/casa-limbosolutions-com/certificate.yaml b/cluster/repositories/casa-limbosolutions-com/certificate.yaml similarity index 100% rename from casa-limbosolutions-com/certificate.yaml rename to cluster/repositories/casa-limbosolutions-com/certificate.yaml diff --git a/cluster/repositories/casa-limbosolutions-com/deploy/flux/.env.d/.gitignore b/cluster/repositories/casa-limbosolutions-com/deploy/flux/.env.d/.gitignore new file mode 100644 index 0000000..d29675e --- /dev/null +++ b/cluster/repositories/casa-limbosolutions-com/deploy/flux/.env.d/.gitignore @@ -0,0 +1,2 @@ +** +!.gitignore \ No newline at end of file diff --git a/casa-limbosolutions-com/deploy/flux/git-repo.yaml b/cluster/repositories/casa-limbosolutions-com/deploy/flux/git-repo.yaml similarity index 100% rename from casa-limbosolutions-com/deploy/flux/git-repo.yaml rename to cluster/repositories/casa-limbosolutions-com/deploy/flux/git-repo.yaml diff --git a/casa-limbosolutions-com/deploy/flux/kustomization.yaml b/cluster/repositories/casa-limbosolutions-com/deploy/flux/kustomization.yaml similarity index 100% rename from casa-limbosolutions-com/deploy/flux/kustomization.yaml rename to cluster/repositories/casa-limbosolutions-com/deploy/flux/kustomization.yaml diff --git a/cluster/repositories/myinfra-kubernetes-shared/git-repo.yaml b/cluster/repositories/myinfra-kubernetes-shared/git-repo.yaml new file mode 100644 index 0000000..781bc67 --- /dev/null +++ b/cluster/repositories/myinfra-kubernetes-shared/git-repo.yaml @@ -0,0 +1,9 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: GitRepository +metadata: + name: myinfra-kubernetes-shared +spec: + interval: 1m0s + url: https://git.limbosolutions.com/myLimbo/myinfra.kubernetes.shared.git + ref: + branch: main diff --git a/cluster/repositories/myinfra-kubernetes-shared/kustomization.yaml b/cluster/repositories/myinfra-kubernetes-shared/kustomization.yaml new file mode 100644 index 0000000..cd48418 --- /dev/null +++ b/cluster/repositories/myinfra-kubernetes-shared/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: casa-limbosolutions-com +resources: + - git-repo.yaml +generatorOptions: + disableNameSuffixHash: true \ No newline at end of file diff --git a/services/monitoring/README.md b/services/monitoring/README.md index 4748941..aa901bb 100644 --- a/services/monitoring/README.md +++ b/services/monitoring/README.md @@ -5,7 +5,7 @@ **Encrypt global secrets:** ``` bash -sops -e deploy/alloy/global/secrets.dec.yaml > deploy/alloy/global/secrets.yaml +sops -e deploy/alloy-global/secrets.dec.yaml > deploy/alloy-global/secrets.yaml ``` [Official Helm chart default values.yaml](https://github.com/grafana/alloy/blob/main/operations/helm/charts/alloy/values.yaml)