Add recommended labels for trivy

goharbor · Sep 21, 2021 · fd00de9 · fd00de9
1 parent 1d5aa9c
commit fd00de9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -240,6 +240,22 @@ app.kubernetes.io/component: registry
 component: registry
 {{- end -}}
 
+{{/*
+Labels for harbor-trivy
+*/}}
+{{- define "harbor.trivy.labels" -}}
+app.kubernetes.io/version: {{ .Values.trivy.internal.image.tag }}
+{{ include "harbor.trivy.matchLabels" . }}
+{{- end -}}
+
+{{/*
+Matchlabels for harbor-trivy
+*/}}
+{{- define "harbor.trivy.matchLabels" -}}
+app.kubernetes.io/component: trivy
+component: trivy
+{{- end -}}
+
 {{- define "harbor.autoGenCert" -}}
   {{- if and .Values.expose.tls.enabled (eq .Values.expose.tls.certSource "auto") -}}
     {{- printf "true" -}}

diff --git a/templates/trivy/trivy-secret.yaml b/templates/trivy/trivy-secret.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ template "harbor.trivy" . }}
   labels:
 {{ include "harbor.labels" . | indent 4 }}
+{{ include "harbor.trivy.labels" . | indent 4 }}
 type: Opaque
 data:
   redisURL: {{ include "harbor.redis.urlForTrivy" . | b64enc }}

diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
@@ -6,19 +6,19 @@ metadata:
   name: {{ template "harbor.trivy" . }}
   labels:
 {{ include "harbor.labels" . | indent 4 }}
-    component: trivy
+{{ include "harbor.trivy.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.trivy.replicas }}
   serviceName: {{  template "harbor.trivy" . }}
   selector:
     matchLabels:
 {{ include "harbor.matchLabels" . | indent 6 }}
-      component: trivy
+{{ include "harbor.trivy.matchLabels" . | indent 6 }}
   template:
     metadata:
       labels:
 {{ include "harbor.labels" . | indent 8 }}
-        component: trivy
+{{ include "harbor.trivy.labels" . | indent 8 }}
       annotations:
         checksum/secret: {{ include (print $.Template.BasePath "/trivy/trivy-secret.yaml") . | sha256sum }}
 {{- if and .Values.internalTLS.enabled (eq .Values.internalTLS.certSource "auto") }}
@@ -180,6 +180,7 @@ spec:
       name: data
       labels:
 {{ include "harbor.labels" . | indent 8 }}
+{{ include "harbor.trivy.labels" . | indent 8 }}
     spec:
       accessModes: [{{ $trivy.accessMode | quote }}]
       {{- if $trivy.storageClass }}

diff --git a/templates/trivy/trivy-svc.yaml b/templates/trivy/trivy-svc.yaml
@@ -5,12 +5,13 @@ metadata:
   name: "{{ template "harbor.trivy" . }}"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
+{{ include "harbor.trivy.labels" . | indent 4 }}
 spec:
   ports:
     - name: {{ ternary "https-trivy" "http-trivy" .Values.internalTLS.enabled }}
       protocol: TCP
       port: {{ template "harbor.trivy.servicePort" . }}
   selector:
 {{ include "harbor.matchLabels" . | indent 4 }}
-    component: trivy
+{{ include "harbor.trivy.matchLabels" . | indent 4 }}
 {{ end }}
diff --git a/templates/trivy/trivy-tls.yaml b/templates/trivy/trivy-tls.yaml
@@ -6,6 +6,7 @@ metadata:
   name: "{{ template "harbor.internalTLS.trivy.secretName" . }}"
   labels:
 {{ include "harbor.labels" . | indent 4 }}
+{{ include "harbor.trivy.labels" . | indent 4 }}
 type: kubernetes.io/tls
 data:
   ca.crt: {{ (required "The \"internalTLS.trustCa\" is required!" .Values.internalTLS.trustCa) | b64enc | quote }}