From 6f7c4e91f514eb22f5f88ded23842630234c1d36 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Sat, 27 Dec 2025 23:02:22 +0000 Subject: [PATCH] chore: Update manifests after change --- .../manifests/garage/ConfigMap-garage.yaml | 2 +- ...n.yaml => Deployment-garage-server-1.yaml} | 51 ++++++-------- .../garage/Deployment-garage-server-2.yaml | 69 +++++++++++++++++++ .../garage/Deployment-garage-server-3.yaml | 69 +++++++++++++++++++ .../garage/Deployment-garage-webui.yaml | 2 +- .../manifests/garage/Service-garage-2.yaml | 34 +++++++++ .../manifests/garage/Service-garage-3.yaml | 34 +++++++++ .../manifests/garage/Service-garage-main.yaml | 2 +- 8 files changed, 229 insertions(+), 34 deletions(-) rename clusters/cl01tl/manifests/garage/{Deployment-garage-main.yaml => Deployment-garage-server-1.yaml} (63%) create mode 100644 clusters/cl01tl/manifests/garage/Deployment-garage-server-2.yaml create mode 100644 clusters/cl01tl/manifests/garage/Deployment-garage-server-3.yaml create mode 100644 clusters/cl01tl/manifests/garage/Service-garage-2.yaml create mode 100644 clusters/cl01tl/manifests/garage/Service-garage-3.yaml diff --git a/clusters/cl01tl/manifests/garage/ConfigMap-garage.yaml b/clusters/cl01tl/manifests/garage/ConfigMap-garage.yaml index 40e678570..0f61bfa7d 100644 --- a/clusters/cl01tl/manifests/garage/ConfigMap-garage.yaml +++ b/clusters/cl01tl/manifests/garage/ConfigMap-garage.yaml @@ -10,7 +10,7 @@ metadata: namespace: garage data: garage.toml: | - replication_factor = 1 + replication_factor = 3 metadata_dir = "/var/lib/garage/meta" data_dir = "/var/lib/garage/data" diff --git a/clusters/cl01tl/manifests/garage/Deployment-garage-main.yaml b/clusters/cl01tl/manifests/garage/Deployment-garage-server-1.yaml similarity index 63% rename from clusters/cl01tl/manifests/garage/Deployment-garage-main.yaml rename to clusters/cl01tl/manifests/garage/Deployment-garage-server-1.yaml index 29743a868..30e0049bc 100644 --- a/clusters/cl01tl/manifests/garage/Deployment-garage-main.yaml +++ b/clusters/cl01tl/manifests/garage/Deployment-garage-server-1.yaml @@ -1,9 +1,9 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: garage-main + name: garage-server-1 labels: - app.kubernetes.io/controller: main + app.kubernetes.io/controller: server-1 app.kubernetes.io/instance: garage app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: garage @@ -16,17 +16,18 @@ spec: type: Recreate selector: matchLabels: - app.kubernetes.io/controller: main + app.kubernetes.io/controller: server-1 app.kubernetes.io/name: garage app.kubernetes.io/instance: garage template: metadata: annotations: - checksum/configMaps: aecb65cb46684688a356974d7ecaec4abb2d4fed3f71863780e7f35505c7af02 + checksum/configMaps: 222a823b4d415557153f5025ab461945265a16cbb7a39b759091687596c24c29 labels: - app.kubernetes.io/controller: main + app.kubernetes.io/controller: server-1 app.kubernetes.io/instance: garage app.kubernetes.io/name: garage + garage-type: server spec: enableServiceLinks: false serviceAccountName: default @@ -35,29 +36,17 @@ spec: hostNetwork: false hostPID: false dnsPolicy: ClusterFirst + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: garage-type + operator: In + values: + - server + topologyKey: kubernetes.io/hostname containers: - - command: - - sleep - - infinity - image: ubuntu:resolute-20251208 - imagePullPolicy: IfNotPresent - name: debug - resources: - requests: - cpu: 10m - memory: 32Mi - volumeMounts: - - mountPath: /etc/garage.toml - mountPropagation: None - name: config - readOnly: true - subPath: garage.toml - - mountPath: /var/lib/garage/data - name: data - - mountPath: /var/lib/garage/meta - name: db - - mountPath: /var/lib/garage/snapshots - name: snapshots - envFrom: - secretRef: name: garage-token-secret @@ -75,19 +64,19 @@ spec: readOnly: true subPath: garage.toml - mountPath: /var/lib/garage/data - name: data + name: data-1 - mountPath: /var/lib/garage/meta - name: db + name: db-1 - mountPath: /var/lib/garage/snapshots name: snapshots volumes: - configMap: name: garage name: config - - name: data + - name: data-1 persistentVolumeClaim: claimName: garage-data - - name: db + - name: db-1 persistentVolumeClaim: claimName: garage-db - name: snapshots diff --git a/clusters/cl01tl/manifests/garage/Deployment-garage-server-2.yaml b/clusters/cl01tl/manifests/garage/Deployment-garage-server-2.yaml new file mode 100644 index 000000000..62880b5b1 --- /dev/null +++ b/clusters/cl01tl/manifests/garage/Deployment-garage-server-2.yaml @@ -0,0 +1,69 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: garage-server-2 + labels: + app.kubernetes.io/controller: server-2 + app.kubernetes.io/instance: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + helm.sh/chart: garage-4.5.0 + namespace: garage +spec: + revisionHistoryLimit: 3 + replicas: 1 + strategy: + type: Recreate + selector: + matchLabels: + app.kubernetes.io/controller: server-2 + app.kubernetes.io/name: garage + app.kubernetes.io/instance: garage + template: + metadata: + annotations: + checksum/configMaps: 222a823b4d415557153f5025ab461945265a16cbb7a39b759091687596c24c29 + labels: + app.kubernetes.io/controller: server-2 + app.kubernetes.io/instance: garage + app.kubernetes.io/name: garage + garage-type: server + spec: + enableServiceLinks: false + serviceAccountName: default + automountServiceAccountToken: true + hostIPC: false + hostNetwork: false + hostPID: false + dnsPolicy: ClusterFirst + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: garage-type + operator: In + values: + - server + topologyKey: kubernetes.io/hostname + containers: + - envFrom: + - secretRef: + name: garage-token-secret + image: dxflrs/garage:v2.1.0 + imagePullPolicy: IfNotPresent + name: main + resources: + requests: + cpu: 10m + memory: 128Mi + volumeMounts: + - mountPath: /etc/garage.toml + mountPropagation: None + name: config + readOnly: true + subPath: garage.toml + volumes: + - configMap: + name: garage + name: config diff --git a/clusters/cl01tl/manifests/garage/Deployment-garage-server-3.yaml b/clusters/cl01tl/manifests/garage/Deployment-garage-server-3.yaml new file mode 100644 index 000000000..08598b2ec --- /dev/null +++ b/clusters/cl01tl/manifests/garage/Deployment-garage-server-3.yaml @@ -0,0 +1,69 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: garage-server-3 + labels: + app.kubernetes.io/controller: server-3 + app.kubernetes.io/instance: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + helm.sh/chart: garage-4.5.0 + namespace: garage +spec: + revisionHistoryLimit: 3 + replicas: 1 + strategy: + type: Recreate + selector: + matchLabels: + app.kubernetes.io/controller: server-3 + app.kubernetes.io/name: garage + app.kubernetes.io/instance: garage + template: + metadata: + annotations: + checksum/configMaps: 222a823b4d415557153f5025ab461945265a16cbb7a39b759091687596c24c29 + labels: + app.kubernetes.io/controller: server-3 + app.kubernetes.io/instance: garage + app.kubernetes.io/name: garage + garage-type: server + spec: + enableServiceLinks: false + serviceAccountName: default + automountServiceAccountToken: true + hostIPC: false + hostNetwork: false + hostPID: false + dnsPolicy: ClusterFirst + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: garage-type + operator: In + values: + - server + topologyKey: kubernetes.io/hostname + containers: + - envFrom: + - secretRef: + name: garage-token-secret + image: dxflrs/garage:v2.1.0 + imagePullPolicy: IfNotPresent + name: main + resources: + requests: + cpu: 10m + memory: 128Mi + volumeMounts: + - mountPath: /etc/garage.toml + mountPropagation: None + name: config + readOnly: true + subPath: garage.toml + volumes: + - configMap: + name: garage + name: config diff --git a/clusters/cl01tl/manifests/garage/Deployment-garage-webui.yaml b/clusters/cl01tl/manifests/garage/Deployment-garage-webui.yaml index 27e32ac29..d6bbdc6eb 100644 --- a/clusters/cl01tl/manifests/garage/Deployment-garage-webui.yaml +++ b/clusters/cl01tl/manifests/garage/Deployment-garage-webui.yaml @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/configMaps: aecb65cb46684688a356974d7ecaec4abb2d4fed3f71863780e7f35505c7af02 + checksum/configMaps: 222a823b4d415557153f5025ab461945265a16cbb7a39b759091687596c24c29 labels: app.kubernetes.io/controller: webui app.kubernetes.io/instance: garage diff --git a/clusters/cl01tl/manifests/garage/Service-garage-2.yaml b/clusters/cl01tl/manifests/garage/Service-garage-2.yaml new file mode 100644 index 000000000..057085d06 --- /dev/null +++ b/clusters/cl01tl/manifests/garage/Service-garage-2.yaml @@ -0,0 +1,34 @@ +apiVersion: v1 +kind: Service +metadata: + name: garage-2 + labels: + app.kubernetes.io/instance: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + app.kubernetes.io/service: garage-2 + helm.sh/chart: garage-4.5.0 + namespace: garage +spec: + type: ClusterIP + ports: + - port: 3903 + targetPort: 3903 + protocol: TCP + name: admin + - port: 3901 + targetPort: 3901 + protocol: TCP + name: rpc + - port: 3900 + targetPort: 3900 + protocol: TCP + name: s3 + - port: 3902 + targetPort: 3902 + protocol: TCP + name: web + selector: + app.kubernetes.io/controller: server-2 + app.kubernetes.io/instance: garage + app.kubernetes.io/name: garage diff --git a/clusters/cl01tl/manifests/garage/Service-garage-3.yaml b/clusters/cl01tl/manifests/garage/Service-garage-3.yaml new file mode 100644 index 000000000..41e726ff7 --- /dev/null +++ b/clusters/cl01tl/manifests/garage/Service-garage-3.yaml @@ -0,0 +1,34 @@ +apiVersion: v1 +kind: Service +metadata: + name: garage-3 + labels: + app.kubernetes.io/instance: garage + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: garage + app.kubernetes.io/service: garage-3 + helm.sh/chart: garage-4.5.0 + namespace: garage +spec: + type: ClusterIP + ports: + - port: 3903 + targetPort: 3903 + protocol: TCP + name: admin + - port: 3901 + targetPort: 3901 + protocol: TCP + name: rpc + - port: 3900 + targetPort: 3900 + protocol: TCP + name: s3 + - port: 3902 + targetPort: 3902 + protocol: TCP + name: web + selector: + app.kubernetes.io/controller: server-3 + app.kubernetes.io/instance: garage + app.kubernetes.io/name: garage diff --git a/clusters/cl01tl/manifests/garage/Service-garage-main.yaml b/clusters/cl01tl/manifests/garage/Service-garage-main.yaml index 6d75b0864..fc2c89138 100644 --- a/clusters/cl01tl/manifests/garage/Service-garage-main.yaml +++ b/clusters/cl01tl/manifests/garage/Service-garage-main.yaml @@ -29,6 +29,6 @@ spec: protocol: TCP name: web selector: - app.kubernetes.io/controller: main + app.kubernetes.io/controller: server-1 app.kubernetes.io/instance: garage app.kubernetes.io/name: garage