Merge pull request #1749 from zyyw/fix-upgrading-issue

add "harbor.legacy.labels" to resolve the upgrade issue 1747
goharbor · Apr 24, 2024 · f547605 · f547605
2 parents 99ac8b7 + 509eda8
commit f547605
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -25,13 +25,20 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/* Helm required labels: legacy */}}
+{{- define "harbor.legacy.labels" -}}
+heritage: {{ .Release.Service }}
+release: {{ .Release.Name }}
+chart: {{ .Chart.Name }}
+app: "{{ template "harbor.name" . }}"
+{{- end -}}
+
 {{/* Helm required labels */}}
 {{- define "harbor.labels" -}}
 heritage: {{ .Release.Service }}
 release: {{ .Release.Name }}
 chart: {{ .Chart.Name }}
 app: "{{ template "harbor.name" . }}"
-{{ include "harbor.matchLabels" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/name: {{ include "harbor.name" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -571,4 +578,4 @@ app: "{{ template "harbor.name" . }}"
 {{/* Allow KubeVersion to be overridden. */}}
 {{- define "harbor.ingress.kubeVersion" -}}
   {{- default .Capabilities.KubeVersion.Version .Values.expose.ingress.kubeVersionOverride -}}
-{{- end -}}
+{{- end -}}
diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml
@@ -138,7 +138,7 @@ spec:
   - metadata:
       name: "database-data"
       labels:
-{{ include "harbor.labels" . | indent 8 }}
+{{ include "harbor.legacy.labels" . | indent 8 }}
       annotations:
       {{- range $key, $value := $database.annotations }}
         {{ $key }}: {{ $value | quote }}

diff --git a/templates/redis/statefulset.yaml b/templates/redis/statefulset.yaml
@@ -100,7 +100,7 @@ spec:
   - metadata:
       name: data
       labels:
-{{ include "harbor.labels" . | indent 8 }}
+{{ include "harbor.legacy.labels" . | indent 8 }}
       annotations:
       {{- range $key, $value := $redis.annotations }}
         {{ $key }}: {{ $value | quote }}

diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
@@ -205,7 +205,7 @@ spec:
   - metadata:
       name: data
       labels:
-{{ include "harbor.labels" . | indent 8 }}
+{{ include "harbor.legacy.labels" . | indent 8 }}
       annotations:
       {{- range $key, $value := $trivy.annotations }}
         {{ $key }}: {{ $value | quote }}