Skip to content

Commit e43f6dd

Browse files
authored
fix: template metadata labels should not include common labels (#83)
* fix: template metadata labels should not include common labels * f * f * f * f
1 parent 94f6e06 commit e43f6dd

File tree

2 files changed

+28
-23
lines changed

2 files changed

+28
-23
lines changed

templates/kotsadm-internal-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ spec:
1111
protocol: TCP
1212
targetPort: http
1313
selector:
14-
{{- include "admin-console.labels" . | nindent 4 }}
14+
app: kotsadm
1515
type: ClusterIP

templates/uninstall-job.yaml

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ metadata:
55
annotations:
66
"helm.sh/hook": pre-delete
77
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
8+
labels:
9+
{{- include "admin-console.labels" . | nindent 4 }}
810
spec:
911
backoffLimit: 1
1012
completions: 1
1113
parallelism: 1
1214
template:
15+
metadata:
16+
labels:
17+
{{- include "admin-console.labels" . | nindent 8 }}
1318
spec:
1419
{{- with .Values.affinity }}
1520
affinity:
@@ -18,25 +23,25 @@ spec:
1823
restartPolicy: Never
1924
serviceAccount: kotsadm
2025
containers:
21-
- name: delete-configmaps
22-
image: {{ .Values.images.kotsadm }}
23-
env:
24-
- name: NAMESPACE
25-
valueFrom:
26-
fieldRef:
27-
fieldPath: metadata.namespace
28-
command:
29-
- "/bin/sh"
30-
- "-ec"
31-
- "kubectl -n $NAMESPACE delete configmaps -l kots.io/kotsadm=true"
32-
- name: delete-secrets
33-
image: {{ .Values.images.kotsadm }}
34-
env:
35-
- name: NAMESPACE
36-
valueFrom:
37-
fieldRef:
38-
fieldPath: metadata.namespace
39-
command:
40-
- "/bin/sh"
41-
- "-ec"
42-
- "kubectl -n $NAMESPACE delete secrets -l kots.io/kotsadm=true"
26+
- name: delete-configmaps
27+
image: {{ .Values.images.kotsadm }}
28+
env:
29+
- name: NAMESPACE
30+
valueFrom:
31+
fieldRef:
32+
fieldPath: metadata.namespace
33+
command:
34+
- "/bin/sh"
35+
- "-ec"
36+
- "kubectl -n $NAMESPACE delete configmaps -l kots.io/kotsadm=true"
37+
- name: delete-secrets
38+
image: {{ .Values.images.kotsadm }}
39+
env:
40+
- name: NAMESPACE
41+
valueFrom:
42+
fieldRef:
43+
fieldPath: metadata.namespace
44+
command:
45+
- "/bin/sh"
46+
- "-ec"
47+
- "kubectl -n $NAMESPACE delete secrets -l kots.io/kotsadm=true"

0 commit comments

Comments
 (0)