diff options
| -rw-r--r-- | recipes-containers/kubernetes/kubernetes/CVE-2021-20206.patch | 13 | ||||
| -rw-r--r-- | recipes-containers/kubernetes/kubernetes_git.bb | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/recipes-containers/kubernetes/kubernetes/CVE-2021-20206.patch b/recipes-containers/kubernetes/kubernetes/CVE-2021-20206.patch index dc4e9029..daf1f6dd 100644 --- a/recipes-containers/kubernetes/kubernetes/CVE-2021-20206.patch +++ b/recipes-containers/kubernetes/kubernetes/CVE-2021-20206.patch | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | From 5e8f9a8a72351e2fb5bcea3e3c58c935314557b6 Mon Sep 17 00:00:00 2001 | 1 | From 78e7df60f2bec11a10c7b73475017a45391fe06e Mon Sep 17 00:00:00 2001 |
| 2 | From: Navid Shaikh <navids@vmware.com> | 2 | From: Navid Shaikh <navids@vmware.com> |
| 3 | Date: Thu, 6 May 2021 15:41:08 +0530 | 3 | Date: Thu, 6 May 2021 15:41:08 +0530 |
| 4 | Subject: [PATCH] Bump containernetworking/cni to v0.8.1 | 4 | Subject: [PATCH] Bump containernetworking/cni to v0.8.1 |
| 5 | 5 | ||
| 6 | Fix CVE-2021-20206 | 6 | Fix CVE-2021-20206 |
| 7 | |||
| 7 | CVE: CVE-2021-20206 | 8 | CVE: CVE-2021-20206 |
| 8 | Upstream-Status: Backport [185f65fbddb5239666c0c67fb335589b7570f60c] | 9 | Upstream-Status: Backport [185f65fbddb5239666c0c67fb335589b7570f60c] |
| 9 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | 10 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
| @@ -15,7 +16,7 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> | |||
| 15 | 4 files changed, 10 insertions(+), 5 deletions(-) | 16 | 4 files changed, 10 insertions(+), 5 deletions(-) |
| 16 | 17 | ||
| 17 | diff --git a/src/import/go.mod b/src/import/go.mod | 18 | diff --git a/src/import/go.mod b/src/import/go.mod |
| 18 | index e0ba549ab40..d4cc9ce01a9 100644 | 19 | index 17ccf7e0b78..ac8af36c842 100644 |
| 19 | --- a/src/import/go.mod | 20 | --- a/src/import/go.mod |
| 20 | +++ b/src/import/go.mod | 21 | +++ b/src/import/go.mod |
| 21 | @@ -28,7 +28,7 @@ require ( | 22 | @@ -28,7 +28,7 @@ require ( |
| @@ -37,10 +38,10 @@ index e0ba549ab40..d4cc9ce01a9 100644 | |||
| 37 | github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2 | 38 | github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2 |
| 38 | github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible | 39 | github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible |
| 39 | diff --git a/src/import/go.sum b/src/import/go.sum | 40 | diff --git a/src/import/go.sum b/src/import/go.sum |
| 40 | index 288f4554b1f..9168f49c859 100644 | 41 | index 8bfc2b0163c..5826dbf89ab 100644 |
| 41 | --- a/src/import/go.sum | 42 | --- a/src/import/go.sum |
| 42 | +++ b/src/import/go.sum | 43 | +++ b/src/import/go.sum |
| 43 | @@ -113,8 +113,8 @@ github.com/containerd/ttrpc v1.0.2 h1:2/O3oTZN36q2xRolk0a2WWGgh7/Vf/liElg5hFYLX9 | 44 | @@ -110,8 +110,8 @@ github.com/containerd/ttrpc v1.0.2 h1:2/O3oTZN36q2xRolk0a2WWGgh7/Vf/liElg5hFYLX9 |
| 44 | github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= | 45 | github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= |
| 45 | github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5Djw= | 46 | github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5Djw= |
| 46 | github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= | 47 | github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= |
| @@ -50,7 +51,7 @@ index 288f4554b1f..9168f49c859 100644 | |||
| 50 | +github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= | 51 | +github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= |
| 51 | github.com/coredns/corefile-migration v1.0.10 h1:7HI4r5S5Fne749a+JDxUZppqBpYoZK8Q53ZVK9cn3aM= | 52 | github.com/coredns/corefile-migration v1.0.10 h1:7HI4r5S5Fne749a+JDxUZppqBpYoZK8Q53ZVK9cn3aM= |
| 52 | github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI= | 53 | github.com/coredns/corefile-migration v1.0.10/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI= |
| 53 | github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s= | 54 | github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= |
| 54 | diff --git a/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go b/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go | 55 | diff --git a/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go b/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go |
| 55 | index e815404c859..e62029eb788 100644 | 56 | index e815404c859..e62029eb788 100644 |
| 56 | --- a/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go | 57 | --- a/src/import/vendor/github.com/containernetworking/cni/pkg/invoke/find.go |
| @@ -75,7 +76,7 @@ index e815404c859..e62029eb788 100644 | |||
| 75 | return "", fmt.Errorf("no paths provided") | 76 | return "", fmt.Errorf("no paths provided") |
| 76 | } | 77 | } |
| 77 | diff --git a/src/import/vendor/modules.txt b/src/import/vendor/modules.txt | 78 | diff --git a/src/import/vendor/modules.txt b/src/import/vendor/modules.txt |
| 78 | index 6a263b51686..c3b68a5f547 100644 | 79 | index 83b5fbffd46..f278bb22122 100644 |
| 79 | --- a/src/import/vendor/modules.txt | 80 | --- a/src/import/vendor/modules.txt |
| 80 | +++ b/src/import/vendor/modules.txt | 81 | +++ b/src/import/vendor/modules.txt |
| 81 | @@ -257,7 +257,7 @@ github.com/containerd/containerd/pkg/dialer | 82 | @@ -257,7 +257,7 @@ github.com/containerd/containerd/pkg/dialer |
diff --git a/recipes-containers/kubernetes/kubernetes_git.bb b/recipes-containers/kubernetes/kubernetes_git.bb index 7b9aab84..c476cffa 100644 --- a/recipes-containers/kubernetes/kubernetes_git.bb +++ b/recipes-containers/kubernetes/kubernetes_git.bb | |||
| @@ -5,8 +5,8 @@ applications across multiple hosts, providing basic mechanisms for deployment, \ | |||
| 5 | maintenance, and scaling of applications. \ | 5 | maintenance, and scaling of applications. \ |
| 6 | " | 6 | " |
| 7 | 7 | ||
| 8 | PV = "v1.20.4+git${SRCREV_kubernetes}" | 8 | PV = "v1.20.9+git${SRCREV_kubernetes}" |
| 9 | SRCREV_kubernetes = "e87da0bd6e03ec3fea7933c4b5263d151aafd07c" | 9 | SRCREV_kubernetes = "7a576bc3935a6b555e33346fd73ad77c925e9e4a" |
| 10 | SRCREV_kubernetes-release = "cf1e18a801c2ec6cc8c3d3b83bf1cbc4cf0dbc53" | 10 | SRCREV_kubernetes-release = "cf1e18a801c2ec6cc8c3d3b83bf1cbc4cf0dbc53" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \ | 12 | SRC_URI = "git://github.com/kubernetes/kubernetes.git;branch=release-1.20;name=kubernetes \ |
