Update perfectscale-agent chart with new package version v1.0.40

perfectscale-io · Sep 24, 2024 · 6f0318d · 6f0318d
1 parent 7c99989
commit 6f0318d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/charts/perfectscale-agent/templates/clusterrole.yaml b/charts/perfectscale-agent/templates/clusterrole.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "helm.labels" . | nindent 4 }}
     {{- if .Values.additionalLabels }}
-    {{ toYaml .Values.additionalLabels | nindent 4 }}
+    {{- toYaml .Values.additionalLabels | nindent 4 }}
     {{- end }}
 rules:
   - apiGroups:

diff --git a/charts/perfectscale-agent/templates/clusterrolebinding.yaml b/charts/perfectscale-agent/templates/clusterrolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "helm.fullname" . }}
   labels: {{- include "helm.labels" . | nindent 4 }}
     {{- if .Values.additionalLabels }}
-    {{ toYaml .Values.additionalLabels | nindent 4 }}
+    {{- toYaml .Values.additionalLabels | nindent 4 }}
     {{- end }}
 subjects:
   - kind: ServiceAccount

diff --git a/charts/perfectscale-agent/templates/deployment.yaml b/charts/perfectscale-agent/templates/deployment.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{- include "helm.labels" . | nindent 4 }}
     {{- if .Values.additionalLabels }}
-    {{ toYaml .Values.additionalLabels | nindent 4 }}
+    {{- toYaml .Values.additionalLabels | nindent 4 }}
     {{- end }}
   {{- with .Values.annotations }}
   annotations:
@@ -24,7 +24,7 @@ spec:
       labels:
         {{- include "helm.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
-        {{ toYaml .Values.podLabels | nindent 8 }}
+        {{- toYaml .Values.podLabels | nindent 8 }}
         {{- end }}
       {{- with .Values.podAnnotations }}
       annotations:

diff --git a/charts/perfectscale-agent/templates/prometheus-rule.yaml b/charts/perfectscale-agent/templates/prometheus-rule.yaml
@@ -9,8 +9,10 @@ metadata:
   name: {{ $fullName }}
   labels:
   {{ toYaml .Values.prometheusRule.labels | indent 4 }}
+  {{- with .Values.prometheusRule.annotations }}
   annotations:
-  {{ toYaml .Values.prometheusRule.annotations | indent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}  
 spec:
   groups:
     - name: {{ $fullName }}

diff --git a/charts/perfectscale-agent/templates/service-monitor.yaml b/charts/perfectscale-agent/templates/service-monitor.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- range $key, $value := .Values.serviceMonitor.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- with .Values.serviceMonitor.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}  
 spec:
   endpoints:
     - port: http

diff --git a/charts/perfectscale-agent/templates/service.yaml b/charts/perfectscale-agent/templates/service.yaml
@@ -5,8 +5,12 @@ metadata:
   labels:
     {{- include "helm.labels" . | nindent 4 }}
     {{- if .Values.additionalLabels }}
-    {{ toYaml .Values.additionalLabels | nindent 4 }}
+    {{- toYaml .Values.additionalLabels | nindent 4 }}
     {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/charts/perfectscale-agent/templates/serviceaccount.yaml b/charts/perfectscale-agent/templates/serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "helm.labels" . | nindent 4 }}
     {{- if .Values.additionalLabels }}
-    {{ toYaml .Values.additionalLabels | nindent 4 }}
+    {{- toYaml .Values.additionalLabels | nindent 4 }}
     {{- end }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:

diff --git a/charts/perfectscale-agent/values.yaml b/charts/perfectscale-agent/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 image:
   repository: public.ecr.aws/perfectscale-io/psc-exporter
   pullPolicy: Always
-  tag: "v1.0.39"
+  tag: "v1.0.40"
 initContainer:
   image:
     repository: public.ecr.aws/perfectscale-io/alpine
@@ -61,7 +61,7 @@ podLabels: {}
 ## Annotations to add to the deployment
 annotations: {}
 ## Annotations to add to the pod
-podAnnotation: {}
+podAnnotations: {}
 ## Pods Service Account
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
 serviceAccount:
@@ -120,21 +120,27 @@ serviceMonitor:
   # Additional Label to the serviceMonitor
   # labels:
   #   prometheus: kube-prometheus
+  # Additional Annotations to the serviceMonitor
+  annotations: {}
 # requires serviceMonitor.enable=true
 prometheusRule:
   enable: false
   team: default
   # warning by default, can be warning/critical
   severity: warning
+  # Additional Label to the prometheusRule
   labels:
     release: prometheus
+  # Additional Annotations to the prometheusRule
+  annotations: {}
   cAdvisorScraping:
     timeRange: "30m"
     threshold: 0.3
 grafana:
   dashboard:
     enabled: false
     namespace: monitoring
+    # Additional Label to the dashboard configmap
     labels:
       grafana_dashboard: "1"
 kube-state-metrics: