fix(garage): use health only for readiness

garage/resources/workload.yaml

@@ -16,53 +16,49 @@ spec:
       serviceAccountName: garage
       priorityClassName: system-cluster-critical
       containers:
-      - name: garage
+        - name: garage
-        image: garage
+          image: garage
-        env:
+          env:
-          - name: GARAGE_ADMIN_TOKEN
+            - name: GARAGE_ADMIN_TOKEN
-            valueFrom:
+              valueFrom:
-              secretKeyRef:
+                secretKeyRef:
-                name: garage-secrets
+                  name: garage-secrets
-                key: admin-token
+                  key: admin-token
-          - name: GARAGE_RPC_SECRET
+            - name: GARAGE_RPC_SECRET
-            valueFrom:
+              valueFrom:
-              secretKeyRef:
+                secretKeyRef:
-                name: garage-secrets
+                  name: garage-secrets
-                key: rpc-secret
+                  key: rpc-secret
-        ports:
+          ports:
-        - containerPort: 3900
+            - containerPort: 3900
-          name: s3-api
+              name: s3-api
-        - containerPort: 3902
+            - containerPort: 3902
-          name: s3-web
+              name: s3-web
-        - containerPort: 3903
+            - containerPort: 3903
-          name: metrics
+              name: metrics
-        volumeMounts:
+          volumeMounts:
-        - name: garage-data
+            - name: garage-data
-          mountPath: /srv/garage
+              mountPath: /srv/garage
-        - name: garage-config
+            - name: garage-config
-          mountPath: /etc/garage.toml
+              mountPath: /etc/garage.toml
-          subPath: garage.toml
+              subPath: garage.toml
-          readOnly: true
+              readOnly: true
-        resources:
+          resources:
-          requests:
+            requests:
-            cpu: 300m
+              cpu: 300m
-            memory: 280Mi
+              memory: 280Mi
-          limits:
+            limits:
-            cpu: 750m
+              cpu: 750m
-            memory: 500Mi
+              memory: 500Mi
-        readinessProbe:
+          readinessProbe:
-          httpGet:
+            httpGet:
-            port: 3903
+              port: 3903
-            path: /health
+              path: /health
-        livenessProbe:
+          securityContext:
-          httpGet:
+            capabilities:
-            port: 3903
+              drop:
-            path: /health
+                - ALL
-        securityContext:
+            readOnlyRootFilesystem: true
-          capabilities:
-            drop:
-              - ALL
-          readOnlyRootFilesystem: true
       nodeSelector:
         k8s.icb4dc0.de/storage-node: "true"
       affinity:
@@ -77,15 +73,15 @@ spec:
                       - arm64
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
+            - weight: 100
-            podAffinityTerm:
+              podAffinityTerm:
-              labelSelector:
+                labelSelector:
-                matchExpressions:
+                  matchExpressions:
-                - key: app.kubernetes.io/name
+                    - key: app.kubernetes.io/name
-                  operator: In
+                      operator: In
-                  values:
+                      values:
-                  - fider
+                        - fider
-              topologyKey: topology.kubernetes.io/zone
+                topologyKey: topology.kubernetes.io/zone
       securityContext:
         runAsUser: 1000
         runAsGroup: 1000
@@ -99,11 +95,11 @@ spec:
               - key: garage.toml
                 path: garage.toml
   volumeClaimTemplates:
-  - metadata:
+    - metadata:
-      name: garage-data
+        name: garage-data
-    spec:
+      spec:
-      accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
-      storageClassName: hcloud-volumes-xfs
+        storageClassName: hcloud-volumes-xfs
-      resources:
+        resources:
-        requests:
+          requests:
-          storage: 20Gi
+            storage: 20Gi