Prepare for release v1.5.13

Signed-off-by: Joe Stringer <joe@cilium.io>
cilium · Mar 4, 2020 · ee2d6e0 · ee2d6e0
1 parent e5d20f7
commit ee2d6e0
Show file tree

Hide file tree

Showing 88 changed files with 150 additions and 122 deletions.
diff --git a/.github/cilium-actions.yml b/.github/cilium-actions.yml
@@ -1,4 +1,4 @@
-project: "https://github.com/cilium/cilium/projects/100"
+project: "https://github.com/cilium/cilium/projects/103"
 column: "In progress"
 auto-label:
   - "kind/backports"

diff --git a/AUTHORS b/AUTHORS
@@ -17,6 +17,7 @@ Bob Bouteillier                         bob.bouteillier@datadoghq.com
 Brian Topping                           brian@coglative.com
 Christopher Biscardi                    chris@christopherbiscardi.com
 Craig Box                               craig.box@gmail.com
+CybrPunk                                seanmwinn@hotmail.com
 Cynthia Thomas                          cynthia@covalent.io
 Dan Wendlandt                           dan@covalent.io
 Daniel Borkmann                         daniel@iogearbox.net
@@ -49,6 +50,7 @@ Joe Farrell                             joe2farrell@gmail.com
 Joe Stringer                            joe@cilium.io
 John Fastabend                          john.fastabend@gmail.com
 Jonathan Davies                         jpds@protonmail.com
+Joshua Roppo                            joshroppo@gmail.com
 Julien Kassar                           github@kassisol.com
 Junli Ou                                oujunli306@gmail.com
 Katarzyna Borkmann                      kasia@iogearbox.net

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+# v1.5.13
+
+Summary of Changes
+------------------
+
+**Bugfixes:**
+* cilium: only enable IPv6 forwarding if IPv6 is enabled (Backport PR #10136, Upstream PR #9034, @jrfastab)
+* Envoy fixes for CVE-2020-8659, CVE-2020-8660, CVE-2020-8661, CVE-2020-8664 (Backport PR #10445, Upstream PR #10434, @jrajahalme)
+* ipam: Protect release from releasing alive IP (Backport PR #10136, Upstream PR #10066, @tgraf)
+* pkg/bpf: Protect attr in perf_linux.go with runtime.KeepAlive (#10205, @brb)
+* pkg/bpf: Protect each uintptr with runtime.KeepAlive (Backport PR #10253, Upstream PR #10168, @brb)
+
+**CI Changes:**
+* test: Wait for Istio POD termination before deleting istio-system or cilium (Backport PR #10445, Upstream PR #10325, @jrajahalme)
+
+**Misc Changes:**
+* bpf: Fix space hack in Makefile (Backport PR #10253, Upstream PR #10173, @brb)
+* doc: Fix links to contributing guide (Backport PR #10445, Upstream PR #10322, @CybrPunk)
+* Documentation: Lock dependency to fix build (Backport PR #10439, Upstream PR #10419, @Ropes)
+* golang: update to 1.12.17 (#10209, @aanm)
+* Update release process steps (Backport PR #10136, Upstream PR #10035, @aanm)
+* Use -F flag in git log in check-stable script (Backport PR #10445, Upstream PR #10283, @nebril)
+
+**Other Changes:**
+* .github: update github-actions project (#10046, @aanm)
+
 # v1.5.12
 
 Summary of Changes

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.12
+1.5.13
diff --git a/examples/kubernetes/1.10/cilium-containerd-ds.yaml b/examples/kubernetes/1.10/cilium-containerd-ds.yaml
@@ -60,7 +60,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-containerd.yaml b/examples/kubernetes/1.10/cilium-containerd.yaml
@@ -221,7 +221,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -487,7 +487,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.10/cilium-crio-ds.yaml b/examples/kubernetes/1.10/cilium-crio-ds.yaml
@@ -68,7 +68,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-crio.yaml b/examples/kubernetes/1.10/cilium-crio.yaml
@@ -229,7 +229,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -495,7 +495,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.10/cilium-ds.yaml b/examples/kubernetes/1.10/cilium-ds.yaml
@@ -67,7 +67,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-external-etcd.yaml b/examples/kubernetes/1.10/cilium-external-etcd.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -500,7 +500,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.10/cilium-microk8s.yaml b/examples/kubernetes/1.10/cilium-microk8s.yaml
@@ -221,7 +221,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-minikube-ds.yaml b/examples/kubernetes/1.10/cilium-minikube-ds.yaml
@@ -67,7 +67,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-minikube.yaml b/examples/kubernetes/1.10/cilium-minikube.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.10/cilium-operator.yaml b/examples/kubernetes/1.10/cilium-operator.yaml
@@ -84,7 +84,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.10/cilium-pre-flight-with-rm-svc-v2.yaml b/examples/kubernetes/1.10/cilium-pre-flight-with-rm-svc-v2.yaml
@@ -33,7 +33,7 @@ spec:
           args:
           - "hello"
         - name: rm-cilium-svc-v2
-          image: docker.io/cilium/cilium:v1.5.12
+          image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           command: ["/bin/bash"]
           args:
@@ -43,7 +43,7 @@ spec:
           - mountPath: /sys/fs/bpf
             name: bpf-maps
       containers:
-        - image: docker.io/cilium/cilium:v1.5.12
+        - image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           name: cilium-pre-flight-check
           command: ["/bin/sh"]

diff --git a/examples/kubernetes/1.10/cilium-pre-flight.yaml b/examples/kubernetes/1.10/cilium-pre-flight.yaml
@@ -33,7 +33,7 @@ spec:
           args:
           - "hello"
       containers:
-        - image: docker.io/cilium/cilium:v1.5.12
+        - image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           name: cilium-pre-flight-check
           command: ["/bin/sh"]

diff --git a/examples/kubernetes/1.10/cilium-with-node-init.yaml b/examples/kubernetes/1.10/cilium-with-node-init.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -500,7 +500,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.10/cilium.yaml b/examples/kubernetes/1.10/cilium.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -500,7 +500,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.11/cilium-containerd-ds.yaml b/examples/kubernetes/1.11/cilium-containerd-ds.yaml
@@ -60,7 +60,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-containerd.yaml b/examples/kubernetes/1.11/cilium-containerd.yaml
@@ -221,7 +221,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -488,7 +488,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.11/cilium-crio-ds.yaml b/examples/kubernetes/1.11/cilium-crio-ds.yaml
@@ -68,7 +68,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-crio.yaml b/examples/kubernetes/1.11/cilium-crio.yaml
@@ -229,7 +229,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -487,7 +487,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.11/cilium-ds.yaml b/examples/kubernetes/1.11/cilium-ds.yaml
@@ -67,7 +67,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-external-etcd.yaml b/examples/kubernetes/1.11/cilium-external-etcd.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -501,7 +501,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.11/cilium-microk8s.yaml b/examples/kubernetes/1.11/cilium-microk8s.yaml
@@ -221,7 +221,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-minikube-ds.yaml b/examples/kubernetes/1.11/cilium-minikube-ds.yaml
@@ -67,7 +67,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-minikube.yaml b/examples/kubernetes/1.11/cilium-minikube.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:

diff --git a/examples/kubernetes/1.11/cilium-operator.yaml b/examples/kubernetes/1.11/cilium-operator.yaml
@@ -84,7 +84,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe:

diff --git a/examples/kubernetes/1.11/cilium-pre-flight-with-rm-svc-v2.yaml b/examples/kubernetes/1.11/cilium-pre-flight-with-rm-svc-v2.yaml
@@ -33,7 +33,7 @@ spec:
           args:
           - "hello"
         - name: rm-cilium-svc-v2
-          image: docker.io/cilium/cilium:v1.5.12
+          image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           command: ["/bin/bash"]
           args:
@@ -43,7 +43,7 @@ spec:
           - mountPath: /sys/fs/bpf
             name: bpf-maps
       containers:
-        - image: docker.io/cilium/cilium:v1.5.12
+        - image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           name: cilium-pre-flight-check
           command: ["/bin/sh"]

diff --git a/examples/kubernetes/1.11/cilium-pre-flight.yaml b/examples/kubernetes/1.11/cilium-pre-flight.yaml
@@ -33,7 +33,7 @@ spec:
           args:
           - "hello"
       containers:
-        - image: docker.io/cilium/cilium:v1.5.12
+        - image: docker.io/cilium/cilium:v1.5.13
           imagePullPolicy: IfNotPresent
           name: cilium-pre-flight-check
           command: ["/bin/sh"]

diff --git a/examples/kubernetes/1.11/cilium-with-node-init.yaml b/examples/kubernetes/1.11/cilium-with-node-init.yaml
@@ -228,7 +228,7 @@ spec:
               optional: true
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
-        image: docker.io/cilium/cilium:v1.5.12
+        image: docker.io/cilium/cilium:v1.5.13
         imagePullPolicy: IfNotPresent
         lifecycle:
           postStart:
@@ -500,7 +500,7 @@ spec:
               key: AWS_DEFAULT_REGION
               name: cilium-aws
               optional: true
-        image: docker.io/cilium/operator:v1.5.12
+        image: docker.io/cilium/operator:v1.5.13
         imagePullPolicy: IfNotPresent
         name: cilium-operator
         livenessProbe: