diff --git a/clusters/cl01tl/helm/argocd/values.yaml b/clusters/cl01tl/helm/argocd/values.yaml index 44e6f6221..9f7eab2f7 100644 --- a/clusters/cl01tl/helm/argocd/values.yaml +++ b/clusters/cl01tl/helm/argocd/values.yaml @@ -55,14 +55,7 @@ argo-cd: server: replicas: 2 extensions: - enabled: true - extensionList: - - name: extension-trivy - env: - - name: EXTENSION_URL - value: https://github.com/mziyabo/argocd-trivy-extension/releases/download/v0.2.0/extension-trivy.tar - - name: EXTENSION_CHECKSUM_URL - value: https://github.com/mziyabo/argocd-trivy-extension/releases/download/v0.2.0/extension-trivy_checksums.txt + enabled: false metrics: enabled: true serviceMonitor: diff --git a/clusters/cl01tl/helm/eraser/values.yaml b/clusters/cl01tl/helm/eraser/values.yaml index 47bebd3af..6f6878688 100644 --- a/clusters/cl01tl/helm/eraser/values.yaml +++ b/clusters/cl01tl/helm/eraser/values.yaml @@ -34,27 +34,7 @@ eraser: request: cpu: 100m memory: 128Mi - config: "" # | - # cacheDir: /var/lib/trivy - # dbRepo: ghcr.io/aquasecurity/trivy-db - # deleteFailedImages: true - # deleteEOLImages: true - # vulnerabilities: - # ignoreUnfixed: true - # types: - # - os - # - library - # securityChecks: - # - vuln - # severities: - # - CRITICAL - # - HIGH - # - MEDIUM - # - LOW - # ignoredStatuses: - # timeout: - # total: 23h - # perImage: 1h + config: "" remover: request: cpu: 10m diff --git a/clusters/cl01tl/helm/grafana-operator/templates/grafana-dashboard.yaml b/clusters/cl01tl/helm/grafana-operator/templates/grafana-dashboard.yaml index 912d7fac2..1f2c3ca09 100644 --- a/clusters/cl01tl/helm/grafana-operator/templates/grafana-dashboard.yaml +++ b/clusters/cl01tl/helm/grafana-operator/templates/grafana-dashboard.yaml @@ -377,25 +377,6 @@ spec: resyncPeriod: 1h url: http://gitea-http.gitea:3000/alexlebens/grafana-dashboards/raw/branch/main/dashboards/service/tdarr.json ---- -apiVersion: grafana.integreatly.org/v1beta1 -kind: GrafanaDashboard -metadata: - name: grafana-dashboard-trivy - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: grafana-dashboard-trivy - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - instanceSelector: - matchLabels: - app: grafana-main - contentCacheDuration: 1h - folderUID: grafana-folder-service - resyncPeriod: 1h - url: http://gitea-http.gitea:3000/alexlebens/grafana-dashboards/raw/branch/main/dashboards/service/trivy.json - --- apiVersion: grafana.integreatly.org/v1beta1 kind: GrafanaDashboard diff --git a/clusters/cl01tl/helm/headlamp/values.yaml b/clusters/cl01tl/helm/headlamp/values.yaml index fde705410..49479cdce 100644 --- a/clusters/cl01tl/helm/headlamp/values.yaml +++ b/clusters/cl01tl/helm/headlamp/values.yaml @@ -25,9 +25,6 @@ headlamp: - name: cert-manager source: https://artifacthub.io/packages/headlamp/headlamp-plugins/headlamp_cert-manager version: 0.1.0 - - name: trivy - source: https://artifacthub.io/packages/headlamp/headlamp-trivy/headlamp_trivy - version: 0.3.1 - name: external-secrets-operator source: https://artifacthub.io/packages/headlamp/external-secrets-operator-headlamp-plugin/external-secrets-operator version: 0.1.0-beta7