diff --git a/clusters/cl01tl/manifests/rybbit/Cluster-rybbit-postgresql-18-cluster.yaml b/clusters/cl01tl/manifests/rybbit/Cluster-rybbit-postgresql-18-cluster.yaml index 6c0faa361..135edc433 100644 --- a/clusters/cl01tl/manifests/rybbit/Cluster-rybbit-postgresql-18-cluster.yaml +++ b/clusters/cl01tl/manifests/rybbit/Cluster-rybbit-postgresql-18-cluster.yaml @@ -4,11 +4,11 @@ metadata: name: rybbit-postgresql-18-cluster namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm spec: instances: 3 @@ -55,4 +55,3 @@ spec: initdb: database: app owner: app - externalClusters: diff --git a/clusters/cl01tl/manifests/rybbit/ConfigMap-rybbit.yaml b/clusters/cl01tl/manifests/rybbit/ConfigMap-rybbit.yaml new file mode 100644 index 000000000..14870ef6b --- /dev/null +++ b/clusters/cl01tl/manifests/rybbit/ConfigMap-rybbit.yaml @@ -0,0 +1,48 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: rybbit + labels: + app.kubernetes.io/instance: rybbit + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: rybbit + helm.sh/chart: rybbit-4.6.2 + namespace: rybbit +data: + enable_json.xml: | + + + 1 + + + logging_rules.xml: | + + + warning + true + + + + + + + + + + + + + network.xml: | + + 0.0.0.0 + + user_logging.xml: | + + + + 0 + 0 + 0 + + + diff --git a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-backend.yaml b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-backend.yaml index 50b02148c..b9b2ab18e 100644 --- a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-backend.yaml +++ b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-backend.yaml @@ -21,6 +21,8 @@ spec: app.kubernetes.io/instance: rybbit template: metadata: + annotations: + checksum/configMaps: 26a783f1bf2cd5bcd4f724d505a909d6e3bb7b3715f1dfa01a98609864d4ab3e labels: app.kubernetes.io/controller: backend app.kubernetes.io/instance: rybbit diff --git a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-clickhouse.yaml b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-clickhouse.yaml index 41a9e9e8d..87d0132e6 100644 --- a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-clickhouse.yaml +++ b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-clickhouse.yaml @@ -21,6 +21,8 @@ spec: app.kubernetes.io/instance: rybbit template: metadata: + annotations: + checksum/configMaps: 26a783f1bf2cd5bcd4f724d505a909d6e3bb7b3715f1dfa01a98609864d4ab3e labels: app.kubernetes.io/controller: clickhouse app.kubernetes.io/instance: rybbit @@ -47,7 +49,7 @@ spec: secretKeyRef: key: clickhouse-password name: rybbit-config-secret - image: clickhouse/clickhouse-server:25.4.2 + image: clickhouse/clickhouse-server:26.1.2 imagePullPolicy: IfNotPresent livenessProbe: exec: @@ -71,7 +73,30 @@ spec: volumeMounts: - mountPath: /var/lib/clickhouse name: clickhouse + - mountPath: /etc/clickhouse-server/config.d/network.xml + mountPropagation: None + name: clickhouse-config + readOnly: true + subPath: network.xml + - mountPath: /etc/clickhouse-server/config.d/enable_json.xml + mountPropagation: None + name: clickhouse-config + readOnly: true + subPath: enable_json.xml + - mountPath: /etc/clickhouse-server/config.d/logging_rules.xml + mountPropagation: None + name: clickhouse-config + readOnly: true + subPath: logging_rules.xml + - mountPath: /etc/clickhouse-server/config.d/user_logging.xml + mountPropagation: None + name: clickhouse-config + readOnly: true + subPath: user_logging.xml volumes: - name: clickhouse persistentVolumeClaim: claimName: clickhouse-data + - configMap: + name: clickhouse-config + name: clickhouse-config diff --git a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-client.yaml b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-client.yaml index a8486a858..18cc8d792 100644 --- a/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-client.yaml +++ b/clusters/cl01tl/manifests/rybbit/Deployment-rybbit-client.yaml @@ -21,6 +21,8 @@ spec: app.kubernetes.io/instance: rybbit template: metadata: + annotations: + checksum/configMaps: 26a783f1bf2cd5bcd4f724d505a909d6e3bb7b3715f1dfa01a98609864d4ab3e labels: app.kubernetes.io/controller: client app.kubernetes.io/instance: rybbit diff --git a/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-backup-garage-local-secret.yaml b/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-backup-garage-local-secret.yaml index 354b86777..fabba26a4 100644 --- a/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-backup-garage-local-secret.yaml +++ b/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-backup-garage-local-secret.yaml @@ -4,11 +4,11 @@ metadata: name: rybbit-postgresql-18-backup-garage-local-secret namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: rybbit-postgresql-18-backup-garage-local-secret spec: diff --git a/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-recovery-secret.yaml b/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-recovery-secret.yaml index 7bb0dfe29..f71d0542d 100644 --- a/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-recovery-secret.yaml +++ b/clusters/cl01tl/manifests/rybbit/ExternalSecret-rybbit-postgresql-18-recovery-secret.yaml @@ -4,11 +4,11 @@ metadata: name: rybbit-postgresql-18-recovery-secret namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: rybbit-postgresql-18-recovery-secret spec: diff --git a/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-backup-garage-local.yaml b/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-backup-garage-local.yaml index af42f5653..8c07b43a3 100644 --- a/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-backup-garage-local.yaml +++ b/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-backup-garage-local.yaml @@ -4,11 +4,11 @@ metadata: name: rybbit-postgresql-18-backup-garage-local namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: rybbit-postgresql-18-backup-garage-local spec: diff --git a/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-recovery.yaml b/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-recovery.yaml index c511ec417..eb78d2d7d 100644 --- a/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-recovery.yaml +++ b/clusters/cl01tl/manifests/rybbit/ObjectStore-rybbit-postgresql-18-recovery.yaml @@ -4,11 +4,11 @@ metadata: name: "rybbit-postgresql-18-recovery" namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: "rybbit-postgresql-18-recovery" spec: diff --git a/clusters/cl01tl/manifests/rybbit/PrometheusRule-rybbit-postgresql-18-alert-rules.yaml b/clusters/cl01tl/manifests/rybbit/PrometheusRule-rybbit-postgresql-18-alert-rules.yaml index c039e6ba2..99805626b 100644 --- a/clusters/cl01tl/manifests/rybbit/PrometheusRule-rybbit-postgresql-18-alert-rules.yaml +++ b/clusters/cl01tl/manifests/rybbit/PrometheusRule-rybbit-postgresql-18-alert-rules.yaml @@ -4,11 +4,11 @@ metadata: name: rybbit-postgresql-18-alert-rules namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm spec: groups: diff --git a/clusters/cl01tl/manifests/rybbit/ScheduledBackup-rybbit-postgresql-18-scheduled-backup-live-backup.yaml b/clusters/cl01tl/manifests/rybbit/ScheduledBackup-rybbit-postgresql-18-scheduled-backup-live-backup.yaml index 0212061d0..366703b08 100644 --- a/clusters/cl01tl/manifests/rybbit/ScheduledBackup-rybbit-postgresql-18-scheduled-backup-live-backup.yaml +++ b/clusters/cl01tl/manifests/rybbit/ScheduledBackup-rybbit-postgresql-18-scheduled-backup-live-backup.yaml @@ -4,11 +4,11 @@ metadata: name: "rybbit-postgresql-18-scheduled-backup-live-backup" namespace: rybbit labels: - helm.sh/chart: postgres-18-cluster-7.5.1 + helm.sh/chart: postgres-18-cluster-7.6.0 app.kubernetes.io/name: rybbit-postgresql-18 app.kubernetes.io/instance: rybbit app.kubernetes.io/part-of: rybbit - app.kubernetes.io/version: "7.5.1" + app.kubernetes.io/version: "7.6.0" app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: "rybbit-postgresql-18-scheduled-backup-live-backup" spec: