Skip to content

Commit 5e2d469

Browse files
rahulaitRahul Sharma
andauthored
update CCM image, fix ordering for etcd policy (#371)
Co-authored-by: Rahul Sharma <[email protected]>
1 parent 5975c88 commit 5e2d469

File tree

5 files changed

+58
-39
lines changed

5 files changed

+58
-39
lines changed

templates/addons/ccm-linode/ccm-linode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
repoURL: https://linode.github.io/linode-cloud-controller-manager/
1010
chartName: ccm-linode
1111
namespace: kube-system
12-
version: ${LINODE_CCM_VERSION:=v0.4.6}
12+
version: ${LINODE_CCM_VERSION:=v0.4.9}
1313
options:
1414
waitForJobs: true
1515
wait: true

templates/addons/cilium-network-policies/ciliumNetworkPolicies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
- fromCIDR:
3232
- 10.0.0.0/8
3333
- fromEntities:
34-
- world
34+
- all
3535
toPorts:
3636
- ports:
3737
- port: "6443"

templates/flavors/kubeadm/konnectivity/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ patches:
9999
- fromCIDR:
100100
- 10.0.0.0/8
101101
- fromEntities:
102-
- world
102+
- all
103103
toPorts:
104104
- ports:
105105
- port: "6443"
@@ -113,7 +113,7 @@ patches:
113113
nodeSelector: {}
114114
ingress:
115115
- fromEntities:
116-
- world
116+
- all
117117
toPorts:
118118
- ports:
119119
- port: "8132"

templates/flavors/kubeadm/vpcless/allow-etcd-policy.yaml

Lines changed: 0 additions & 34 deletions
This file was deleted.

templates/flavors/kubeadm/vpcless/kustomization.yaml

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
44
- ../default
5-
- allow-etcd-policy.yaml
65

76
patches:
87
- target:
@@ -41,6 +40,60 @@ patches:
4140
image:
4241
pullPolicy: IfNotPresent
4342
43+
- target:
44+
kind: ConfigMap
45+
name: .*-cilium-policy
46+
patch: |-
47+
- op: replace
48+
path: /data/cilium-policy.yaml
49+
value: |-
50+
apiVersion: "cilium.io/v2"
51+
kind: CiliumClusterwideNetworkPolicy
52+
metadata:
53+
name: "default-cluster-policy"
54+
spec:
55+
description: "allow cluster intra cluster traffic"
56+
endpointSelector: {}
57+
ingress:
58+
- fromEntities:
59+
- cluster
60+
- fromCIDR:
61+
- 10.0.0.0/8
62+
- 192.168.128.0/17
63+
---
64+
apiVersion: "cilium.io/v2"
65+
kind: CiliumClusterwideNetworkPolicy
66+
metadata:
67+
name: "default-external-policy"
68+
spec:
69+
description: "allow api server traffic"
70+
nodeSelector: {}
71+
ingress:
72+
- fromEntities:
73+
- cluster
74+
- fromCIDR:
75+
- 10.0.0.0/8
76+
- 192.168.128.0/17
77+
- fromEntities:
78+
- all
79+
toPorts:
80+
- ports:
81+
- port: "6443"
82+
---
83+
apiVersion: "cilium.io/v2"
84+
kind: CiliumClusterwideNetworkPolicy
85+
metadata:
86+
name: "allow-etcd-policy"
87+
spec:
88+
description: "allow etcd traffic"
89+
nodeSelector: {}
90+
ingress:
91+
- fromEntities:
92+
- all
93+
toPorts:
94+
- ports:
95+
- port: "2379"
96+
- port: "2380"
4497
4598
- target:
4699
kind: LinodeVPC

0 commit comments

Comments
 (0)