remove flag to disable admin api

Author: stplasim

garage/templates/secret.yaml

@@ -1,8 +1,5 @@
 {{- $rpcSecret := include "garage.rpcSecret" . -}}
-{{- $adminToken := "" -}}
-{{- if .Values.admin.enabled -}}
-{{- $adminToken = required "admin.token is required when admin.enabled=true" .Values.admin.token -}}
-{{- end -}}
+{{- $adminToken := required "admin.token is required" .Values.admin.token -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -12,9 +9,7 @@ metadata:
 type: Opaque
 stringData:
   rpc_secret: {{ $rpcSecret | quote }}
-  {{- if .Values.admin.enabled }}
   admin_token: {{ $adminToken | quote }}
-  {{- end }}
   {{- if .Values.bootstrap.enabled }}
   default_access_key: {{ required "bootstrap.accessKey is required when bootstrap.enabled=true (e.g. GK + 16 hex chars)" .Values.bootstrap.accessKey | quote }}
   default_secret_key: {{ required "bootstrap.secretKey is required when bootstrap.enabled=true" .Values.bootstrap.secretKey | quote }}
@@ -49,9 +44,7 @@ stringData:
     api_bind_addr = "[::]:{{ .Values.service.s3.port }}"
     root_domain = {{ .Values.s3.rootDomain | quote }}
 
-    {{- if .Values.admin.enabled }}
 
     [admin]
     api_bind_addr = "[::]:{{ .Values.admin.port }}"
     admin_token = {{ $adminToken | quote }}
-    {{- end }}

garage/templates/service.yaml

@@ -19,12 +19,10 @@ spec:
     - name: s3
       port: {{ .Values.service.s3.port }}
       targetPort: s3
-    {{- if .Values.admin.enabled }}
     - name: admin
       port: {{ .Values.admin.port }}
       targetPort: admin
-    {{- end }}
-{{- if and .Values.admin.enabled .Values.monitoring.metrics.enabled }}
+{{- if .Values.monitoring.metrics.enabled }}
 ---
 apiVersion: v1
 kind: Service

garage/templates/servicemonitor.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.admin.enabled .Values.monitoring.metrics.enabled .Values.monitoring.metrics.serviceMonitor.enabled }}
+{{- if and .Values.monitoring.metrics.enabled .Values.monitoring.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

garage/templates/statefulset.yaml

@@ -83,10 +83,8 @@ spec:
               containerPort: {{ .Values.service.s3.port }}
             - name: rpc
               containerPort: 3901
-            {{- if .Values.admin.enabled }}
             - name: admin
               containerPort: {{ .Values.admin.port }}
-            {{- end }}
           volumeMounts:
             - name: config
               mountPath: /etc/garage.toml

garage/values.reference.yaml

@@ -50,13 +50,12 @@ s3:
   rootDomain: ".s3.garage"
 
 # -- Admin API: bucket/key management, health checks, and Prometheus metrics.
+# Always enabled — the /health probes and monitoring below depend on it.
 # Kept ClusterIP-only; never exposed via ingress.
 admin:
-  # -- Enable the admin API. Required for the /health probes and monitoring below.
-  enabled: true
   # -- Port the admin API listens on inside the container.
   port: 3903
-  # -- Bearer token protecting the admin API. Required when admin.enabled=true.
+  # -- Bearer token protecting the admin API. Required.
   # Set your own (any sufficiently random string) so it is known up front for
   # managing buckets/keys via the admin API. Prefer --set / Terraform over
   # committing it to git.
@@ -203,7 +202,7 @@ securityContext:
   readOnlyRootFilesystem: true
 
 # -- Liveness/readiness probes. Default to the admin API's /health endpoint
-# (200 only when the node can serve requests). NOTE: requires admin.enabled=true.
+# (200 only when the node can serve requests), served by the admin API.
 # If you disable the admin API, switch these to a tcpSocket check on the `s3` port.
 probes:
   liveness:
@@ -238,7 +237,7 @@ serviceAccount:
   # -- Name of the ServiceAccount (generated from the fullname template if empty).
   name: ""
 
-# -- Prometheus monitoring (requires admin.enabled=true).
+# -- Prometheus monitoring (scrapes the admin API port).
 monitoring:
   metrics:
     # -- Expose the admin API's Prometheus metrics on a separate headless Service.

garage/values.yaml

@@ -20,7 +20,6 @@ s3:
   rootDomain: ".s3.garage"
 
 admin:
-  enabled: true
   port: 3903
   token: ""