fix: Update manifests to ensure it can be rendered correctly

bytedance · Nov 8, 2024 · bdb4313 · bdb4313
1 parent fc47c87
commit bdb4313
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/manifests/varmor/templates/deployments/classifier.yaml b/manifests/varmor/templates/deployments/classifier.yaml
@@ -58,4 +58,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end}}
+{{- end }}
diff --git a/manifests/varmor/templates/deployments/manager.yaml b/manifests/varmor/templates/deployments/manager.yaml
@@ -56,10 +56,11 @@ spec:
         {{- with .Values.manager.bpfExclusiveMode.args }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{ - if .Values.enableMetrics.enabled }}
-        {{ - with .Values.manager.enableMetrics.args }}
-        {{ - toYaml . | nindent 8 }}
-        {{ - end }}
+        {{- end }}
+        {{- if .Values.metrics.enabled }}
+        {{- with .Values.manager.metrics.args }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
         {{- end }}
         {{- end }}
         securityContext:
@@ -71,7 +72,7 @@ spec:
         - name: status
           containerPort: 8080
           protocol: TCP
-        {{ - if .Values.enableMetrics.enabled }}
+        {{- if .Values.metrics.enabled }}
         - name: metrics
           containerPort: 8081
           protocol: TCP

diff --git a/manifests/varmor/templates/monitor/manager-service-monitor.yaml b/manifests/varmor/templates/monitor/manager-service-monitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.enableMetrics.enabled .Values.enableMetrics.serviceMonitorEnabled }}
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitorEnabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -18,4 +18,4 @@ spec:
       path: /metrics
       interval: 15s
       scrapeTimeout: 14s
-  {{- end }}
+  {{- end }}
diff --git a/manifests/varmor/templates/services/varmor-metrics-svc.yaml b/manifests/varmor/templates/services/varmor-metrics-svc.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.enableMetrics.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "varmor.manager.fullname" . }}-metrics
+  name: varmor-metrics-svc
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}
@@ -13,10 +13,10 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: 8081
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
+  - port: 8081
+    targetPort: metrics
+    protocol: TCP
+    name: metrics
   selector:
     {{- include "varmor.manager.selectorLabels" . | nindent 4 }}
-  {{- end }}
+{{- end }}
diff --git a/manifests/varmor/values.yaml b/manifests/varmor/values.yaml
@@ -15,7 +15,7 @@ appArmorLsmEnforcer:
 bpfLsmEnforcer:
   enabled: false
 
-enableMetrics:
+metrics:
   enabled: false
   serviceMonitorEnabled: false
 
@@ -93,16 +93,18 @@ manager:
     args:
     - --bpfExclusiveMode
 
+  metrics:
+    args:
+    - --enableMetrics
+
   resources:
     limits:
       cpu: 200m
       memory: 300Mi
     requests:
       cpu: 100m
       memory: 200Mi
-  enableMetrics:
-    args:
-      - --enableMetrics
+
   autoscaling:
     enabled: false
     minReplicas: 3