diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml index 12d49c5..8c9c9fa 100644 --- a/charts/argocd-apps/Chart.yaml +++ b/charts/argocd-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: argocd-apps description: Chart to deploy WBaaS apps in an "app-of-apps" pattern via ArgoCD type: application -version: 2.3.0 +version: 2.4.0 appVersion: "1.0" maintainers: - name: WBstack diff --git a/charts/argocd-apps/README.md b/charts/argocd-apps/README.md index 0ee39b7..1a007ff 100644 --- a/charts/argocd-apps/README.md +++ b/charts/argocd-apps/README.md @@ -3,6 +3,10 @@ Deploys actual `Application` manifests for Argo CD. This chart gets treated as it's own `Application`, the app-of-apps, by the chart [argocd-config](../argocd-config/README.md). ## Changelog +## 2.4.0 +- enable trivy operator serviceMonitor +- read trivy values from deploy repo + ## 2.3.0 - add trivy operator to local and production diff --git a/charts/argocd-apps/templates/trivy-operator.yaml b/charts/argocd-apps/templates/trivy-operator.yaml index 23acb32..a1d8074 100644 --- a/charts/argocd-apps/templates/trivy-operator.yaml +++ b/charts/argocd-apps/templates/trivy-operator.yaml @@ -13,10 +13,8 @@ spec: targetRevision: {{ .Values.chartVersions.trivyOperator }} chart: trivy-operator helm: - valuesObject: - operator: - namespace: trivy-system - scanJobTimeout: 60m + valueFiles: + - $deployRepo/k8s/argocd/{{ .Values.environment }}/trivy-operator.values.yaml syncPolicy: automated: # disable self-healing for local env so we can use skaffold