From 6cab8051358c94a1518a01d5882cef8d32995422 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Sun, 17 Apr 2022 00:30:29 +0000 Subject: [PATCH 1/5] fix(kube): remove cluster from overlay I hadn't added drives so I need to redo the deployment --- kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml index eca8e872..52770801 100644 --- a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml +++ b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml @@ -4,4 +4,4 @@ kind: Kustomization resources: - 1-namespace.yaml - 2-operator.yaml - - 3-cluster.yaml + From 6a0dfb3a068299ce51650a85e6a9e2b268764dc6 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Sun, 17 Apr 2022 00:32:38 +0000 Subject: [PATCH 2/5] fix(kube): remove operator from overlay --- kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml index 52770801..ef35a0cb 100644 --- a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml +++ b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - 1-namespace.yaml - - 2-operator.yaml - + # - 2-operator.yaml + # - 3-cluster.yaml From e88203267edb0fb804bebe7440f52c7eb7cf5b9d Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Sun, 17 Apr 2022 01:02:44 +0000 Subject: [PATCH 3/5] fix(kube): readd Rook operator&cluster to overlay --- kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml index ef35a0cb..eca8e872 100644 --- a/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml +++ b/kube/3-kube-core/2-storage/rook-ceph/kustomization.yaml @@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - 1-namespace.yaml - # - 2-operator.yaml - # - 3-cluster.yaml + - 2-operator.yaml + - 3-cluster.yaml From 99498717c8188484d0cecca6f2c8671bd5c55b02 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Mon, 18 Apr 2022 23:01:06 +0800 Subject: [PATCH 4/5] feat: add VS Code YAML schema settings --- .vscode/settings.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..285e877f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "yaml.schemas": { + "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/kustomization-kustomize-v1beta2.json": ["kustomization.yaml", "kustomization.yml", "*-fKt.yaml", "*-fKt.yml"], + "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/helmrelease-helm-v2beta1.json": ["helm-release.yaml", "helm-release.yml", "*-fHr.yaml", "*-fHr.yml"], + "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/helmrepository-helm-v1beta2.json": ["charts/*", "charts/*/*", "*-charts.yaml", "*-charts.yml"], + } +} \ No newline at end of file From 47691a2afcfc0654b9a4531f55ffa21a3de6be0b Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Mon, 18 Apr 2022 23:03:05 +0800 Subject: [PATCH 5/5] feat: add rook-ceph CRDs globally --- .vscode/settings.json | 4 +++- kube/2-kube-crds/kustomization.yaml | 4 ++++ kube/2-kube-crds/rook-ceph/kustomization.yaml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 kube/2-kube-crds/kustomization.yaml create mode 100644 kube/2-kube-crds/rook-ceph/kustomization.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json index 285e877f..dbb02c06 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,7 @@ "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/kustomization-kustomize-v1beta2.json": ["kustomization.yaml", "kustomization.yml", "*-fKt.yaml", "*-fKt.yml"], "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/helmrelease-helm-v2beta1.json": ["helm-release.yaml", "helm-release.yml", "*-fHr.yaml", "*-fHr.yml"], "https://raw.githubusercontent.com/JJGadgets/flux2-schemas/main/helmrepository-helm-v1beta2.json": ["charts/*", "charts/*/*", "*-charts.yaml", "*-charts.yml"], - } + }, + "git.autofetch": "all", + "git.autoStash": true } \ No newline at end of file diff --git a/kube/2-kube-crds/kustomization.yaml b/kube/2-kube-crds/kustomization.yaml new file mode 100644 index 00000000..5d0cb9a8 --- /dev/null +++ b/kube/2-kube-crds/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - rook-ceph \ No newline at end of file diff --git a/kube/2-kube-crds/rook-ceph/kustomization.yaml b/kube/2-kube-crds/rook-ceph/kustomization.yaml new file mode 100644 index 00000000..7d4e1758 --- /dev/null +++ b/kube/2-kube-crds/rook-ceph/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - https://github.com/rook/rook/blob/v1.9.0/deploy/examples/crds.yaml \ No newline at end of file