diff --git a/kubernetes/apps/databases/cloudnative-pg/cluster/cluster.yaml b/kubernetes/apps/databases/cloudnative-pg/cluster/cluster.yaml index 9ca1449bf..e3e654efc 100644 --- a/kubernetes/apps/databases/cloudnative-pg/cluster/cluster.yaml +++ b/kubernetes/apps/databases/cloudnative-pg/cluster/cluster.yaml @@ -42,7 +42,7 @@ spec: endpointURL: https://ba20be062ff7623f9d887afa37183c8f.r2.cloudflarestorage.com # Note: serverName version needs to be inclemented # when recovering from an existing cnpg cluster - serverName: postgres-v7 + serverName: postgres-v8 s3Credentials: accessKeyId: name: cloudnative-pg-secret @@ -52,12 +52,12 @@ spec: key: AWS_SECRET_ACCESS_KEY # # Note: previousCluster needs to be set to the name of the previous # # cluster when recovering from an existing cnpg cluster - # bootstrap: - # recovery: - # source: &previousCluster postgres-v7 + bootstrap: + recovery: + source: &previousCluster postgres-v7 # # Note: externalClusters is needed when recovering from an existing cnpg cluster - # externalClusters: - # - name: *previousCluster - # barmanObjectStore: - # <<: *barmanObjectStore - # serverName: *previousCluster + externalClusters: + - name: *previousCluster + barmanObjectStore: + <<: *barmanObjectStore + serverName: *previousCluster diff --git a/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml b/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml index a2a514c2d..dd0e51079 100644 --- a/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml +++ b/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml @@ -27,7 +27,10 @@ spec: image: registry: quay.io/ hostpathClass: + enabled: true name: openebs-hostpath + isDefaultClass: false + basePath: /var/mnt/extra/openebs/local helperPod: image: registry: quay.io/ diff --git a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml index 161ae8981..9c199ceae 100644 --- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml @@ -42,6 +42,7 @@ spec: enabled: true configOverride: | [global] + osd_pool_default_min_size = 2 bdev_enable_discard = true bdev_async_discard = true osd_class_update_on_start = false @@ -76,36 +77,9 @@ spec: operator: Exists mon: <<: *placement - resources: - mgr: - requests: - cpu: 100m - memory: 512Mi - limits: - memory: 2Gi - mon: - requests: - cpu: 50m - memory: 512Mi - limits: - memory: 1Gi - osd: - requests: - cpu: 500m - memory: 2Gi - limits: - memory: 8Gi - mgr-sidecar: - requests: - cpu: 50m - memory: 128Mi - limits: - memory: 256Mi storage: useAllNodes: true useAllDevices: false - config: - osdsPerDevice: "1" devicePathFilter: /dev/disk/by-id/nvme-SAMSUNG_MZQL23T8HCLS-00A07_.* cephBlockPools: - name: ceph-blockpool @@ -121,7 +95,7 @@ spec: allowVolumeExpansion: true parameters: imageFormat: "2" - imageFeatures: layering + imageFeatures: layering,fast-diff,object-map,deep-flatten,exclusive-lock csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner diff --git a/talos/README.md b/talos/README.md new file mode 100644 index 000000000..67a9ca70c --- /dev/null +++ b/talos/README.md @@ -0,0 +1,11 @@ +# MS-01 Configuration + +MS-01 Barebones i9-13900H +Crucial 96GB DDR5-5600 +Google Coral TPU M.2 A+E Key + +# MS-01 Storage Configuration + +Samsung PM9A3 3.84TB U.2 (PCIe 4.0 x4) [rook-ceph] +Samsung PM9A3 1.92TB M.2 (PCIe 3.0 x4) [openebs] +Samsung PM9A3 1.92TB M.2 (PCIe 3.0 x2) [talos] diff --git a/talos/talconfig.yaml b/talos/talconfig.yaml index 021312ff3..46117fb4f 100644 --- a/talos/talconfig.yaml +++ b/talos/talconfig.yaml @@ -26,9 +26,13 @@ cniConfig: nodes: - hostname: m0.k8s.internal ipAddress: 192.168.10.10 - installDiskSelector: - serial: 052410221DA7 controlPlane: true + installDiskSelector: + serial: XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x4) + machineDisks: + - device: /dev/disk/by-id/XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x2) + partitions: + - mountpoint: /var/mnt/extra networkInterfaces: - interface: bond0 bond: @@ -80,9 +84,13 @@ nodes: - hostname: m1.k8s.internal ipAddress: 192.168.10.11 - installDiskSelector: - serial: 052410221DA8 controlPlane: true + installDiskSelector: + serial: XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x4) + machineDisks: + - device: /dev/disk/by-id/XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x2) + partitions: + - mountpoint: /var/mnt/extra networkInterfaces: - interface: bond0 bond: @@ -134,9 +142,13 @@ nodes: - hostname: m2.k8s.internal ipAddress: 192.168.10.12 - installDiskSelector: - serial: 052410221B9A controlPlane: true + installDiskSelector: + serial: XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x4) + machineDisks: + - device: /dev/disk/by-id/XYZ # TODO: Samsung PM9A3 1.92TB NVMe PCIe 4.0x4 M.2 22110 (PCIe 3.0 x2) + partitions: + - mountpoint: /var/mnt/extra networkInterfaces: - interface: bond0 bond: @@ -255,9 +267,11 @@ controlPlane: kubelet: extraArgs: rotate-server-certificates: true + extraConfig: + maxPods: 150 extraMounts: - - destination: /var/openebs/local - source: /var/openebs/local + - destination: /var/mnt/extra + source: /var/mnt/extra type: bind options: - bind @@ -365,11 +379,19 @@ controlPlane: - |- cluster: allowSchedulingOnMasters: true + apiServer: + extraArgs: + enable-aggregator-routing: "true" controllerManager: extraArgs: bind-address: 0.0.0.0 coreDNS: disabled: true + etcd: + extraArgs: + listen-metrics-urls: http://0.0.0.0:2381 + advertisedSubnets: + - 192.168.10.0/24 proxy: disabled: true scheduler: @@ -389,15 +411,6 @@ controlPlane: topologyKey: kubernetes.io/hostname whenUnsatisfiable: ScheduleAnyway - # ETCD configuration - - |- - cluster: - etcd: - extraArgs: - listen-metrics-urls: http://0.0.0.0:2381 - advertisedSubnets: - - 192.168.10.0/24 - # Disable default API server admission plugins. - |- - op: remove