Skip to content

Commit 34dc6ba

Browse files
committed
updates kustomization files in templates/addons folder
1 parent d29a85f commit 34dc6ba

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

templates/addons/azure-cni-v1/kustomization.yaml

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

44
resources:
5-
- https://raw.githubusercontent.com/Azure/azure-container-networking/4034aad0d7085f2a9e96cce6d2b50b81ea9ec900/hack/manifests/cni-installer-v1.yaml
5+
- https://raw.githubusercontent.com/Azure/azure-container-networking/4034aad0d7085f2a9e96cce6d2b50b81ea9ec900/hack/manifests/cni-installer-v1.yaml
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- ../calico-ipv6
5-
patchesStrategicMerge:
6-
- patches/calico-config.yaml
4+
- ../calico-ipv6
5+
patches:
6+
- path: patches/calico-config.yaml
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- calico-policy-only.yaml
5-
patchesStrategicMerge:
6-
- patches/azure-mtu.yaml
7-
- patches/calico-config.yaml
4+
- calico-policy-only.yaml
85
patches:
9-
- target:
6+
- path: patches/calico-node.yaml
7+
target:
108
group: apps
11-
version: v1
129
kind: DaemonSet
1310
name: calico-node
1411
namespace: kube-system
15-
path: patches/calico-node.yaml
12+
version: v1
1613
- path: patches/control-plane-tolerations.yaml
1714
target:
1815
kind: Deployment
1916
name: calico-kube-controllers
2017
namespace: kube-system
18+
- path: patches/azure-mtu.yaml
19+
- path: patches/calico-config.yaml
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- calico-vxlan.yaml
5-
patchesStrategicMerge:
6-
- patches/azure-mtu.yaml
4+
- calico-vxlan.yaml
75
patches:
86
- path: patches/calico-node.yaml
97
target:
@@ -13,3 +11,4 @@ patches:
1311
kind: Deployment
1412
name: calico-kube-controllers
1513
namespace: kube-system
14+
- path: patches/azure-mtu.yaml

templates/addons/metrics-server/kustomization.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: kube-system
44
resources:
5-
- https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml
6-
patchesStrategicMerge:
7-
- patches/control-plane-toleration.yaml
5+
- https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.6.3/components.yaml
86
patches:
9-
- target:
7+
- path: patches/temp-use-insecure-https.yaml
8+
target:
109
group: apps
11-
version: v1
1210
kind: Deployment
1311
name: metrics-server
1412
namespace: kube-system
15-
path: patches/temp-use-insecure-https.yaml
13+
version: v1
14+
- path: patches/control-plane-toleration.yaml

0 commit comments

Comments
 (0)