Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/argocd-apps/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/argocd-apps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
deer-wmde marked this conversation as resolved.
Resolved
- read trivy values from deploy repo

## 2.3.0
- add trivy operator to local and production

Expand Down
6 changes: 2 additions & 4 deletions charts/argocd-apps/templates/trivy-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading