infrastructure/clickhouse/vk-prod/clickhouse.yaml

@@ -39,12 +39,7 @@ spec:
         initDatabases: true
         admin: true
         nodeSelector:
-          dedicated: sts
-        tolerations:
-          - key: dedicated
-            operator: Equal
-            value: sts
-            effect: NoSchedule
+          dedicated: generic
         resources:
           requests:
             cpu: "1"

infrastructure/valkey/vk-prod/valkey.yaml

@@ -37,7 +37,6 @@ spec:
       appendonly yes
       save ""
       maxmemory 6gb
-      aclfile /opt/bitnami/valkey/acl/users.acl
     serviceAccount:
       create: true
       automountServiceAccountToken: true
@@ -62,13 +61,6 @@ spec:
       replicaCount: 3
       automountServiceAccountToken: true
       podAntiAffinityPreset: hard
-      nodeSelector:
-        dedicated: sts
-      tolerations:
-        - key: dedicated
-          operator: Equal
-          value: sts
-          effect: NoSchedule
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: topology.kubernetes.io/zone
@@ -89,14 +81,5 @@ spec:
         enabled: true
         size: 32Gi
         storageClass: csi-ceph-ssd-retain
-      extraVolumes:
-        - name: users-acl
-          secret:
-            secretName: valkey-users-acl
-            defaultMode: 292
-      extraVolumeMounts:
-        - name: users-acl
-          mountPath: /opt/bitnami/valkey/acl
-          readOnly: true
     metrics:
       enabled: false