Skip to content

Commit a12eb87

Browse files
committed
Replace deprecated commonLabels in kustomizations
1 parent 52f48d0 commit a12eb87

File tree

9 files changed

+41
-23
lines changed

9 files changed

+41
-23
lines changed

config/certificate/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ kind: Component
33

44
namespace: sharding-system
55

6-
commonLabels:
7-
app.kubernetes.io/name: controller-sharding
6+
labels:
7+
- includeSelectors: true
8+
pairs:
9+
app.kubernetes.io/name: controller-sharding
810

911
resources:
1012
- certificate.yaml

config/crds/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

4-
commonLabels:
5-
app.kubernetes.io/name: controller-sharding
4+
labels:
5+
- includeSelectors: true
6+
pairs:
7+
app.kubernetes.io/name: controller-sharding
68

79
resources:
810
- namespace.yaml

config/sharder/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ namespace: sharding-system
66
generatorOptions:
77
disableNameSuffixHash: true
88

9-
commonLabels:
10-
app.kubernetes.io/name: controller-sharding
9+
labels:
10+
- includeSelectors: true
11+
pairs:
12+
app.kubernetes.io/name: controller-sharding
1113

1214
images:
1315
- name: sharder

hack/config/monitoring/crds/kustomization.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44

5-
commonLabels:
6-
app.kubernetes.io/name: prometheus-operator
7-
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 0.76.2
5+
labels:
6+
- includeSelectors: true
7+
pairs:
8+
app.kubernetes.io/name: prometheus-operator
9+
app.kubernetes.io/part-of: kube-prometheus
10+
app.kubernetes.io/version: 0.76.2
911

1012
resources:
1113
- 0alertmanagerConfigCustomResourceDefinition.yaml

hack/config/monitoring/update.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ cat <<EOF > kustomization.yaml
4040
apiVersion: kustomize.config.k8s.io/v1beta1
4141
kind: Kustomization
4242
43-
commonLabels:
44-
app.kubernetes.io/name: prometheus-operator
45-
app.kubernetes.io/part-of: kube-prometheus
46-
app.kubernetes.io/version: $prometheus_operator_version
43+
labels:
44+
- includeSelectors: true
45+
pairs:
46+
app.kubernetes.io/name: prometheus-operator
47+
app.kubernetes.io/part-of: kube-prometheus
48+
app.kubernetes.io/version: $prometheus_operator_version
4749
4850
resources:
4951
$(ls *.yaml | sed 's/^/- /')

hack/config/shard/shard/kustomization.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ kind: Kustomization
33

44
namespace: default
55

6-
commonLabels:
7-
app.kubernetes.io/name: controller-sharding
8-
app.kubernetes.io/component: shard
6+
labels:
7+
- includeSelectors: true
8+
pairs:
9+
app.kubernetes.io/name: controller-sharding
10+
app.kubernetes.io/component: shard
911

1012
images:
1113
- name: shard

webhosting-operator/config/experiment/base/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ kind: Kustomization
33

44
namespace: experiment
55

6-
commonLabels:
7-
app.kubernetes.io/name: experiment
6+
labels:
7+
- includeSelectors: true
8+
pairs:
9+
app.kubernetes.io/name: experiment
810

911
images:
1012
- name: experiment

webhosting-operator/config/manager/base/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ namespace: webhosting-system
1212
namePrefix: webhosting-
1313

1414
# Labels to add to all resources and selectors.
15-
commonLabels:
16-
app.kubernetes.io/name: webhosting-operator
15+
labels:
16+
- includeSelectors: true
17+
pairs:
18+
app.kubernetes.io/name: webhosting-operator
1719

1820
images:
1921
- name: controller

webhosting-operator/config/monitoring/webhosting-operator/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ kind: Kustomization
33

44
namespace: webhosting-system
55

6-
commonLabels:
7-
app.kubernetes.io/name: webhosting-operator
6+
labels:
7+
- includeSelectors: true
8+
pairs:
9+
app.kubernetes.io/name: webhosting-operator
810

911
resources:
1012
# provide prometheus running in namespace "monitoring" with the permissions required for service discovery in namespace

0 commit comments

Comments
 (0)