kubernetes: move to 1.19.6, 1.18.14 and 1.17.16 (#559)

* kubernetes: move to versions 1.17.16, 1.18.14 and 1.19.6

* update cgmanifest and download tarball/URL

* update signatures and remove unused .nopatch files

Co-authored-by: nicolasg@microsoft.com <nicolasg@microsoft.com>
This commit is contained in:
nicolas guibourge 2021-01-21 15:24:43 -08:00 коммит произвёл GitHub
Родитель 7b7b73920e
Коммит 0b2fe52e72
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 51 добавлений и 51 удалений

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -2,6 +2,6 @@
"Signatures": {
"golang-1.15-k8s-1.17-test.patch": "4607a1675331e309f651737cd10114e2a610dcd0250ec06a46e4de7feb000161",
"kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e",
"kubernetes-node-linux-amd64-1.17.11-hotfix.20200901.tar.gz": "e901a01e6b626a9c621b63306a86959e0063ea0a4c36289317a4ece615355133"
"kubernetes-node-linux-amd64-1.17.16-hotfix.20210118.tar.gz": "6cce0652303baccf6c95ef7666840fa20f30ec5b221f73485c7b523b5bd4beab"
}
}

Просмотреть файл

@ -9,25 +9,23 @@
%define container_image_components 'kube-proxy kube-apiserver kube-controller-manager kube-scheduler'
Summary: Microsoft Kubernetes
Name: kubernetes
Version: 1.17.11
Release: 7%{?dist}
Version: 1.17.16
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Microsoft Kubernetes
URL: https://mcr.microsoft.com/oss
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.11-hotfix.20200901/binaries/kubernetes-node-linux-amd64.tar.gz
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.16-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz
# Note that only amd64 tarball exist which is OK since kubernetes is built from source
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20200901.tar.gz
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210118.tar.gz
Source1: kubelet.service
Source2: golang-1.15-k8s-1.17-test.patch
# CVE-2020-8564, CVE-2020-8565, CVE-2020-8566 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8564.nopatch
Patch1: CVE-2020-8565.nopatch
Patch2: CVE-2020-8566.nopatch
# CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8565.nopatch
# CVE-2020-8563 Only applies when using VSphere as cloud provider,
# Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch3: CVE-2020-8563.nopatch
Patch1: CVE-2020-8563.nopatch
BuildRequires: flex-devel
BuildRequires: golang >= 1.13.15
BuildRequires: rsync
@ -272,6 +270,9 @@ fi
%{_bindir}/pause
%changelog
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.17.16-1
- Move to version 1.17.16
* Fri Jan 15 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.17.11-7
- Packages for container images

Просмотреть файл

@ -2,6 +2,6 @@
"Signatures": {
"golang-1.15-k8s-1.18-test.patch": "043a5ae433066335578701d29544c81669ffaa19fa14d987a82fd8b5a3acdd88",
"kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e",
"kubernetes-node-linux-amd64-1.18.8-hotfix.20200924.tar.gz": "5512b523bba2dd4089115ec14ca40ecea9ce6c4052ccc74bc5eaa0c32c1a4a84"
"kubernetes-node-linux-amd64-1.18.14-hotfix.20210118.tar.gz": "d9782c28609c1eab99bc1659bae06e78cd8efca1389e544582b4192071054566"
}
}

Просмотреть файл

@ -9,25 +9,23 @@
%define container_image_components 'kube-proxy kube-apiserver kube-controller-manager kube-scheduler'
Summary: Microsoft Kubernetes
Name: kubernetes
Version: 1.18.8
Release: 8%{?dist}
Version: 1.18.14
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Microsoft Kubernetes
URL: https://mcr.microsoft.com/oss
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.8-hotfix.20200924/binaries/kubernetes-node-linux-amd64.tar.gz
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz
# Note that only amd64 tarball exist which is OK since kubernetes is built from source
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20200924.tar.gz
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210118.tar.gz
Source1: kubelet.service
Source2: golang-1.15-k8s-1.18-test.patch
# CVE-2020-8564, CVE-2020-8565, CVE-2020-8566 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8564.nopatch
Patch1: CVE-2020-8565.nopatch
Patch2: CVE-2020-8566.nopatch
# CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8565.nopatch
# CVE-2020-8563 Only applies when using VSphere as cloud provider,
# Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch3: CVE-2020-8563.nopatch
Patch1: CVE-2020-8563.nopatch
BuildRequires: flex-devel
BuildRequires: golang >= 1.13.15
BuildRequires: rsync
@ -272,6 +270,9 @@ fi
%{_bindir}/pause
%changelog
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.18.14-1
- Move to version 1.18.14
* Fri Jan 15 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.18.8-8
- Packages for container images

Просмотреть файл

@ -1,6 +0,0 @@
{
"Signatures": {
"kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e",
"kubernetes-node-linux-amd64-1.19.1-hotfix.20200923.tar.gz": "1dcc586240e202ac161dbd076e04d66f9e584017bd4d08b5a78b8ddc9d6b7df2"
}
}

Просмотреть файл

@ -0,0 +1,6 @@
{
"Signatures": {
"kubelet.service": "22ea9e0b85aa9db9e1accfb6c21843683425fc1af9c0a2669523e42a455dc57e",
"kubernetes-node-linux-amd64-1.19.6-hotfix.20210118.tar.gz": "b00d4338cc117609e4ab09917e693509247c728fb7dc75f7a63b99ccf411a5d7"
}
}

Просмотреть файл

@ -9,24 +9,19 @@
%define container_image_components 'kube-proxy kube-apiserver kube-controller-manager kube-scheduler'
Summary: Microsoft Kubernetes
Name: kubernetes
Version: 1.19.1
Release: 5%{?dist}
Version: 1.19.6
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Group: Microsoft Kubernetes
URL: https://mcr.microsoft.com/oss
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.1-hotfix.20200923/binaries/kubernetes-node-linux-amd64.tar.gz
#Source0: https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz
# Note that only amd64 tarball exist which is OK since kubernetes is built from source
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20200923.tar.gz
Source0: kubernetes-node-linux-amd64-%{version}-hotfix.20210118.tar.gz
Source1: kubelet.service
# CVE-2020-8564, CVE-2020-8565, CVE-2020-8566 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8564.nopatch
Patch1: CVE-2020-8565.nopatch
Patch2: CVE-2020-8566.nopatch
# CVE-2020-8563 Only applies when using VSphere as cloud provider,
# Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch3: CVE-2020-8563.nopatch
# CVE-2020-8565 Kubernetes doc on website recommend to not enable debug level logging in production (no patch available)
Patch0: CVE-2020-8565.nopatch
BuildRequires: flex-devel
BuildRequires: golang >= 1.15.5
BuildRequires: rsync
@ -271,6 +266,9 @@ fi
%{_bindir}/pause
%changelog
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.19.6-1
- Move to version 1.19.6
* Fri Jan 15 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.19.1-5
- Packages for container images

Просмотреть файл

@ -2040,16 +2040,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "kubernetes",
"version": "1.17.11",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.11-hotfix.20200901/binaries/kubernetes-node-linux-amd64.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -2065,8 +2055,8 @@
"type": "other",
"other": {
"name": "kubernetes",
"version": "1.18.8",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.8-hotfix.20200924/binaries/kubernetes-node-linux-amd64.tar.gz"
"version": "1.17.16",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.17.16-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz"
}
}
},
@ -2085,8 +2075,8 @@
"type": "other",
"other": {
"name": "kubernetes",
"version": "1.19.1",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.1-hotfix.20200923/binaries/kubernetes-node-linux-amd64.tar.gz"
"version": "1.18.14",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.14-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz"
}
}
},
@ -2100,6 +2090,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "kubernetes",
"version": "1.19.6",
"downloadUrl": "https://kubernetesartifacts.azureedge.net/kubernetes/v1.19.6-hotfix.20210118/binaries/kubernetes-node-linux-amd64.tar.gz"
}
}
},
{
"component": {
"type": "other",