From 8039231010e5bc7da8e8d30af01908b85959f81b Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Sun, 3 Dec 2023 19:59:31 -0600 Subject: [PATCH] Archiving crowdsec, democratic csi local path, and adding rook-ceph back. --- archive/{ => security}/crowdsec/app/helmrelease.yaml | 0 archive/{ => security}/crowdsec/app/kustomization.yaml | 0 archive/{ => security}/crowdsec/ks.yaml | 0 .../apps => archive}/system/democratic-csi/ks.yaml | 0 .../system/democratic-csi/local-path/helmrelease.yaml | 0 .../system/democratic-csi/local-path/kustomization.yaml | 0 {archive => kubernetes/apps}/rook-ceph/kustomization.yaml | 0 {archive => kubernetes/apps}/rook-ceph/namespace.yaml | 1 - .../add-ons/dashboard/ceph-cluster-dashboard.json | 0 .../rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json | 0 .../rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json | 0 .../rook-ceph/add-ons/dashboard/kustomization.yaml | 0 .../apps}/rook-ceph/rook-ceph/add-ons/kustomization.yaml | 1 + .../apps}/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml | 0 .../apps}/rook-ceph/rook-ceph/cluster/helmrelease.yaml | 8 +------- .../apps}/rook-ceph/rook-ceph/cluster/ingress.yaml | 0 .../apps}/rook-ceph/rook-ceph/cluster/kustomization.yaml | 3 ++- {archive => kubernetes/apps}/rook-ceph/rook-ceph/ks.yaml | 0 .../apps}/rook-ceph/rook-ceph/operator/helmrelease.yaml | 0 .../apps}/rook-ceph/rook-ceph/operator/kustomization.yaml | 1 + kubernetes/apps/system/kustomization.yaml | 1 - 21 files changed, 5 insertions(+), 10 deletions(-) rename archive/{ => security}/crowdsec/app/helmrelease.yaml (100%) rename archive/{ => security}/crowdsec/app/kustomization.yaml (100%) rename archive/{ => security}/crowdsec/ks.yaml (100%) rename {kubernetes/apps => archive}/system/democratic-csi/ks.yaml (100%) rename {kubernetes/apps => archive}/system/democratic-csi/local-path/helmrelease.yaml (100%) rename {kubernetes/apps => archive}/system/democratic-csi/local-path/kustomization.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/kustomization.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/namespace.yaml (72%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/dashboard/ceph-cluster-dashboard.json (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/dashboard/kustomization.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/kustomization.yaml (60%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/cluster/helmrelease.yaml (94%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/cluster/ingress.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/cluster/kustomization.yaml (50%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/ks.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/operator/helmrelease.yaml (100%) rename {archive => kubernetes/apps}/rook-ceph/rook-ceph/operator/kustomization.yaml (60%) diff --git a/archive/crowdsec/app/helmrelease.yaml b/archive/security/crowdsec/app/helmrelease.yaml similarity index 100% rename from archive/crowdsec/app/helmrelease.yaml rename to archive/security/crowdsec/app/helmrelease.yaml diff --git a/archive/crowdsec/app/kustomization.yaml b/archive/security/crowdsec/app/kustomization.yaml similarity index 100% rename from archive/crowdsec/app/kustomization.yaml rename to archive/security/crowdsec/app/kustomization.yaml diff --git a/archive/crowdsec/ks.yaml b/archive/security/crowdsec/ks.yaml similarity index 100% rename from archive/crowdsec/ks.yaml rename to archive/security/crowdsec/ks.yaml diff --git a/kubernetes/apps/system/democratic-csi/ks.yaml b/archive/system/democratic-csi/ks.yaml similarity index 100% rename from kubernetes/apps/system/democratic-csi/ks.yaml rename to archive/system/democratic-csi/ks.yaml diff --git a/kubernetes/apps/system/democratic-csi/local-path/helmrelease.yaml b/archive/system/democratic-csi/local-path/helmrelease.yaml similarity index 100% rename from kubernetes/apps/system/democratic-csi/local-path/helmrelease.yaml rename to archive/system/democratic-csi/local-path/helmrelease.yaml diff --git a/kubernetes/apps/system/democratic-csi/local-path/kustomization.yaml b/archive/system/democratic-csi/local-path/kustomization.yaml similarity index 100% rename from kubernetes/apps/system/democratic-csi/local-path/kustomization.yaml rename to archive/system/democratic-csi/local-path/kustomization.yaml diff --git a/archive/rook-ceph/kustomization.yaml b/kubernetes/apps/rook-ceph/kustomization.yaml similarity index 100% rename from archive/rook-ceph/kustomization.yaml rename to kubernetes/apps/rook-ceph/kustomization.yaml diff --git a/archive/rook-ceph/namespace.yaml b/kubernetes/apps/rook-ceph/namespace.yaml similarity index 72% rename from archive/rook-ceph/namespace.yaml rename to kubernetes/apps/rook-ceph/namespace.yaml index d31a3d7..4f4d74a 100644 --- a/archive/rook-ceph/namespace.yaml +++ b/kubernetes/apps/rook-ceph/namespace.yaml @@ -5,4 +5,3 @@ metadata: name: rook-ceph labels: kustomize.toolkit.fluxcd.io/prune: disabled - goldilocks.fairwinds.com/enabled: "true" diff --git a/archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-cluster-dashboard.json b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-cluster-dashboard.json similarity index 100% rename from archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-cluster-dashboard.json rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-cluster-dashboard.json diff --git a/archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json similarity index 100% rename from archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-osd-dashboard.json diff --git a/archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json similarity index 100% rename from archive/rook-ceph/rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/ceph-pools-dashboard.json diff --git a/archive/rook-ceph/rook-ceph/add-ons/dashboard/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/kustomization.yaml similarity index 100% rename from archive/rook-ceph/rook-ceph/add-ons/dashboard/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/dashboard/kustomization.yaml diff --git a/archive/rook-ceph/rook-ceph/add-ons/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/kustomization.yaml similarity index 60% rename from archive/rook-ceph/rook-ceph/add-ons/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/kustomization.yaml index 3f7dc8e..183c234 100644 --- a/archive/rook-ceph/rook-ceph/add-ons/kustomization.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/kustomization.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: diff --git a/archive/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml b/kubernetes/apps/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml similarity index 100% rename from archive/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/add-ons/servicemonitor.yaml diff --git a/archive/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml similarity index 94% rename from archive/rook-ceph/rook-ceph/cluster/helmrelease.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml index 76ce22c..47d6f7a 100644 --- a/archive/rook-ceph/rook-ceph/cluster/helmrelease.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml @@ -55,15 +55,9 @@ spec: config: osdsPerDevice: "1" nodes: - - name: "aule" + - name: "nienna" devices: - name: /dev/disk/by-id/scsi-0HC_Volume_37460833 - - name: "eonwe" - devices: - - name: /dev/disk/by-id/scsi-0HC_Volume_37460887 - - name: "arlen" - devices: - - name: /dev/disk/by-id/scsi-0HC_Volume_37460897 - name: "orome" devices: - name: /dev/disk/by-id/scsi-0HC_Volume_37645333 diff --git a/archive/rook-ceph/rook-ceph/cluster/ingress.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/ingress.yaml similarity index 100% rename from archive/rook-ceph/rook-ceph/cluster/ingress.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/cluster/ingress.yaml diff --git a/archive/rook-ceph/rook-ceph/cluster/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml similarity index 50% rename from archive/rook-ceph/rook-ceph/cluster/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml index 2799937..d128f10 100644 --- a/archive/rook-ceph/rook-ceph/cluster/kustomization.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/kustomization.yaml @@ -1,6 +1,7 @@ --- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./helmrelease.yaml - - ./ingress.yaml + # - ./ingress.yaml diff --git a/archive/rook-ceph/rook-ceph/ks.yaml b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml similarity index 100% rename from archive/rook-ceph/rook-ceph/ks.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/ks.yaml diff --git a/archive/rook-ceph/rook-ceph/operator/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml similarity index 100% rename from archive/rook-ceph/rook-ceph/operator/helmrelease.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml diff --git a/archive/rook-ceph/rook-ceph/operator/kustomization.yaml b/kubernetes/apps/rook-ceph/rook-ceph/operator/kustomization.yaml similarity index 60% rename from archive/rook-ceph/rook-ceph/operator/kustomization.yaml rename to kubernetes/apps/rook-ceph/rook-ceph/operator/kustomization.yaml index 393f088..33a533a 100644 --- a/archive/rook-ceph/rook-ceph/operator/kustomization.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/operator/kustomization.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: rook-ceph diff --git a/kubernetes/apps/system/kustomization.yaml b/kubernetes/apps/system/kustomization.yaml index 128e427..2c93e4a 100644 --- a/kubernetes/apps/system/kustomization.yaml +++ b/kubernetes/apps/system/kustomization.yaml @@ -6,7 +6,6 @@ resources: # Pre Flux-Kustomizations - ./namespace.yaml # Flux-Kustomizations - - ./democratic-csi/ks.yaml - ./intel-device-plugins/ks.yaml - ./kubelet-csr-approver/ks.yaml - ./node-feature-discovery/ks.yaml