From 0445a09b7b1a491c62daa0d4460c82966b4acf89 Mon Sep 17 00:00:00 2001 From: Maksim Shakavin Date: Tue, 23 Jul 2024 23:32:13 +0200 Subject: [PATCH] ci: add additional disk size --- .../apps/observability/kustomization.yaml | 2 +- .../observability/thanos/app/helmrelease.yaml | 4 +-- .../app/helmrelease.yaml | 2 +- kubernetes/bootstrap/talos/talconfig.yaml | 27 ++++++++++++++----- kubernetes/talos/clusterconfig/talosconfig | 2 -- 5 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 kubernetes/talos/clusterconfig/talosconfig diff --git a/kubernetes/apps/observability/kustomization.yaml b/kubernetes/apps/observability/kustomization.yaml index d070a45b..f345c413 100644 --- a/kubernetes/apps/observability/kustomization.yaml +++ b/kubernetes/apps/observability/kustomization.yaml @@ -7,7 +7,7 @@ resources: - ./alert.yaml - ./portainer/ks.yaml - ./gatus/ks.yaml -# - ./thanos/ks.yaml + - ./thanos/ks.yaml - ./kube-prometheus-stack/ks.yaml - ./prometheus-operator-crds/ks.yaml - ./grafana/ks.yaml diff --git a/kubernetes/apps/observability/thanos/app/helmrelease.yaml b/kubernetes/apps/observability/thanos/app/helmrelease.yaml index 112662b0..82ad8f47 100644 --- a/kubernetes/apps/observability/thanos/app/helmrelease.yaml +++ b/kubernetes/apps/observability/thanos/app/helmrelease.yaml @@ -65,8 +65,8 @@ spec: - --retention.resolution-1h=60d persistence: &persistence enabled: true - storageClass: longhorn-local - size: 20Gi + storageClass: local-hostpath + size: 25Gi query: replicas: 2 extraArgs: ["--alert.query-url=https://thanos.${SECRET_DOMAIN}"] diff --git a/kubernetes/apps/storage/local-path-provisioner/app/helmrelease.yaml b/kubernetes/apps/storage/local-path-provisioner/app/helmrelease.yaml index 2d96e0bb..ac2907d2 100644 --- a/kubernetes/apps/storage/local-path-provisioner/app/helmrelease.yaml +++ b/kubernetes/apps/storage/local-path-provisioner/app/helmrelease.yaml @@ -57,7 +57,7 @@ spec: config: driver: local-hostpath local-hostpath: - shareBasePath: &storagePath /var/democratic-csi/local + shareBasePath: &storagePath /var/mnt/ssd/democratic-csi/local controllerBasePath: *storagePath dirPermissionsMode: "0770" dirPermissionsUser: 0 diff --git a/kubernetes/bootstrap/talos/talconfig.yaml b/kubernetes/bootstrap/talos/talconfig.yaml index 930dc418..cff4fbf0 100644 --- a/kubernetes/bootstrap/talos/talconfig.yaml +++ b/kubernetes/bootstrap/talos/talconfig.yaml @@ -27,7 +27,7 @@ nodes: talosImageURL: factory.talos.dev/installer/88d1f7a5c4f1d3aba7df787c448c1d3d008ed29cfb34af53fa0df4336a56040b controlPlane: true nodeLabels: - "node.longhorn.io/create-default-disk": "true" + "node.longhorn.io/create-default-disk": "config" networkInterfaces: - deviceSelector: hardwareAddr: "bc:24:11:b5:dd:1f" @@ -46,7 +46,7 @@ nodes: talosImageURL: factory.talos.dev/installer/88d1f7a5c4f1d3aba7df787c448c1d3d008ed29cfb34af53fa0df4336a56040b controlPlane: true nodeLabels: - "node.longhorn.io/create-default-disk": "true" + "node.longhorn.io/create-default-disk": "config" networkInterfaces: - deviceSelector: hardwareAddr: "bc:24:11:0c:fd:22" @@ -65,7 +65,7 @@ nodes: talosImageURL: factory.talos.dev/installer/88d1f7a5c4f1d3aba7df787c448c1d3d008ed29cfb34af53fa0df4336a56040b controlPlane: true nodeLabels: - "node.longhorn.io/create-default-disk": "true" + "node.longhorn.io/create-default-disk": "config" networkInterfaces: - deviceSelector: hardwareAddr: "bc:24:11:a8:19:33" @@ -139,7 +139,15 @@ patches: net.core.rmem_max: "2500000" net.core.wmem_max: "2500000" - # Mount longhorn in kubelet + # Add additional ssd + - |- + machine: + disks: + - device: /dev/sdb + partitions: + - mountpoint: /var/mnt/ssd + + # Mount longhorn and local-hostpath in kubelet - |- machine: kubelet: @@ -151,9 +159,16 @@ patches: - bind - rshared - rw - - destination: /var/democratic-csi/local + - destination: /var/mnt/ssd/longhorn + type: bind + source: /var/mnt/ssd/longhorn + options: + - bind + - rshared + - rw + - destination: /var/mnt/ssd/democratic-csi/local type: bind - source: /var/democratic-csi/local + source: /var/mnt/ssd/democratic-csi/local options: - bind - rshared diff --git a/kubernetes/talos/clusterconfig/talosconfig b/kubernetes/talos/clusterconfig/talosconfig deleted file mode 100644 index e35e5db5..00000000 --- a/kubernetes/talos/clusterconfig/talosconfig +++ /dev/null @@ -1,2 +0,0 @@ -context: "" -contexts: {}