diff --git a/README.md b/README.md index 557fabf..a27385a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ## Homelab + ## GitOps A set of "best practices" where the entire code delivery process is controlled via Git, including infrastructure and application definition as code and automation to complete updates and rollbacks. @@ -49,3 +50,12 @@ Block Storage from NAS Distributed Storage from: - Longhorn + + +# True NAS key +1-ndzlY0C6o2KW9DJHnjTcjXi49VEFgDp5Up8GZ7FXmgNoU7LNwwI7MMrk2WbI6o5J + +## NFS +Via NAS for Files, like photos, videos, etc... +## ISCS +Via NAS for Databases diff --git a/cmd/apps/main.go b/cmd/apps/main.go index a8099a5..acac11a 100644 --- a/cmd/apps/main.go +++ b/cmd/apps/main.go @@ -21,21 +21,13 @@ func main() { err := flux_stack.MarshalYamlFlat(root.FLUX_CLUSTER_HYDRA_PATH) assertNoErr(err) - hydra_monitoring := map[string]stack.Stack{ - "controllers": monitoring.Controllers(), + hydra_infrastructure := map[string]stack.Stack{ + "monitoring": monitoring.Stack(), + "longhorn": longhorn.Stack(), } - for name, s := range hydra_monitoring { - fmt.Printf("Monitoring STACK: %s\n", name) - err = s.MarshalYaml(root.FLUX_INFRA_HYDRA_PATH + "/monitoring") - assertNoErr(err) - } - - hydra_longhorn := map[string]stack.Stack{ - "controllers": longhorn.Controllers(), - } - for name, s := range hydra_longhorn { - fmt.Printf("Longhorn STACK: %s\n", name) - err = s.MarshalYaml(root.FLUX_INFRA_HYDRA_PATH + "/longhorn") + for name, s := range hydra_infrastructure { + fmt.Printf("STACK: %s\n", name) + err = s.MarshalYaml(root.FLUX_INFRA_HYDRA_PATH) assertNoErr(err) } diff --git a/infrastructure/hydra/longhorn/controllers/longhorn-stack.yaml b/infrastructure/hydra/longhorn/longhorn-stack.yaml similarity index 100% rename from infrastructure/hydra/longhorn/controllers/longhorn-stack.yaml rename to infrastructure/hydra/longhorn/longhorn-stack.yaml diff --git a/infrastructure/hydra/longhorn/controllers/namespace.yaml b/infrastructure/hydra/longhorn/namespace.yaml similarity index 100% rename from infrastructure/hydra/longhorn/controllers/namespace.yaml rename to infrastructure/hydra/longhorn/namespace.yaml diff --git a/infrastructure/hydra/longhorn/controllers/release.yaml b/infrastructure/hydra/longhorn/release.yaml similarity index 100% rename from infrastructure/hydra/longhorn/controllers/release.yaml rename to infrastructure/hydra/longhorn/release.yaml diff --git a/infrastructure/hydra/monitoring/controllers/kube-prometheus-stack.yaml b/infrastructure/hydra/monitoring/kube-prometheus-stack.yaml similarity index 100% rename from infrastructure/hydra/monitoring/controllers/kube-prometheus-stack.yaml rename to infrastructure/hydra/monitoring/kube-prometheus-stack.yaml diff --git a/infrastructure/hydra/monitoring/controllers/namespace.yaml b/infrastructure/hydra/monitoring/namespace.yaml similarity index 100% rename from infrastructure/hydra/monitoring/controllers/namespace.yaml rename to infrastructure/hydra/monitoring/namespace.yaml diff --git a/infrastructure/hydra/monitoring/controllers/release.yaml b/infrastructure/hydra/monitoring/release.yaml similarity index 100% rename from infrastructure/hydra/monitoring/controllers/release.yaml rename to infrastructure/hydra/monitoring/release.yaml diff --git a/pkg/longhorn/longhorn.go b/pkg/longhorn/longhorn.go index f97d0a9..73363bb 100644 --- a/pkg/longhorn/longhorn.go +++ b/pkg/longhorn/longhorn.go @@ -18,13 +18,12 @@ func init() { meta = kube.NewMetadata(root.Longhorn, Namespace) } -func Controllers() stack.Stack { - s := stack.NewStack("controllers", map[string]any{ +func Stack() stack.Stack { + s := stack.NewStack("longhorn", map[string]any{ "namespace": Namespace, "longhorn-stack": LonghornHelmSource(), "release": LonghornHelmRelease(), }) - return s } diff --git a/pkg/monitoring/monitoring.go b/pkg/monitoring/monitoring.go index 3dcaf1c..ce0ba0d 100644 --- a/pkg/monitoring/monitoring.go +++ b/pkg/monitoring/monitoring.go @@ -21,8 +21,8 @@ func init() { meta = kube.NewMetadata(root.Monitoring, Namespace) } -func Controllers() stack.Stack { - s := stack.NewStack("controllers", map[string]any{ +func Stack() stack.Stack { + s := stack.NewStack("monitoring", map[string]any{ "namespace": Namespace, "kube-prometheus-stack": PrometheusHelmSource(), "release": PrometheusRelease(),