diff --git a/charts/Chart.yaml b/charts/Chart.yaml index 4076677..5ad32a3 100644 --- a/charts/Chart.yaml +++ b/charts/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: gitops-helm-byoa description: A Helm chart for Harness GitOps Agent through BYOA installation flows. -version: 1.3.3 +version: 1.3.4 diff --git a/charts/templates/gitops-agent/deployment.yaml b/charts/templates/gitops-agent/deployment.yaml index 8eea506..3d8ab89 100755 --- a/charts/templates/gitops-agent/deployment.yaml +++ b/charts/templates/gitops-agent/deployment.yaml @@ -90,13 +90,12 @@ spec: valueFrom: secretKeyRef: name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }} - + optional: true {{- if .Values.externalRedis.host }} key: redis-password {{- else }} key: auth {{- end }} - optional: true - name: REDIS_SENTINEL_USERNAME valueFrom: secretKeyRef: diff --git a/charts/templates/gitops-agent/metrics.yaml b/charts/templates/gitops-agent/metrics.yaml index 58083e7..3910d1e 100644 --- a/charts/templates/gitops-agent/metrics.yaml +++ b/charts/templates/gitops-agent/metrics.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: Service metadata: - name: {{ ".Values.agent.name" }}-metrics + name: {{ .Values.agent.name }}-metrics namespace: {{ .Release.Namespace | quote }} labels: {{- include "harness.agentLabels" (dict "context" . "component" .Values.agent.name "name" (printf "%s-metrics" .Values.agent.name)) | nindent 4 }} {{- with .Values.agent.metrics.service.labels }} {{- toYaml . | nindent 4 }} {{- end }} - {{- if or .Values.agent.metrics.service.annotations .Values.global.addPrometheusAnnotations }} + {{- if or .Values.agent.metrics.service.annotations .Values.agent.addPrometheusAnnotations }} annotations: - {{- if .Values.global.addPrometheusAnnotations }} + {{- if .Values.agent.addPrometheusAnnotations }} prometheus.io/port: {{ .Values.agent.metrics.service.servicePort | quote }} prometheus.io/scrape: "true" {{- end }} diff --git a/charts/templates/gitops-agent/secret.yaml b/charts/templates/gitops-agent/secret.yaml index 8a0996a..6007dd0 100644 --- a/charts/templates/gitops-agent/secret.yaml +++ b/charts/templates/gitops-agent/secret.yaml @@ -37,5 +37,5 @@ data: {{ .Values.harness.secrets.mtlsClientCert }} client.key: | {{ .Values.harness.secrets.mtlsClientKey }} ---- +