Compare commits

..

No commits in common. "ea3e447de5ba6b6e45a1ab7b17e935e50152c50b" and "15067733274f2f2b44d97e8f6f6a73585070e4a1" have entirely different histories.

26 changed files with 38 additions and 90 deletions

View file

@ -11,7 +11,7 @@ spec:
repository: "${rsrc}-restic-secret" repository: "${rsrc}-restic-secret"
destinationPVC: "${claim}" destinationPVC: "${claim}"
copyMethod: Direct copyMethod: Direct
storageClassName: openebs-zfs storageClassName: ceph-block
# IMPORTANT NOTE: # IMPORTANT NOTE:
# Set to the last X number of snapshots to restore from # Set to the last X number of snapshots to restore from
previous: ${previous} previous: ${previous}

View file

@ -41,7 +41,7 @@ spec:
app.kubernetes.io/name: crunchy-postgres app.kubernetes.io/name: crunchy-postgres
replicas: &replica 1 replicas: &replica 1
dataVolumeClaimSpec: dataVolumeClaimSpec:
storageClassName: openebs-zfs storageClassName: openebs-hostpath
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:

View file

@ -1,20 +0,0 @@
apiVersion: v1
kind: Pod
metadata:
name: alpine-debug
namespace: kube-system
spec:
# nodeName: nenya
containers:
- name: alpine-debug
image: alpine
securityContext:
privileged: true
command: ["/bin/ash", "-c", "while true; do sleep 10; done"]
resources:
requests:
cpu: 100m
memory: 512Mi
limits:
cpu: 4000m
memory: 4000Mi

View file

@ -44,7 +44,7 @@ spec:
app.kubernetes.io/name: pgo-${APP} app.kubernetes.io/name: pgo-${APP}
replicas: 1 replicas: 1
dataVolumeClaimSpec: dataVolumeClaimSpec:
storageClassName: openebs-zfs storageClassName: openebs-hostpath
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:

View file

@ -51,7 +51,7 @@ spec:
storage: storage:
volumeClaimTemplate: volumeClaimTemplate:
spec: spec:
storageClassName: openebs-zfs storageClassName: openebs-hostpath
resources: resources:
requests: requests:
storage: 1Gi storage: 1Gi
@ -149,7 +149,7 @@ spec:
storageSpec: storageSpec:
volumeClaimTemplate: volumeClaimTemplate:
spec: spec:
storageClassName: openebs-zfs storageClassName: openebs-hostpath
resources: resources:
requests: requests:
storage: 20Gi storage: 20Gi

View file

@ -114,7 +114,7 @@ spec:
replicas: 1 replicas: 1
persistence: persistence:
size: 20Gi size: 20Gi
storageClass: openebs-zfs storageClass: openebs-hostpath
gateway: gateway:
replicas: 1 replicas: 1
image: image:
@ -135,7 +135,7 @@ spec:
replicas: 1 replicas: 1
persistence: persistence:
size: 20Gi size: 20Gi
storageClass: openebs-zfs storageClass: openebs-hostpath
sidecar: sidecar:
image: image:
repository: ghcr.io/kiwigrid/k8s-sidecar repository: ghcr.io/kiwigrid/k8s-sidecar

View file

@ -72,7 +72,7 @@ spec:
- --retention.resolution-1h=60d - --retention.resolution-1h=60d
persistence: &persistence persistence: &persistence
enabled: true enabled: true
storageClass: openebs-zfs storageClass: openebs-hostpath
size: 10Gi size: 10Gi
query: query:
replicas: 1 replicas: 1

View file

@ -3,16 +3,16 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta2 apiVersion: helm.toolkit.fluxcd.io/v2beta2
kind: HelmRelease kind: HelmRelease
metadata: metadata:
name: openebs-zfs name: openebs
spec: spec:
interval: 30m interval: 30m
chart: chart:
spec: spec:
chart: zfs-localpv chart: openebs
version: 2.5.1 version: 3.10.0
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: openebs-zfs name: openebs
namespace: flux-system namespace: flux-system
install: install:
remediation: remediation:
@ -24,5 +24,9 @@ spec:
uninstall: uninstall:
keepHistory: false keepHistory: false
values: values:
zfsNode: localprovisioner:
encrKeysDir: /var/openebs/keys hostpathClass:
enabled: true
name: openebs-hostpath
isDefaultClass: false
basePath: /var/openebs/local

View file

@ -4,5 +4,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- ./helmrelease.yaml - ./helmrelease.yaml
- ./storageclass.yaml
- ./volumesnapshotclass.yaml

View file

@ -1,12 +0,0 @@
---
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: openebs-zfs
provisioner: zfs.csi.openebs.io
parameters:
recordsize: "128k"
compression: "off"
dedup: "off"
fstype: "zfs"
poolname: "nahar"

View file

@ -1,10 +0,0 @@
---
# yaml-language-server: $schema=https://ks.hsn.dev/snapshot.storage.k8s.io/volumesnapshotclass_v1beta1.json
kind: VolumeSnapshotClass
apiVersion: snapshot.storage.k8s.io/v1beta1
metadata:
name: openebs-zfs
annotations:
snapshot.storage.kubernetes.io/is-default-class: "true"
driver: zfs.csi.openebs.io
deletionPolicy: Delete

View file

@ -3,7 +3,7 @@
clusterName: homelab clusterName: homelab
talosVersion: v1.7.1 talosVersion: v1.7.1
kubernetesVersion: 1.30.0 kubernetesVersion: 1.28.4
endpoint: "https://10.1.1.57:6443" endpoint: "https://10.1.1.57:6443"
additionalApiServerCertSans: additionalApiServerCertSans:
@ -18,7 +18,7 @@ nodes:
ipAddress: 10.1.1.61 ipAddress: 10.1.1.61
controlPlane: true controlPlane: true
installDiskSelector: installDiskSelector:
busPath: /pci0000:20/0000:20:01.2/0000:2c:00.0/nvme/nvme4/nvme4n1 busPath: /pci0000:20/0000:20:01.2/0000:2d:00.0/nvme/nvme1/nvme1n1
networkInterfaces: networkInterfaces:
- interface: enp37s0f1 - interface: enp37s0f1
dhcp: true dhcp: true
@ -33,11 +33,9 @@ nodes:
customization: customization:
systemExtensions: systemExtensions:
officialExtensions: officialExtensions:
- siderolabs/amd-ucode - "siderolabs/amd-ucode"
- siderolabs/nonfree-kmod-nvidia - "siderolabs/nonfree-kmod-nvidia"
- siderolabs/nvidia-container-toolkit - "siderolabs/nvidia-container-toolkit"
- siderolabs/zfs
patches: patches:
- |- - |-
machine: machine:
@ -136,12 +134,12 @@ controlPlane:
validSubnets: validSubnets:
- 10.1.1.0/24 - 10.1.1.0/24
extraMounts: extraMounts:
- destination: /var/openebs/keys - destination: /var/openebs/local
options: options:
- bind - bind
- rshared - rshared
- rw - rw
source: /var/openebs/keys source: /var/openebs/local
type: bind type: bind
# Custom sysctls # Custom sysctls

View file

@ -1,10 +0,0 @@
---
# yaml-language-server: $schema=https://ks.hsn.dev/source.toolkit.fluxcd.io/helmrepository_v1beta2.json
apiVersion: source.toolkit.fluxcd.io/v1beta2
kind: HelmRepository
metadata:
name: openebs-zfs
namespace: flux-system
spec:
interval: 2h
url: https://openebs.github.io/zfs-localpv

View file

@ -36,7 +36,7 @@ spec:
app.kubernetes.io/name: pgo-${APP} app.kubernetes.io/name: pgo-${APP}
replicas: 1 replicas: 1
dataVolumeClaimSpec: dataVolumeClaimSpec:
storageClassName: openebs-zfs storageClassName: openebs-hostpath
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:

View file

@ -12,4 +12,4 @@ spec:
resources: resources:
requests: requests:
storage: "${VOLSYNC_CAPACITY}" storage: "${VOLSYNC_CAPACITY}"
storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" storageClassName: "${VOLSYNC_STORAGECLASS:-ceph-block}"

View file

@ -36,11 +36,11 @@ spec:
copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}" copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}"
pruneIntervalDays: 7 pruneIntervalDays: 7
repository: "${APP}-volsync-secret" repository: "${APP}-volsync-secret"
volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-csi-ceph-blockpool}"
cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}"
cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}"
cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" storageClassName: "${VOLSYNC_STORAGECLASS:-ceph-block}"
accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
moverSecurityContext: moverSecurityContext:
runAsUser: ${APP_UID:-568} runAsUser: ${APP_UID:-568}
@ -62,11 +62,11 @@ spec:
restic: restic:
repository: "${APP}-volsync-secret" repository: "${APP}-volsync-secret"
copyMethod: Snapshot # must be Snapshot copyMethod: Snapshot # must be Snapshot
volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-csi-ceph-blockpool}"
cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}"
cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}"
storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" storageClassName: "${VOLSYNC_STORAGECLASS:-ceph-block}"
accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
capacity: "${VOLSYNC_CAPACITY}" capacity: "${VOLSYNC_CAPACITY}"
moverSecurityContext: moverSecurityContext:

View file

@ -36,11 +36,11 @@ spec:
copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}" copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}"
pruneIntervalDays: 7 pruneIntervalDays: 7
repository: "${APP}-volsync-r2-secret" repository: "${APP}-volsync-r2-secret"
volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-csi-ceph-blockpool}"
cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}"
cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}"
cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"]
storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" storageClassName: "${VOLSYNC_STORAGECLASS:-ceph-block}"
accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"]
moverSecurityContext: moverSecurityContext:
runAsUser: ${APP_UID:-568} runAsUser: ${APP_UID:-568}

View file

@ -4,7 +4,7 @@ apiVersion: v1
metadata: metadata:
name: kbench-pvc name: kbench-pvc
spec: spec:
storageClassName: openebs-zfs storageClassName: ceph-block
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources: