Update to cilium 1.14

helm/cilium/.helmignore

@@ -4,6 +4,7 @@
 .DS_Store
 # Common VCS dirs
 .git/
+.github/
 .gitignore
 .bzr/
 .bzrignore

helm/cilium/Chart.yaml

@@ -3,9 +3,9 @@ name: cilium
 displayName: Cilium
 home: https://cilium.io/
 version: 0.17.0
-appVersion: 1.13.6
+appVersion: 1.14.4
 kubeVersion: ">= 1.16.0-0"
-icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.13/Documentation/images/logo-solo.svg
+icon: https://cdn.jsdelivr.net/gh/cilium/cilium@v1.14/Documentation/images/logo-solo.svg
 description: eBPF-based Networking, Security, and Observability
 keywords:
   - BPF
@@ -125,3 +125,22 @@ annotations:
       description: |
         CiliumNodeConfig is a list of configuration key-value pairs. It is applied to
         nodes indicated by a label selector.
+    - kind: CiliumCIDRGroup
+      version: v2alpha1
+      name: ciliumcidrgroups.cilium.io
+      displayName: Cilium CIDR Group
+      description: |
+        CiliumCIDRGroup is a list of CIDRs that can be referenced as a single entity from CiliumNetworkPolicies.
+    - kind: CiliumL2AnnouncementPolicy
+      version: v2alpha1
+      name: ciliuml2announcementpolicies.cilium.io
+      displayName: Cilium L2 Announcement Policy
+      description: |
+        CiliumL2AnnouncementPolicy is a policy which determines which service IPs will be announced to
+        the local area network, by which nodes, and via which interfaces.
+    - kind: CiliumPodIPPool
+      version: v2alpha1
+      name: ciliumpodippools.cilium.io
+      displayName: Cilium Pod IP Pool
+      description: |
+        CiliumPodIPPool defines an IP pool that can be used for pooled IPAM (i.e. the multi-pool IPAM mode).

helm/cilium/README.md.gotmpl

@@ -16,7 +16,7 @@ integration points such as: network IO, application sockets, and tracepoints
 to implement security, networking and visibility logic. eBPF is highly
 efficient and flexible.
 
-![Cilium feature overview](https://raw.githubusercontent.com/cilium/cilium/master/Documentation/images/cilium_overview.png)
+![Cilium feature overview](https://raw.githubusercontent.com/cilium/cilium/main/Documentation/images/cilium_overview.png)
 
 ## Prerequisites
 

helm/cilium/files/agent/poststart-eni.bash

@@ -11,9 +11,9 @@ set -o nounset
 # dependencies on anything that is part of the startup script
 # itself, and can be safely run multiple times per node (e.g. in
 # case of a restart).
-if [[ "$(iptables-save | grep -c AWS-SNAT-CHAIN)" != "0" ]];
+if [[ "$(iptables-save | grep -c 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN')" != "0" ]];
 then
     echo 'Deleting iptables rules created by the AWS CNI VPC plugin'
-    iptables-save | grep -v AWS-SNAT-CHAIN | iptables-restore
+    iptables-save | grep -v 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN' | iptables-restore
 fi
 echo 'Done!'