From 097882e616df5065e75d5f700bd014834b07aec3 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 22 Sep 2023 23:52:19 -0500 Subject: [PATCH] Updates to rook-ceph devices and yaml schemas. --- kubernetes/apps/rook-ceph/kustomization.yaml | 1 + .../rook-ceph/cluster/helmrelease.yaml | 80 ++----------------- kubernetes/apps/rook-ceph/rook-ceph/ks.yaml | 3 + .../rook-ceph/operator/helmrelease.yaml | 1 + .../security/crowdsec/app/helmrelease.yaml | 1 + .../security/crowdsec/app/kustomization.yaml | 1 + kubernetes/apps/security/crowdsec/ks.yaml | 1 + 7 files changed, 15 insertions(+), 73 deletions(-) diff --git a/kubernetes/apps/rook-ceph/kustomization.yaml b/kubernetes/apps/rook-ceph/kustomization.yaml index 37a04a4..3637a4f 100644 --- a/kubernetes/apps/rook-ceph/kustomization.yaml +++ b/kubernetes/apps/rook-ceph/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/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml index 9554dc2..91bc6ff 100644 --- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: @@ -52,15 +53,15 @@ spec: config: osdsPerDevice: "1" nodes: - - name: "varda" + - name: "valinor-1" devices: - - name: /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0R801309 - - name: "manwe" + - name: /dev/disk/by-id/scsi-0HC_Volume_37231496 + - name: "valinor-2" devices: - - name: /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0R801843 - - name: "aule" + - name: /dev/disk/by-id/scsi-0HC_Volume_37231521 + - name: "valinor-3" devices: - - name: /dev/disk/by-id/nvme-SAMSUNG_MZQL2960HCJR-00A07_S64FNE0RA01210 + - name: /dev/disk/by-id/scsi-0HC_Volume_37231596 ingress: ingressClassName: "nginx" @@ -100,70 +101,3 @@ spec: csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph csi.storage.k8s.io/fstype: ext4 - - cephFileSystems: - - name: ceph-filesystem - spec: - metadataPool: - replicated: - size: 3 - dataPools: - - failureDomain: host - replicated: - size: 3 - metadataServer: - activeCount: 1 - activeStandby: true - resources: - requests: - cpu: "1000m" - memory: "4Gi" - limits: - memory: "4Gi" - storageClass: - enabled: true - isDefault: false - name: ceph-filesystem - reclaimPolicy: Delete - allowVolumeExpansion: true - mountOptions: [] - parameters: - csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner - csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph - csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner - csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph - csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node - csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph - csi.storage.k8s.io/fstype: ext4 - - cephObjectStores: - - name: ceph-objectstore - spec: - metadataPool: - failureDomain: host - replicated: - size: 3 - dataPool: - failureDomain: host - erasureCoded: - dataChunks: 2 - codingChunks: 1 - preservePoolsOnDelete: true - gateway: - port: 80 - resources: - requests: - cpu: 1000m - memory: 1Gi - limits: - memory: 2Gi - instances: 2 - healthCheck: - bucket: - interval: 60s - storageClass: - enabled: true - name: ceph-bucket - reclaimPolicy: Delete - parameters: - region: us-east-1 diff --git a/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml index db8ba65..7bdde71 100644 --- a/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/ks.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -15,6 +16,7 @@ spec: name: valinor wait: true --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -33,6 +35,7 @@ spec: dependsOn: - name: cluster-apps-rook-ceph --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: diff --git a/kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml index b899d1d..bd6d963 100644 --- a/kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/operator/helmrelease.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/kubernetes/apps/security/crowdsec/app/helmrelease.yaml b/kubernetes/apps/security/crowdsec/app/helmrelease.yaml index 85d2e68..e5b0f28 100644 --- a/kubernetes/apps/security/crowdsec/app/helmrelease.yaml +++ b/kubernetes/apps/security/crowdsec/app/helmrelease.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/helmrelease-helm-v2beta1.json apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease metadata: diff --git a/kubernetes/apps/security/crowdsec/app/kustomization.yaml b/kubernetes/apps/security/crowdsec/app/kustomization.yaml index dbd58aa..5a7bd4d 100644 --- a/kubernetes/apps/security/crowdsec/app/kustomization.yaml +++ b/kubernetes/apps/security/crowdsec/app/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: security diff --git a/kubernetes/apps/security/crowdsec/ks.yaml b/kubernetes/apps/security/crowdsec/ks.yaml index 2b66958..a971cd4 100644 --- a/kubernetes/apps/security/crowdsec/ks.yaml +++ b/kubernetes/apps/security/crowdsec/ks.yaml @@ -1,4 +1,5 @@ --- +# yaml-language-server: $schema=https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/main/kustomization-kustomize-v1.json apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: