Skip to content

Commit 4f11a08

Browse files
FabianKrammFabianKramm
authored
Merge pull request loft-sh#2319 from rmweir/coredns-label
Change vcluster coredns app label
2 parents b611b0f + 928e4de commit 4f11a08

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎chart/templates/coredns-configmap.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data:
3535
{{ toYaml .Values.controlPlane.coredns.service.annotations | indent 8 }}
3636
{{- end }}
3737
labels:
38-
k8s-app: kube-dns
38+
k8s-app: vcluster-kube-dns
3939
kubernetes.io/cluster-service: "true"
4040
kubernetes.io/name: "CoreDNS"
4141
{{- if .Values.controlPlane.coredns.service.labels }}
@@ -126,7 +126,7 @@ data:
126126
{{ toYaml .Values.controlPlane.coredns.deployment.annotations | indent 8 }}
127127
{{- end }}
128128
labels:
129-
k8s-app: kube-dns
129+
k8s-app: vcluster-kube-dns
130130
kubernetes.io/name: "CoreDNS"
131131
{{- if .Values.controlPlane.coredns.deployment.labels }}
132132
{{ toYaml .Values.controlPlane.coredns.deployment.labels | indent 8 }}
@@ -139,15 +139,15 @@ data:
139139
maxUnavailable: 1
140140
selector:
141141
matchLabels:
142-
k8s-app: kube-dns
142+
k8s-app: vcluster-kube-dns
143143
template:
144144
metadata:
145145
{{- if .Values.controlPlane.coredns.deployment.pods.annotations }}
146146
annotations:
147147
{{ toYaml .Values.controlPlane.coredns.deployment.pods.annotations | indent 12 }}
148148
{{- end }}
149149
labels:
150-
k8s-app: kube-dns
150+
k8s-app: vcluster-kube-dns
151151
{{- if .Values.controlPlane.coredns.deployment.pods.labels }}
152152
{{ toYaml .Values.controlPlane.coredns.deployment.pods.labels | indent 12 }}
153153
{{- end }}
@@ -258,7 +258,7 @@ data:
258258
{{ toYaml .Values.controlPlane.coredns.service.annotations | indent 8 }}
259259
{{- end }}
260260
labels:
261-
k8s-app: kube-dns
261+
k8s-app: vcluster-kube-dns
262262
kubernetes.io/cluster-service: "true"
263263
kubernetes.io/name: "CoreDNS"
264264
{{- if .Values.controlPlane.coredns.service.labels }}
@@ -268,7 +268,7 @@ data:
268268
{{ toYaml .Values.controlPlane.coredns.service.spec | indent 6 }}
269269
{{- if not .Values.controlPlane.coredns.service.spec.selector }}
270270
selector:
271-
k8s-app: kube-dns
271+
k8s-app: vcluster-kube-dns
272272
{{- end }}
273273
{{- if not .Values.controlPlane.coredns.service.spec.ports }}
274274
ports:

‎chart/templates/networkpolicy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
kubernetes.io/metadata.name: 'kube-system'
9595
podSelector:
9696
matchLabels:
97-
k8s-app: kube-dns
97+
k8s-app: vcluster-kube-dns
9898
{{- if .Values.policies.networkPolicy.outgoingConnections.platform }}
9999
- podSelector:
100100
matchLabels:

‎chart/tests/coredns-configmap_test.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ tests:
111111
name: coredns
112112
namespace: kube-system
113113
labels:
114-
k8s-app: kube-dns
114+
k8s-app: vcluster-kube-dns
115115
kubernetes.io/name: "CoreDNS"
116116
spec:
117117
replicas: 1
@@ -121,11 +121,11 @@ tests:
121121
maxUnavailable: 1
122122
selector:
123123
matchLabels:
124-
k8s-app: kube-dns
124+
k8s-app: vcluster-kube-dns
125125
template:
126126
metadata:
127127
labels:
128-
k8s-app: kube-dns
128+
k8s-app: vcluster-kube-dns
129129
spec:
130130
priorityClassName: ""
131131
serviceAccountName: coredns
@@ -134,7 +134,7 @@ tests:
134134
topologySpreadConstraints:
135135
- labelSelector:
136136
matchLabels:
137-
k8s-app: kube-dns
137+
k8s-app: vcluster-kube-dns
138138
maxSkew: 1
139139
topologyKey: kubernetes.io/hostname
140140
whenUnsatisfiable: DoNotSchedule
@@ -212,13 +212,13 @@ tests:
212212
prometheus.io/port: "9153"
213213
prometheus.io/scrape: "true"
214214
labels:
215-
k8s-app: kube-dns
215+
k8s-app: vcluster-kube-dns
216216
kubernetes.io/cluster-service: "true"
217217
kubernetes.io/name: "CoreDNS"
218218
spec:
219219
type: ClusterIP
220220
selector:
221-
k8s-app: kube-dns
221+
k8s-app: vcluster-kube-dns
222222
ports:
223223
- name: dns
224224
port: 53
@@ -316,7 +316,7 @@ tests:
316316
prometheus.io/port: "9153"
317317
prometheus.io/scrape: "true"
318318
labels:
319-
k8s-app: kube-dns
319+
k8s-app: vcluster-kube-dns
320320
kubernetes.io/cluster-service: "true"
321321
kubernetes.io/name: "CoreDNS"
322322
spec:
@@ -441,7 +441,7 @@ tests:
441441
name: coredns
442442
namespace: kube-system
443443
labels:
444-
k8s-app: kube-dns
444+
k8s-app: vcluster-kube-dns
445445
kubernetes.io/name: "CoreDNS"
446446
spec:
447447
replicas: 1
@@ -451,11 +451,11 @@ tests:
451451
maxUnavailable: 1
452452
selector:
453453
matchLabels:
454-
k8s-app: kube-dns
454+
k8s-app: vcluster-kube-dns
455455
template:
456456
metadata:
457457
labels:
458-
k8s-app: kube-dns
458+
k8s-app: vcluster-kube-dns
459459
spec:
460460
priorityClassName: ""
461461
serviceAccountName: coredns
@@ -478,7 +478,7 @@ tests:
478478
topologySpreadConstraints:
479479
- labelSelector:
480480
matchLabels:
481-
k8s-app: kube-dns
481+
k8s-app: vcluster-kube-dns
482482
maxSkew: 1
483483
topologyKey: kubernetes.io/hostname
484484
whenUnsatisfiable: DoNotSchedule
@@ -556,13 +556,13 @@ tests:
556556
prometheus.io/port: "9153"
557557
prometheus.io/scrape: "true"
558558
labels:
559-
k8s-app: kube-dns
559+
k8s-app: vcluster-kube-dns
560560
kubernetes.io/cluster-service: "true"
561561
kubernetes.io/name: "CoreDNS"
562562
spec:
563563
type: ClusterIP
564564
selector:
565-
k8s-app: kube-dns
565+
k8s-app: vcluster-kube-dns
566566
ports:
567567
- name: dns
568568
port: 53

‎chart/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ controlPlane:
478478
whenUnsatisfiable: DoNotSchedule
479479
labelSelector:
480480
matchLabels:
481-
k8s-app: kube-dns
481+
k8s-app: vcluster-kube-dns
482482

483483
# Service defines options for vCluster service deployed by Helm.
484484
service:

‎config/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ controlPlane:
259259
whenUnsatisfiable: DoNotSchedule
260260
labelSelector:
261261
matchLabels:
262-
k8s-app: kube-dns
262+
k8s-app: vcluster-kube-dns
263263

264264
service:
265265
enabled: true

‎test/framework/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func (f *Framework) CreateEgressNetworkPolicyForDNS(ctx context.Context, ns stri
354354
},
355355
To: []networkingv1.NetworkPolicyPeer{
356356
{
357-
PodSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"k8s-app": "kube-dns"}},
357+
PodSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"k8s-app": "vcluster-kube-dns"}},
358358
NamespaceSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"kubernetes.io/metadata.name": "kube-system"}},
359359
},
360360
},

0 commit comments

Comments
 (0)