From 3e5cf413d31e5ebe5098160528b81c1ec8660ea8 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 12 Feb 2025 17:02:11 +0100 Subject: [PATCH 01/42] empty commit --- flux/core/local-path-provisioner/kustomization.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flux/core/local-path-provisioner/kustomization.yml b/flux/core/local-path-provisioner/kustomization.yml index b632a809..9a8c7315 100644 --- a/flux/core/local-path-provisioner/kustomization.yml +++ b/flux/core/local-path-provisioner/kustomization.yml @@ -33,3 +33,5 @@ patches: name: local-path-storage labels: pod-security.kubernetes.io/enforce: privileged + + From 9fd13d29b1617b5ae3a7868cea64861670522d4e Mon Sep 17 00:00:00 2001 From: Enje Shakirova <166139731+enjenjenje@users.noreply.github.com> Date: Thu, 13 Feb 2025 01:47:37 +0100 Subject: [PATCH 02/42] chore: Openebs test (#124) --- flux/clusters/default/kustomization.yml | 1 + flux/core/linstor/kustomization.yml | 4 +++ flux/core/openebs-mayastor/kustomization.yml | 5 +++ flux/core/openebs-mayastor/release.yml | 22 ++++++++++++++ flux/core/openebs-mayastor/repository.yml | 10 ++++++ flux/core/openebs/kustomization.yml | 5 +++ flux/core/openebs/release.yml | 32 ++++++++++++++++++++ flux/core/openebs/repository.yml | 10 ++++++ 8 files changed, 89 insertions(+) create mode 100644 flux/core/linstor/kustomization.yml create mode 100644 flux/core/openebs-mayastor/kustomization.yml create mode 100644 flux/core/openebs-mayastor/release.yml create mode 100644 flux/core/openebs-mayastor/repository.yml create mode 100644 flux/core/openebs/kustomization.yml create mode 100644 flux/core/openebs/release.yml create mode 100644 flux/core/openebs/repository.yml diff --git a/flux/clusters/default/kustomization.yml b/flux/clusters/default/kustomization.yml index 42e85979..971a009d 100644 --- a/flux/clusters/default/kustomization.yml +++ b/flux/clusters/default/kustomization.yml @@ -4,3 +4,4 @@ resources: - ../../core/local-path-provisioner - ../../core/metrics-server - ../../core/kubelet-serving-cert-approver + - ../../core/openebs diff --git a/flux/core/linstor/kustomization.yml b/flux/core/linstor/kustomization.yml new file mode 100644 index 00000000..672aae1c --- /dev/null +++ b/flux/core/linstor/kustomization.yml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.7.1 diff --git a/flux/core/openebs-mayastor/kustomization.yml b/flux/core/openebs-mayastor/kustomization.yml new file mode 100644 index 00000000..d9d63633 --- /dev/null +++ b/flux/core/openebs-mayastor/kustomization.yml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - repository.yml + - release.yml diff --git a/flux/core/openebs-mayastor/release.yml b/flux/core/openebs-mayastor/release.yml new file mode 100644 index 00000000..5f3ed495 --- /dev/null +++ b/flux/core/openebs-mayastor/release.yml @@ -0,0 +1,22 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: openebs-mayastor + namespace: kube-system +spec: + interval: 5m + chart: + spec: + chart: mayastor + version: 2.7.3 + sourceRef: + name: openebs-mayastor + kind: HelmRepository + namespace: flux-system + values: + etcd: + replicaCount: 1 + csi: + node: + initContainers: + enabled: false diff --git a/flux/core/openebs-mayastor/repository.yml b/flux/core/openebs-mayastor/repository.yml new file mode 100644 index 00000000..8438331f --- /dev/null +++ b/flux/core/openebs-mayastor/repository.yml @@ -0,0 +1,10 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: openebs-mayastor + namespace: flux-system +spec: + interval: 5m + timeout: 3m + url: https://openebs.github.io/mayastor-extensions/ + diff --git a/flux/core/openebs/kustomization.yml b/flux/core/openebs/kustomization.yml new file mode 100644 index 00000000..d9d63633 --- /dev/null +++ b/flux/core/openebs/kustomization.yml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - repository.yml + - release.yml diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml new file mode 100644 index 00000000..78149cc9 --- /dev/null +++ b/flux/core/openebs/release.yml @@ -0,0 +1,32 @@ +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: openebs + namespace: kube-system +spec: + interval: 5m + chart: + spec: + chart: openebs + version: 4.1.3 + sourceRef: + name: openebs + kind: HelmRepository + namespace: flux-system + values: + mayastor: + csi: + node: + initContainers: + enabled: false + etcd: + replicaCount: 1 + engines: + replicated: + mayastor: + enabled: true + local: + lvm: + enabled: false + zfs: + enabled: false diff --git a/flux/core/openebs/repository.yml b/flux/core/openebs/repository.yml new file mode 100644 index 00000000..a2e67b44 --- /dev/null +++ b/flux/core/openebs/repository.yml @@ -0,0 +1,10 @@ +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: openebs + namespace: flux-system +spec: + interval: 5m + timeout: 3m + url: https://openebs.github.io/openebs + From 3c40ffb14e9eb2fd89ac5d212d954fd2d04db238 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Thu, 13 Feb 2025 13:39:37 +0100 Subject: [PATCH 03/42] cleanup --- flux/core/linstor/kustomization.yml | 4 ---- flux/core/openebs-mayastor/kustomization.yml | 5 ----- flux/core/openebs-mayastor/release.yml | 22 -------------------- flux/core/openebs-mayastor/repository.yml | 10 --------- 4 files changed, 41 deletions(-) delete mode 100644 flux/core/linstor/kustomization.yml delete mode 100644 flux/core/openebs-mayastor/kustomization.yml delete mode 100644 flux/core/openebs-mayastor/release.yml delete mode 100644 flux/core/openebs-mayastor/repository.yml diff --git a/flux/core/linstor/kustomization.yml b/flux/core/linstor/kustomization.yml deleted file mode 100644 index 672aae1c..00000000 --- a/flux/core/linstor/kustomization.yml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - https://github.com/piraeusdatastore/piraeus-operator//config/default?ref=v2.7.1 diff --git a/flux/core/openebs-mayastor/kustomization.yml b/flux/core/openebs-mayastor/kustomization.yml deleted file mode 100644 index d9d63633..00000000 --- a/flux/core/openebs-mayastor/kustomization.yml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - repository.yml - - release.yml diff --git a/flux/core/openebs-mayastor/release.yml b/flux/core/openebs-mayastor/release.yml deleted file mode 100644 index 5f3ed495..00000000 --- a/flux/core/openebs-mayastor/release.yml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: helm.toolkit.fluxcd.io/v2 -kind: HelmRelease -metadata: - name: openebs-mayastor - namespace: kube-system -spec: - interval: 5m - chart: - spec: - chart: mayastor - version: 2.7.3 - sourceRef: - name: openebs-mayastor - kind: HelmRepository - namespace: flux-system - values: - etcd: - replicaCount: 1 - csi: - node: - initContainers: - enabled: false diff --git a/flux/core/openebs-mayastor/repository.yml b/flux/core/openebs-mayastor/repository.yml deleted file mode 100644 index 8438331f..00000000 --- a/flux/core/openebs-mayastor/repository.yml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: openebs-mayastor - namespace: flux-system -spec: - interval: 5m - timeout: 3m - url: https://openebs.github.io/mayastor-extensions/ - From d266fc5241b168912c7cd43c6e2ba1476c83bee0 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Thu, 13 Feb 2025 13:43:20 +0100 Subject: [PATCH 04/42] cleanup --- flux/core/local-path-provisioner/kustomization.yml | 2 -- flux/core/openebs/repository.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/flux/core/local-path-provisioner/kustomization.yml b/flux/core/local-path-provisioner/kustomization.yml index 9a8c7315..b632a809 100644 --- a/flux/core/local-path-provisioner/kustomization.yml +++ b/flux/core/local-path-provisioner/kustomization.yml @@ -33,5 +33,3 @@ patches: name: local-path-storage labels: pod-security.kubernetes.io/enforce: privileged - - diff --git a/flux/core/openebs/repository.yml b/flux/core/openebs/repository.yml index a2e67b44..772bcdf8 100644 --- a/flux/core/openebs/repository.yml +++ b/flux/core/openebs/repository.yml @@ -7,4 +7,3 @@ spec: interval: 5m timeout: 3m url: https://openebs.github.io/openebs - From 1acb7631a3912b54945521e9e760fe569b2d887c Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Thu, 13 Feb 2025 13:55:28 +0100 Subject: [PATCH 05/42] added fcli storage post configuration --- flux/components/openebs-pool/kustomization.yaml | 4 ++++ flux/components/openebs-pool/manifests.yaml | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 flux/components/openebs-pool/kustomization.yaml create mode 100644 flux/components/openebs-pool/manifests.yaml diff --git a/flux/components/openebs-pool/kustomization.yaml b/flux/components/openebs-pool/kustomization.yaml new file mode 100644 index 00000000..f81cecbb --- /dev/null +++ b/flux/components/openebs-pool/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./manifests.yaml diff --git a/flux/components/openebs-pool/manifests.yaml b/flux/components/openebs-pool/manifests.yaml new file mode 100644 index 00000000..2f9adfae --- /dev/null +++ b/flux/components/openebs-pool/manifests.yaml @@ -0,0 +1,10 @@ + +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: spectrum-pool +parameters: + protocol: nvmf + repl: "1" +provisioner: io.openebs.csi-mayastor From a0ed4f7a684d21edad65efa8c62c0b36c9551bc8 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Thu, 13 Feb 2025 13:56:07 +0100 Subject: [PATCH 06/42] cleanup --- flux/components/openebs-pool/manifests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/flux/components/openebs-pool/manifests.yaml b/flux/components/openebs-pool/manifests.yaml index 2f9adfae..e5e3e6d7 100644 --- a/flux/components/openebs-pool/manifests.yaml +++ b/flux/components/openebs-pool/manifests.yaml @@ -1,4 +1,3 @@ - --- apiVersion: storage.k8s.io/v1 kind: StorageClass From 3f4b10b4906c0c669056285f016195893d73ec14 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Mon, 17 Feb 2025 17:26:18 +0100 Subject: [PATCH 07/42] ephemeral do support prep --- flux/clusters/ephemeral/kustomization.yml | 2 ++ flux/clusters/ephemeral/openebs-mayastor.yml | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 flux/clusters/ephemeral/openebs-mayastor.yml diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index d63b5510..eb826400 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -11,7 +11,9 @@ resources: - ../../core/kubelet-serving-cert-approver - ../../components/kubevirt - ../../components/monitoring + - ../../core/openebs - hubble-ingress.yml - grafana-ingress.yml + - openebs-mayastor.yml # - cilium-l2.yml - lightmare.yml diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml new file mode 100644 index 00000000..25a5a3cd --- /dev/null +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -0,0 +1,9 @@ +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: mayastor-1 +parameters: + protocol: nvmf + repl: "1" +provisioner: io.openebs.csi-mayastor From 034f3b415b8ffef4db54033f2f08c0cf3e23ab45 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:08:14 +0100 Subject: [PATCH 08/42] moved openebs to separate ns --- flux/core/openebs/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index 78149cc9..616f8a8b 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: openebs - namespace: kube-system + namespace: openebs spec: interval: 5m chart: From d1f9660592d8ba1b6141ca354ab3d7e0b693c8f2 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:17:42 +0100 Subject: [PATCH 09/42] removed namespace def --- flux/core/openebs/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index 616f8a8b..5641789c 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -2,7 +2,6 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: openebs - namespace: openebs spec: interval: 5m chart: From 82b878a789e2a34dc27d468fd03806508779a3c4 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:21:42 +0100 Subject: [PATCH 10/42] create ns --- flux/core/openebs/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index 5641789c..1750e032 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -12,6 +12,8 @@ spec: name: openebs kind: HelmRepository namespace: flux-system + install: + createNamespace: true values: mayastor: csi: From 8389be2ec055fd99c4e855d081715d02efe74f0c Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:23:17 +0100 Subject: [PATCH 11/42] create ns --- flux/core/openebs/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index 1750e032..8c878d11 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -2,6 +2,8 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: openebs + namespace: openebs + targetNamespace: openebs spec: interval: 5m chart: From fe9193e08c3d454cff3c4a193f84e5ecbaad2a5b Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:25:34 +0100 Subject: [PATCH 12/42] create ns --- flux/core/openebs/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index 8c878d11..bdc33046 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -3,8 +3,10 @@ kind: HelmRelease metadata: name: openebs namespace: openebs - targetNamespace: openebs spec: + targetNamespace: openebs + install: + createNamespace: true interval: 5m chart: spec: @@ -14,8 +16,6 @@ spec: name: openebs kind: HelmRepository namespace: flux-system - install: - createNamespace: true values: mayastor: csi: From 44c397c4a876770004e94c88e348f28f7f6f1b50 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 18:27:34 +0100 Subject: [PATCH 13/42] create ns --- flux/core/openebs/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/release.yml index bdc33046..b79e6c9d 100644 --- a/flux/core/openebs/release.yml +++ b/flux/core/openebs/release.yml @@ -2,7 +2,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: name: openebs - namespace: openebs + namespace: kube-system spec: targetNamespace: openebs install: From 36b326c4345b5e0c531a3421f7aeb47c30eb1000 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:03:56 +0100 Subject: [PATCH 14/42] added storage pool def --- flux/clusters/ephemeral/openebs-mayastor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 25a5a3cd..bdf779ba 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -7,3 +7,12 @@ parameters: protocol: nvmf repl: "1" provisioner: io.openebs.csi-mayastor +--- +apiVersion: "openebs.io/v1beta2" +kind: DiskPool +metadata: + name: pool + namespace: openebs +spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From f424240d549ff78a747cecddb5137007e55407fa Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:35:38 +0100 Subject: [PATCH 15/42] test crzy ducktapes --- flux/clusters/ephemeral/kustomization.yml | 2 +- .../openebs-do-pool/app/kustomization.yml | 4 ++++ .../openebs-do-pool/app/manifests.yml} | 0 flux/components/openebs-do-pool/ks.yml | 16 ++++++++++++++++ flux/core/openebs/app/kustomization.yml | 5 +++++ flux/core/openebs/{ => app}/release.yml | 0 flux/core/openebs/{ => app}/repository.yml | 0 flux/core/openebs/ks.yml | 13 +++++++++++++ flux/core/openebs/kustomization.yml | 3 +-- 9 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 flux/components/openebs-do-pool/app/kustomization.yml rename flux/{clusters/ephemeral/openebs-mayastor.yml => components/openebs-do-pool/app/manifests.yml} (100%) create mode 100644 flux/components/openebs-do-pool/ks.yml create mode 100644 flux/core/openebs/app/kustomization.yml rename flux/core/openebs/{ => app}/release.yml (100%) rename flux/core/openebs/{ => app}/repository.yml (100%) create mode 100644 flux/core/openebs/ks.yml diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index eb826400..ed8c2aa9 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -9,9 +9,9 @@ resources: - ../../core/local-path-provisioner - ../../core/metrics-server - ../../core/kubelet-serving-cert-approver + - ../../core/openebs - ../../components/kubevirt - ../../components/monitoring - - ../../core/openebs - hubble-ingress.yml - grafana-ingress.yml - openebs-mayastor.yml diff --git a/flux/components/openebs-do-pool/app/kustomization.yml b/flux/components/openebs-do-pool/app/kustomization.yml new file mode 100644 index 00000000..00ff33c3 --- /dev/null +++ b/flux/components/openebs-do-pool/app/kustomization.yml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - manifests.yml diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/components/openebs-do-pool/app/manifests.yml similarity index 100% rename from flux/clusters/ephemeral/openebs-mayastor.yml rename to flux/components/openebs-do-pool/app/manifests.yml diff --git a/flux/components/openebs-do-pool/ks.yml b/flux/components/openebs-do-pool/ks.yml new file mode 100644 index 00000000..e0134179 --- /dev/null +++ b/flux/components/openebs-do-pool/ks.yml @@ -0,0 +1,16 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: openebs-do-pool + namespace: flux-system +spec: + interval: 2m0s + path: ./flux/components/openebs-do-pool/app + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system + dependsOn: + - name: openebs diff --git a/flux/core/openebs/app/kustomization.yml b/flux/core/openebs/app/kustomization.yml new file mode 100644 index 00000000..d9d63633 --- /dev/null +++ b/flux/core/openebs/app/kustomization.yml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - repository.yml + - release.yml diff --git a/flux/core/openebs/release.yml b/flux/core/openebs/app/release.yml similarity index 100% rename from flux/core/openebs/release.yml rename to flux/core/openebs/app/release.yml diff --git a/flux/core/openebs/repository.yml b/flux/core/openebs/app/repository.yml similarity index 100% rename from flux/core/openebs/repository.yml rename to flux/core/openebs/app/repository.yml diff --git a/flux/core/openebs/ks.yml b/flux/core/openebs/ks.yml new file mode 100644 index 00000000..8bf611ff --- /dev/null +++ b/flux/core/openebs/ks.yml @@ -0,0 +1,13 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: openebs + namespace: flux-system +spec: + interval: 1m0s + path: ./flux/core/openebs/app + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system diff --git a/flux/core/openebs/kustomization.yml b/flux/core/openebs/kustomization.yml index d9d63633..d1943374 100644 --- a/flux/core/openebs/kustomization.yml +++ b/flux/core/openebs/kustomization.yml @@ -1,5 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repository.yml - - release.yml + - ks.yaml From 067f18eb2678bceb9ffaa7005d9cd075674d22ac Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:38:13 +0100 Subject: [PATCH 16/42] Revert "added storage pool def" This reverts commit 36b326c4345b5e0c531a3421f7aeb47c30eb1000. --- flux/components/openebs-do-pool/app/manifests.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/flux/components/openebs-do-pool/app/manifests.yml b/flux/components/openebs-do-pool/app/manifests.yml index bdf779ba..25a5a3cd 100644 --- a/flux/components/openebs-do-pool/app/manifests.yml +++ b/flux/components/openebs-do-pool/app/manifests.yml @@ -7,12 +7,3 @@ parameters: protocol: nvmf repl: "1" provisioner: io.openebs.csi-mayastor ---- -apiVersion: "openebs.io/v1beta2" -kind: DiskPool -metadata: - name: pool - namespace: openebs -spec: - node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From 1940d74f58ce13aa7d8730667ffedaa1f790e2af Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:39:13 +0100 Subject: [PATCH 17/42] Revert "Revert "added storage pool def"" This reverts commit 067f18eb2678bceb9ffaa7005d9cd075674d22ac. --- flux/components/openebs-do-pool/app/manifests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/flux/components/openebs-do-pool/app/manifests.yml b/flux/components/openebs-do-pool/app/manifests.yml index 25a5a3cd..bdf779ba 100644 --- a/flux/components/openebs-do-pool/app/manifests.yml +++ b/flux/components/openebs-do-pool/app/manifests.yml @@ -7,3 +7,12 @@ parameters: protocol: nvmf repl: "1" provisioner: io.openebs.csi-mayastor +--- +apiVersion: "openebs.io/v1beta2" +kind: DiskPool +metadata: + name: pool + namespace: openebs +spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From 692451ef40112a2c184caaec89cd794990aa8734 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:39:24 +0100 Subject: [PATCH 18/42] Revert "test crzy ducktapes" This reverts commit f424240d549ff78a747cecddb5137007e55407fa. --- flux/clusters/ephemeral/kustomization.yml | 2 +- .../ephemeral/openebs-mayastor.yml} | 0 .../openebs-do-pool/app/kustomization.yml | 4 ---- flux/components/openebs-do-pool/ks.yml | 16 ---------------- flux/core/openebs/app/kustomization.yml | 5 ----- flux/core/openebs/ks.yml | 13 ------------- flux/core/openebs/kustomization.yml | 3 ++- flux/core/openebs/{app => }/release.yml | 0 flux/core/openebs/{app => }/repository.yml | 0 9 files changed, 3 insertions(+), 40 deletions(-) rename flux/{components/openebs-do-pool/app/manifests.yml => clusters/ephemeral/openebs-mayastor.yml} (100%) delete mode 100644 flux/components/openebs-do-pool/app/kustomization.yml delete mode 100644 flux/components/openebs-do-pool/ks.yml delete mode 100644 flux/core/openebs/app/kustomization.yml delete mode 100644 flux/core/openebs/ks.yml rename flux/core/openebs/{app => }/release.yml (100%) rename flux/core/openebs/{app => }/repository.yml (100%) diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index ed8c2aa9..eb826400 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -9,9 +9,9 @@ resources: - ../../core/local-path-provisioner - ../../core/metrics-server - ../../core/kubelet-serving-cert-approver - - ../../core/openebs - ../../components/kubevirt - ../../components/monitoring + - ../../core/openebs - hubble-ingress.yml - grafana-ingress.yml - openebs-mayastor.yml diff --git a/flux/components/openebs-do-pool/app/manifests.yml b/flux/clusters/ephemeral/openebs-mayastor.yml similarity index 100% rename from flux/components/openebs-do-pool/app/manifests.yml rename to flux/clusters/ephemeral/openebs-mayastor.yml diff --git a/flux/components/openebs-do-pool/app/kustomization.yml b/flux/components/openebs-do-pool/app/kustomization.yml deleted file mode 100644 index 00ff33c3..00000000 --- a/flux/components/openebs-do-pool/app/kustomization.yml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - manifests.yml diff --git a/flux/components/openebs-do-pool/ks.yml b/flux/components/openebs-do-pool/ks.yml deleted file mode 100644 index e0134179..00000000 --- a/flux/components/openebs-do-pool/ks.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: openebs-do-pool - namespace: flux-system -spec: - interval: 2m0s - path: ./flux/components/openebs-do-pool/app - prune: true - sourceRef: - kind: GitRepository - name: spectrum - namespace: flux-system - dependsOn: - - name: openebs diff --git a/flux/core/openebs/app/kustomization.yml b/flux/core/openebs/app/kustomization.yml deleted file mode 100644 index d9d63633..00000000 --- a/flux/core/openebs/app/kustomization.yml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - repository.yml - - release.yml diff --git a/flux/core/openebs/ks.yml b/flux/core/openebs/ks.yml deleted file mode 100644 index 8bf611ff..00000000 --- a/flux/core/openebs/ks.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: openebs - namespace: flux-system -spec: - interval: 1m0s - path: ./flux/core/openebs/app - prune: true - sourceRef: - kind: GitRepository - name: spectrum - namespace: flux-system diff --git a/flux/core/openebs/kustomization.yml b/flux/core/openebs/kustomization.yml index d1943374..d9d63633 100644 --- a/flux/core/openebs/kustomization.yml +++ b/flux/core/openebs/kustomization.yml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ks.yaml + - repository.yml + - release.yml diff --git a/flux/core/openebs/app/release.yml b/flux/core/openebs/release.yml similarity index 100% rename from flux/core/openebs/app/release.yml rename to flux/core/openebs/release.yml diff --git a/flux/core/openebs/app/repository.yml b/flux/core/openebs/repository.yml similarity index 100% rename from flux/core/openebs/app/repository.yml rename to flux/core/openebs/repository.yml From 179cd59f8da7309336dd146cd256d700a2aaea10 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:42:17 +0100 Subject: [PATCH 19/42] :( --- flux/clusters/ephemeral/openebs-mayastor.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index bdf779ba..c28c4f92 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -7,12 +7,12 @@ parameters: protocol: nvmf repl: "1" provisioner: io.openebs.csi-mayastor ---- -apiVersion: "openebs.io/v1beta2" -kind: DiskPool -metadata: - name: pool - namespace: openebs -spec: - node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] +# --- +# apiVersion: "openebs.io/v1beta2" +# kind: DiskPool +# metadata: +# name: pool +# namespace: openebs +# spec: +# node: cp-0 +# disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From 8566135fc76610568cc8013b4d93a5412ea7aac6 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:48:26 +0100 Subject: [PATCH 20/42] test --- flux/clusters/ephemeral/openebs-mayastor.yml | 33 ++++++++++++++------ 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index c28c4f92..ee24ad7a 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -7,12 +7,27 @@ parameters: protocol: nvmf repl: "1" provisioner: io.openebs.csi-mayastor -# --- -# apiVersion: "openebs.io/v1beta2" -# kind: DiskPool -# metadata: -# name: pool -# namespace: openebs -# spec: -# node: cp-0 -# disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: openebs + namespace: flux-system +spec: + interval: 1m + path: "./flux/core/openebs" + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system + patches: + - patch: |- + apiVersion: "openebs.io/v1beta2" + kind: DiskPool + metadata: + name: pool + namespace: openebs + spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From df9ffe3900cb67d553efa5811741183100e19b97 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:50:30 +0100 Subject: [PATCH 21/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index ee24ad7a..50ab51d5 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -23,11 +23,11 @@ spec: namespace: flux-system patches: - patch: |- - apiVersion: "openebs.io/v1beta2" - kind: DiskPool - metadata: - name: pool - namespace: openebs - spec: - node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] + apiVersion: "openebs.io/v1beta2" + kind: DiskPool + metadata: + name: pool + namespace: openebs + spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From 52d0ab876a7e5655930de4c2e1308b231e52d9aa Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:52:46 +0100 Subject: [PATCH 22/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 50ab51d5..ce7c8352 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -30,4 +30,4 @@ spec: namespace: openebs spec: node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] From 9d3dde0dc99a4fe9075e3057e249b1585b522803 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:54:10 +0100 Subject: [PATCH 23/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index ce7c8352..95d0422b 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -26,7 +26,7 @@ spec: apiVersion: "openebs.io/v1beta2" kind: DiskPool metadata: - name: pool + name: pool-lol namespace: openebs spec: node: cp-0 From 22039e78e8f434ad0eaaef577750f12895ec80d5 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Tue, 18 Feb 2025 19:56:41 +0100 Subject: [PATCH 24/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 95d0422b..ef7e4725 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -26,8 +26,12 @@ spec: apiVersion: "openebs.io/v1beta2" kind: DiskPool metadata: - name: pool-lol + name: pool namespace: openebs spec: node: cp-0 disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] + target: + kind: DiskPool + name: pool + namespace: openebs From d69b4a956a00d30593315fc43874888e57f3eb06 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:05:52 +0100 Subject: [PATCH 25/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index ef7e4725..0c4149bb 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -8,6 +8,15 @@ parameters: repl: "1" provisioner: io.openebs.csi-mayastor --- +apiVersion: "openebs.io/v1beta2" +kind: DiskPool +metadata: + name: ebs-pool + namespace: openebs +spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/placeholder"] +--- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -23,14 +32,10 @@ spec: namespace: flux-system patches: - patch: |- - apiVersion: "openebs.io/v1beta2" - kind: DiskPool - metadata: - name: pool - namespace: openebs - spec: - node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] + - op: add + path: /spec/disks + value: + ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] target: kind: DiskPool name: pool From 5c6da1e96f867147196a2c0762b67ae07779dd98 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:09:30 +0100 Subject: [PATCH 26/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 0c4149bb..1743885f 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -32,7 +32,7 @@ spec: namespace: flux-system patches: - patch: |- - - op: add + - op: replace path: /spec/disks value: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] From 4ff329cb631c47dace319ba9d35b456479fbf554 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:10:54 +0100 Subject: [PATCH 27/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 1743885f..1664d45b 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -38,5 +38,5 @@ spec: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] target: kind: DiskPool - name: pool + name: ebs-pool namespace: openebs From 1328bd28423a6921363a9649642035ce510318dc Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:12:14 +0100 Subject: [PATCH 28/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 1664d45b..371115c0 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -34,8 +34,7 @@ spec: - patch: |- - op: replace path: /spec/disks - value: - ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] + value: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] target: kind: DiskPool name: ebs-pool From 838281037d8ebe10f6fddc9189dd13dc133e09b2 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:15:36 +0100 Subject: [PATCH 29/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 371115c0..3cf1f2a9 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -36,6 +36,6 @@ spec: path: /spec/disks value: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] target: - kind: DiskPool + kind: dsp name: ebs-pool namespace: openebs From da928425dc4be5177c5c6db68af0948d84f13c4e Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 00:18:26 +0100 Subject: [PATCH 30/42] f --- flux/clusters/ephemeral/openebs-mayastor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index 3cf1f2a9..eb8a4f26 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -31,10 +31,10 @@ spec: name: spectrum namespace: flux-system patches: - - patch: |- + - patch: | - op: replace path: /spec/disks - value: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] + value: "aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp" target: kind: dsp name: ebs-pool From 205e053a1962bd76ef4221400021f9655921938d Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 11:56:13 +0100 Subject: [PATCH 31/42] test --- flux/clusters/ephemeral/kustomization.yml | 4 +-- flux/clusters/ephemeral/openebs-do-pool.yml | 16 +++++++++++ flux/clusters/ephemeral/openebs-mayastor.yml | 28 +------------------ .../openebs-do-pool/kustomization.yaml | 4 +++ .../components/openebs-do-pool/manifests.yaml | 18 ++++++++++++ 5 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 flux/clusters/ephemeral/openebs-do-pool.yml create mode 100644 flux/components/openebs-do-pool/kustomization.yaml create mode 100644 flux/components/openebs-do-pool/manifests.yaml diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index eb826400..b38614eb 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -11,9 +11,9 @@ resources: - ../../core/kubelet-serving-cert-approver - ../../components/kubevirt - ../../components/monitoring - - ../../core/openebs + - openebs-mayastor.yml - hubble-ingress.yml - grafana-ingress.yml - - openebs-mayastor.yml # - cilium-l2.yml - lightmare.yml + - openebs-do-pool.yml diff --git a/flux/clusters/ephemeral/openebs-do-pool.yml b/flux/clusters/ephemeral/openebs-do-pool.yml new file mode 100644 index 00000000..c2350a1a --- /dev/null +++ b/flux/clusters/ephemeral/openebs-do-pool.yml @@ -0,0 +1,16 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: openebs-do-pool + namespace: flux-system +spec: + dependsOn: + - name: openebs + interval: 1m + path: "./flux/components/openebs-do-pool" + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system diff --git a/flux/clusters/ephemeral/openebs-mayastor.yml b/flux/clusters/ephemeral/openebs-mayastor.yml index eb8a4f26..7197deb7 100644 --- a/flux/clusters/ephemeral/openebs-mayastor.yml +++ b/flux/clusters/ephemeral/openebs-mayastor.yml @@ -1,22 +1,4 @@ --- -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: mayastor-1 -parameters: - protocol: nvmf - repl: "1" -provisioner: io.openebs.csi-mayastor ---- -apiVersion: "openebs.io/v1beta2" -kind: DiskPool -metadata: - name: ebs-pool - namespace: openebs -spec: - node: cp-0 - disks: ["aio:///dev/disk/by-id/placeholder"] ---- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: @@ -30,12 +12,4 @@ spec: kind: GitRepository name: spectrum namespace: flux-system - patches: - - patch: | - - op: replace - path: /spec/disks - value: "aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp" - target: - kind: dsp - name: ebs-pool - namespace: openebs + \ No newline at end of file diff --git a/flux/components/openebs-do-pool/kustomization.yaml b/flux/components/openebs-do-pool/kustomization.yaml new file mode 100644 index 00000000..f81cecbb --- /dev/null +++ b/flux/components/openebs-do-pool/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./manifests.yaml diff --git a/flux/components/openebs-do-pool/manifests.yaml b/flux/components/openebs-do-pool/manifests.yaml new file mode 100644 index 00000000..593aabd9 --- /dev/null +++ b/flux/components/openebs-do-pool/manifests.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: mayastor +parameters: + protocol: nvmf + repl: "1" +provisioner: io.openebs.csi-mayastor +--- +apiVersion: "openebs.io/v1beta2" +kind: DiskPool +metadata: + name: ebs-pool + namespace: openebs +spec: + node: cp-0 + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] From 7afc21d515a34ba11ed0ffddbf0bb80a5eecc636 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 11:57:57 +0100 Subject: [PATCH 32/42] test --- flux/components/openebs-do-pool/manifests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/components/openebs-do-pool/manifests.yaml b/flux/components/openebs-do-pool/manifests.yaml index 593aabd9..4ca59868 100644 --- a/flux/components/openebs-do-pool/manifests.yaml +++ b/flux/components/openebs-do-pool/manifests.yaml @@ -15,4 +15,4 @@ metadata: namespace: openebs spec: node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_rnd-mayastor-test-spectrum-cp"] + disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] From a75c5d0e6fbe6d8cb50050060d0e69fcd2c675b9 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 12:01:59 +0100 Subject: [PATCH 33/42] test --- flux/clusters/ephemeral/openebs-do-pool.yml | 9 +++++++++ flux/components/openebs-do-pool/manifests.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/openebs-do-pool.yml b/flux/clusters/ephemeral/openebs-do-pool.yml index c2350a1a..eb4e56b4 100644 --- a/flux/clusters/ephemeral/openebs-do-pool.yml +++ b/flux/clusters/ephemeral/openebs-do-pool.yml @@ -14,3 +14,12 @@ spec: kind: GitRepository name: spectrum namespace: flux-system + patches: + - patch: |- + - op: replace + path: /spec/disks + value: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] + target: + kind: DiskPool + name: ebs-pool + namespace: openebs diff --git a/flux/components/openebs-do-pool/manifests.yaml b/flux/components/openebs-do-pool/manifests.yaml index 4ca59868..65f87355 100644 --- a/flux/components/openebs-do-pool/manifests.yaml +++ b/flux/components/openebs-do-pool/manifests.yaml @@ -15,4 +15,4 @@ metadata: namespace: openebs spec: node: cp-0 - disks: ["aio:///dev/disk/by-id/scsi-0DO_Volume_${DO_DISK}"] + disks: ["aio:///dev/disk/by-id/placeholder"] From 35d1cd49b5d0b50b7d1b52de740a5e1b03daf1e8 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 12:15:33 +0100 Subject: [PATCH 34/42] mayastor support for DO --- ephemeral/instance.tf | 12 ++++++++++++ ephemeral/main.tf | 4 +++- ephemeral/patches/mayastor.yml | 27 +++++++++++++++++++++++++++ ephemeral/variables.tf | 3 ++- 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 ephemeral/patches/mayastor.yml diff --git a/ephemeral/instance.tf b/ephemeral/instance.tf index 517c41d2..06d2dfcc 100644 --- a/ephemeral/instance.tf +++ b/ephemeral/instance.tf @@ -31,3 +31,15 @@ resource "digitalocean_droplet" "cp" { local.prefix, ] } + +# mayastor volume +resource "digitalocean_volume" "mayastor" { + region = "fra1" + name = "rnd-${local.prefix}-spectrum-cp" + size = "100" +} + +resource "digitalocean_volume_attachment" "mayastor" { + droplet_id = digitalocean_droplet.cp[0].id + volume_id = digitalocean_volume.mayastor.id +} diff --git a/ephemeral/main.tf b/ephemeral/main.tf index 2eea5a7a..81a49daf 100644 --- a/ephemeral/main.tf +++ b/ephemeral/main.tf @@ -22,7 +22,8 @@ module "talos" { templatefile("${path.root}/patches/registry.yml", { docker_username = data.vault_generic_secret.docker.data.username, docker_password = data.vault_generic_secret.docker.data.password - }) + },), + file("${path.root}/patches/mayastor.yml") ] }, ] @@ -45,5 +46,6 @@ module "spectrum" { DOMAIN = "${local.prefix}.fluence.dev" PREFIX = local.prefix LOADBALANCER_IP = digitalocean_droplet.cp[0].ipv4_address + DO_DISK = digitalocean_volume.mayastor.name } } diff --git a/ephemeral/patches/mayastor.yml b/ephemeral/patches/mayastor.yml new file mode 100644 index 00000000..ccd9ce30 --- /dev/null +++ b/ephemeral/patches/mayastor.yml @@ -0,0 +1,27 @@ +machine: + kubelet: + extraArgs: + node-labels: openebs.io/engine=mayastor + max-pods: 500 + extraMounts: + - destination: /var/local # Destination is the absolute path where the mount will be placed in the container. + type: bind # Type specifies the mount kind. + source: /var/local # Source specifies the source path of the mount. + options: + - bind + - rshared + - rw + sysctls: + vm.nr_hugepages: "1024" + nodeLabels: + openebs.io/engine: "mayastor" +cluster: + apiServer: + admissionControl: + - name: PodSecurity + configuration: + apiVersion: pod-security.admission.config.k8s.io/v1beta1 + kind: PodSecurityConfiguration + exemptions: + namespaces: + - openebs diff --git a/ephemeral/variables.tf b/ephemeral/variables.tf index aa252a2f..bdd4a554 100644 --- a/ephemeral/variables.tf +++ b/ephemeral/variables.tf @@ -1,10 +1,11 @@ variable "github_branch" { description = "GitHub branch that Flux will checkout to" type = string + default = "openebs-integration" } variable "github_pr_url" { description = "GitHub url to PR that triggered the workflow" type = string - default = "https://github.com/fluencelabs" + default = "https://github.com/fluencelabs/spectrum/pull/125" } From 24185fd29698b199c56c48fd7ce15aead63599d3 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 12:22:19 +0100 Subject: [PATCH 35/42] fix --- ephemeral/variables.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ephemeral/variables.tf b/ephemeral/variables.tf index bdd4a554..aa252a2f 100644 --- a/ephemeral/variables.tf +++ b/ephemeral/variables.tf @@ -1,11 +1,10 @@ variable "github_branch" { description = "GitHub branch that Flux will checkout to" type = string - default = "openebs-integration" } variable "github_pr_url" { description = "GitHub url to PR that triggered the workflow" type = string - default = "https://github.com/fluencelabs/spectrum/pull/125" + default = "https://github.com/fluencelabs" } From 9212b7d228e3bab08ad7f0ecdd42f22e701faeb5 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 13:38:58 +0100 Subject: [PATCH 36/42] test patch --- flux/clusters/ephemeral/cilium-qps-patch.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 flux/clusters/ephemeral/cilium-qps-patch.yml diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml new file mode 100644 index 00000000..c03bf9c1 --- /dev/null +++ b/flux/clusters/ephemeral/cilium-qps-patch.yml @@ -0,0 +1,18 @@ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: cilium-qps-patch + namespace: flux-system +spec: + # ...omitted for brevity + patches: + patches: + - patch: |- + - op: replace + path: /data/k8s-client-qps + value: 1000 + target: + kind: ConfigMap + name: cilium-config + namespace: kube-system From e49c30c8f09b59a5190f239449cc164bd185668c Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 13:41:26 +0100 Subject: [PATCH 37/42] test patch --- flux/clusters/ephemeral/cilium-qps-patch.yml | 2 +- flux/clusters/ephemeral/kustomization.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml index c03bf9c1..fd20b550 100644 --- a/flux/clusters/ephemeral/cilium-qps-patch.yml +++ b/flux/clusters/ephemeral/cilium-qps-patch.yml @@ -11,7 +11,7 @@ spec: - patch: |- - op: replace path: /data/k8s-client-qps - value: 1000 + value: 1999 target: kind: ConfigMap name: cilium-config diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index b38614eb..1c9396b2 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -17,3 +17,4 @@ resources: # - cilium-l2.yml - lightmare.yml - openebs-do-pool.yml + - cilium-qps-patch.yml From 989801ae6051c0f894dd1312cd1b08c1653d1f75 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 13:42:34 +0100 Subject: [PATCH 38/42] test patch --- flux/clusters/ephemeral/cilium-qps-patch.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml index fd20b550..7828ee5d 100644 --- a/flux/clusters/ephemeral/cilium-qps-patch.yml +++ b/flux/clusters/ephemeral/cilium-qps-patch.yml @@ -7,7 +7,6 @@ metadata: spec: # ...omitted for brevity patches: - patches: - patch: |- - op: replace path: /data/k8s-client-qps From dbd2ed79bfac66b7c3fdf578542930e54b08c053 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 13:44:23 +0100 Subject: [PATCH 39/42] test patch --- flux/clusters/ephemeral/cilium-qps-patch.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml index 7828ee5d..c112474c 100644 --- a/flux/clusters/ephemeral/cilium-qps-patch.yml +++ b/flux/clusters/ephemeral/cilium-qps-patch.yml @@ -5,7 +5,12 @@ metadata: name: cilium-qps-patch namespace: flux-system spec: - # ...omitted for brevity + interval: 1m + prune: true + sourceRef: + kind: GitRepository + name: spectrum + namespace: flux-system patches: - patch: |- - op: replace From b0c764486db5c3beab87c56510beec1c6c384422 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 14:04:57 +0100 Subject: [PATCH 40/42] test patch --- flux/clusters/ephemeral/cilium-qps-patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml index c112474c..66997a8e 100644 --- a/flux/clusters/ephemeral/cilium-qps-patch.yml +++ b/flux/clusters/ephemeral/cilium-qps-patch.yml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization metadata: name: cilium-qps-patch From b50595a1fd50fc0f341b827745d08f739490d565 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 14:50:04 +0100 Subject: [PATCH 41/42] deleted cilium patch traces --- flux/clusters/ephemeral/cilium-qps-patch.yml | 22 ------------------- flux/clusters/ephemeral/kustomization.yml | 1 - .../spectrum/templates/cilium.yml | 9 ++++++++ 3 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 flux/clusters/ephemeral/cilium-qps-patch.yml diff --git a/flux/clusters/ephemeral/cilium-qps-patch.yml b/flux/clusters/ephemeral/cilium-qps-patch.yml deleted file mode 100644 index 66997a8e..00000000 --- a/flux/clusters/ephemeral/cilium-qps-patch.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -metadata: - name: cilium-qps-patch - namespace: flux-system -spec: - interval: 1m - prune: true - sourceRef: - kind: GitRepository - name: spectrum - namespace: flux-system - patches: - - patch: |- - - op: replace - path: /data/k8s-client-qps - value: 1999 - target: - kind: ConfigMap - name: cilium-config - namespace: kube-system diff --git a/flux/clusters/ephemeral/kustomization.yml b/flux/clusters/ephemeral/kustomization.yml index 1c9396b2..b38614eb 100644 --- a/flux/clusters/ephemeral/kustomization.yml +++ b/flux/clusters/ephemeral/kustomization.yml @@ -17,4 +17,3 @@ resources: # - cilium-l2.yml - lightmare.yml - openebs-do-pool.yml - - cilium-qps-patch.yml diff --git a/terraform-modules/spectrum/templates/cilium.yml b/terraform-modules/spectrum/templates/cilium.yml index 435d4e41..b346577b 100644 --- a/terraform-modules/spectrum/templates/cilium.yml +++ b/terraform-modules/spectrum/templates/cilium.yml @@ -75,6 +75,15 @@ socketLB: k8sServiceHost: localhost +k8sClientRateLimit: + qps: 1000 + burst: 5000 + + operator: + qps: 1000 + burst: 5000 + + %{ if cluster_flavour == "talos" } k8sServicePort: 7445 %{ else } From 296eff9f8f0944d2a0f44a6328a6c1029e6dda28 Mon Sep 17 00:00:00 2001 From: enjenjenje Date: Wed, 19 Feb 2025 14:51:16 +0100 Subject: [PATCH 42/42] deleted cilium patch traces --- terraform-modules/spectrum/templates/cilium.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/terraform-modules/spectrum/templates/cilium.yml b/terraform-modules/spectrum/templates/cilium.yml index b346577b..435d4e41 100644 --- a/terraform-modules/spectrum/templates/cilium.yml +++ b/terraform-modules/spectrum/templates/cilium.yml @@ -75,15 +75,6 @@ socketLB: k8sServiceHost: localhost -k8sClientRateLimit: - qps: 1000 - burst: 5000 - - operator: - qps: 1000 - burst: 5000 - - %{ if cluster_flavour == "talos" } k8sServicePort: 7445 %{ else }