From a77a7df4f39122c5157d9ccd737d09c5e47b4308 Mon Sep 17 00:00:00 2001
From: shucheng <shucheng@bd-apaas.com>
Date: Sun, 18 Apr 2021 14:15:53 +0800
Subject: [PATCH] v2.1.3

---
 templates/clair/clair-dpl.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml
index 2c6b64e..b431fd7 100644
--- a/templates/clair/clair-dpl.yaml
+++ b/templates/clair/clair-dpl.yaml
@@ -44,7 +44,7 @@ spec:
 {{- else }}
         image: "{{ .Values.clair.clair.image.hub | default .Values.global.hub }}/{{ .Values.clair.clair.image.repository }}:{{ .Values.clair.clair.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
 {{- end }}
-        imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}"
+        imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
           httpGet:
             path: /health
@@ -85,8 +85,12 @@ spec:
 {{ include "harbor.caBundleVolumeMount" . | indent 8 }}
         {{- end }}
       - name: adapter
-        image: {{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag }}
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
+{{- if contains "/" .Values.clair.adapter.image.repository }}
+        image: "{{ .Values.clair.adapter.image.repository }}"
+{{- else }}
+        image: "{{ .Values.clair.adapter.image.hub | default .Values.global.hub }}/{{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag | default .Values.global.tag }}{{ template "beagle.arch" . }}"
+{{- end }}
+        imagePullPolicy: "{{ .Values.global.imagePullPolicy }}"
         livenessProbe:
           httpGet:
             path: /probe/healthy
-- 
2.26.0