Azure
/
aks-engine
зеркало из https://github.com/Azure/aks-engine.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: Update moby/containerd versions (#4119) 

A few releases recently, this brings aks-engine up to speed.
This commit is contained in:
Brian Goff 2020-12-14 16:32:03 -08:00 коммит произвёл GitHub
Родитель ae3b02846a
Коммит 3f772335ac
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 28 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
hack/tools/go.sum
Просмотреть файл

@ -281,6 +281,7 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 h1:SjQ2+AKWgZLc1xej6WSzL+Dfs5Uyd5xcZH1mGC411IA=
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

12
parts/k8s/kubernetesparams.t
Просмотреть файл

@ -213,7 +213,7 @@
} }
}, },
"mobyVersion": { "mobyVersion": {
"defaultValue": "19.03.12", "defaultValue": "19.03.14",
"metadata": { "metadata": {
"description": "The Azure Moby build version" "description": "The Azure Moby build version"
}, },
@ -231,12 +231,14 @@
"3.0.12", "3.0.12",
"3.0.13", "3.0.13",
"19.03.11", "19.03.11",
"19.03.12" "19.03.12",
"19.03.13",
"19.03.14"
], ],
"type": "string" "type": "string"
}, },
"containerdVersion": { "containerdVersion": {
"defaultValue": "1.3.7", "defaultValue": "1.3.9",
"metadata": { "metadata": {
"description": "The Azure Moby build version" "description": "The Azure Moby build version"
}, },
@ -246,7 +248,9 @@
"1.3.4", "1.3.4",
"1.3.5", "1.3.5",
"1.3.6", "1.3.6",
"1.3.7" "1.3.7",
"1.3.8",
"1.3.9"
], ],
"type": "string" "type": "string"
}, },

4
pkg/api/const.go
Просмотреть файл

@ -438,9 +438,9 @@ const (
// DefaultKubernetesDNSServiceIPv6 specifies the IPv6 address that kube-dns listens on by default. must by in the default Service CIDR range. // DefaultKubernetesDNSServiceIPv6 specifies the IPv6 address that kube-dns listens on by default. must by in the default Service CIDR range.
DefaultKubernetesDNSServiceIPv6 = "fd00::10" DefaultKubernetesDNSServiceIPv6 = "fd00::10"
// DefaultMobyVersion specifies the default Azure build version of Moby to install. // DefaultMobyVersion specifies the default Azure build version of Moby to install.
DefaultMobyVersion = "19.03.12" DefaultMobyVersion = "19.03.14"
// DefaultContainerdVersion specifies the default containerd version to install. // DefaultContainerdVersion specifies the default containerd version to install.
DefaultContainerdVersion = "1.3.7" DefaultContainerdVersion = "1.3.9"
// DefaultDockerBridgeSubnet specifies the default subnet for the docker bridge network for masters and agents. // DefaultDockerBridgeSubnet specifies the default subnet for the docker bridge network for masters and agents.
DefaultDockerBridgeSubnet = "172.17.0.1/16" DefaultDockerBridgeSubnet = "172.17.0.1/16"
// DefaultKubernetesMaxPodsKubenet is the maximum number of pods to run on a node for Kubenet. // DefaultKubernetesMaxPodsKubenet is the maximum number of pods to run on a node for Kubenet.

10
pkg/api/defaults_test.go
Просмотреть файл

@ -1292,7 +1292,7 @@ func TestAzureStackKubernetesConfigDefaults(t *testing.T) {
func TestContainerRuntime(t *testing.T) { func TestContainerRuntime(t *testing.T) {
for _, mobyVersion := range []string{"3.0.1", "3.0.3", "3.0.4", "3.0.5", "3.0.6", "3.0.7", "3.0.8", "3.0.10", "19.03.11", "19.03.12"} { for _, mobyVersion := range []string{"3.0.1", "3.0.3", "3.0.4", "3.0.5", "3.0.6", "3.0.7", "3.0.8", "3.0.10", "19.03.11", "19.03.12", "19.03.13", "19.03.14"} {
mockCS := getMockBaseContainerService("1.10.13") mockCS := getMockBaseContainerService("1.10.13")
properties := mockCS.Properties properties := mockCS.Properties
properties.OrchestratorProfile.KubernetesConfig.MobyVersion = mobyVersion properties.OrchestratorProfile.KubernetesConfig.MobyVersion = mobyVersion
@ -5624,10 +5624,10 @@ func ExampleContainerService_setOrchestratorDefaults() {
mockCS.setOrchestratorDefaults(false, false) mockCS.setOrchestratorDefaults(false, false)
// Output: // Output:
// level=warning msg="Moby will be upgraded to version 19.03.12\n" // level=warning msg="Moby will be upgraded to version 19.03.14\n"
// level=warning msg="containerd will be upgraded to version 1.3.7\n" // level=warning msg="containerd will be upgraded to version 1.3.9\n"
// level=warning msg="Any new nodes will have Moby version 19.03.12\n" // level=warning msg="Any new nodes will have Moby version 19.03.14\n"
// level=warning msg="Any new nodes will have containerd version 1.3.7\n" // level=warning msg="Any new nodes will have containerd version 1.3.9\n"
} }
func TestCombineValues(t *testing.T) { func TestCombineValues(t *testing.T) {

2
pkg/api/vlabs/validate.go
Просмотреть файл

@ -38,7 +38,7 @@ var (
"3.1.0", "3.1.1", "3.1.2", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7", "3.1.8", "3.1.9", "3.1.10", "3.1.0", "3.1.1", "3.1.2", "3.1.2", "3.1.3", "3.1.4", "3.1.5", "3.1.6", "3.1.7", "3.1.8", "3.1.9", "3.1.10",
"3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9", "3.2.11", "3.2.12", "3.2.0", "3.2.1", "3.2.2", "3.2.3", "3.2.4", "3.2.5", "3.2.6", "3.2.7", "3.2.8", "3.2.9", "3.2.11", "3.2.12",
"3.2.13", "3.2.14", "3.2.15", "3.2.16", "3.2.23", "3.2.24", "3.2.25", "3.2.26", "3.3.0", "3.3.1", "3.3.8", "3.3.9", "3.3.10", "3.3.13", "3.3.15", "3.3.18", "3.3.19", "3.3.22"} "3.2.13", "3.2.14", "3.2.15", "3.2.16", "3.2.23", "3.2.24", "3.2.25", "3.2.26", "3.3.0", "3.3.1", "3.3.8", "3.3.9", "3.3.10", "3.3.13", "3.3.15", "3.3.18", "3.3.19", "3.3.22"}
containerdValidVersions = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7"} containerdValidVersions = [...]string{"1.3.2", "1.3.3", "1.3.4", "1.3.5", "1.3.6", "1.3.7", "1.3.8", "1.3.9"}
kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR} kubernetesImageBaseTypeValidVersions = [...]string{"", common.KubernetesImageBaseTypeGCR, common.KubernetesImageBaseTypeMCR}
cachingTypesValidValues = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)} cachingTypesValidValues = [...]string{"", string(compute.CachingTypesNone), string(compute.CachingTypesReadWrite), string(compute.CachingTypesReadOnly)}
networkPluginPlusPolicyAllowed = []k8sNetworkConfig{ networkPluginPlusPolicyAllowed = []k8sNetworkConfig{

2
pkg/api/vlabs/validate_test.go
Просмотреть файл

@ -64,7 +64,7 @@ func Test_OrchestratorProfile_Validate(t *testing.T) {
}, },
}, },
}, },
expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7]", expectedError: "Invalid containerd version \"1.0.0\", please use one of the following versions: [1.3.2 1.3.3 1.3.4 1.3.5 1.3.6 1.3.7 1.3.8 1.3.9]",
}, },
"should error when KubernetesConfig has containerdVersion value for docker container runtime": { "should error when KubernetesConfig has containerdVersion value for docker container runtime": {
properties: &Properties{ properties: &Properties{

12
pkg/engine/templates_generated.go
Просмотреть файл

@ -16117,7 +16117,7 @@ var _k8sKubernetesparamsT = []byte(` "etcdServerCertificate": {
} }
}, },
"mobyVersion": { "mobyVersion": {
"defaultValue": "19.03.12", "defaultValue": "19.03.14",
"metadata": { "metadata": {
"description": "The Azure Moby build version" "description": "The Azure Moby build version"
}, },
@ -16135,12 +16135,14 @@ var _k8sKubernetesparamsT = []byte(` "etcdServerCertificate": {
"3.0.12", "3.0.12",
"3.0.13", "3.0.13",
"19.03.11", "19.03.11",
"19.03.12" "19.03.12",
"19.03.13",
"19.03.14"
], ],
"type": "string" "type": "string"
}, },
"containerdVersion": { "containerdVersion": {
"defaultValue": "1.3.7", "defaultValue": "1.3.9",
"metadata": { "metadata": {
"description": "The Azure Moby build version" "description": "The Azure Moby build version"
}, },
@ -16150,7 +16152,9 @@ var _k8sKubernetesparamsT = []byte(` "etcdServerCertificate": {
"1.3.4", "1.3.4",
"1.3.5", "1.3.5",
"1.3.6", "1.3.6",
"1.3.7" "1.3.7",
"1.3.8",
"1.3.9"
], ],
"type": "string" "type": "string"
}, },

4
vhd/packer/install-dependencies.sh
Просмотреть файл

@ -82,8 +82,8 @@ echo " - apmz $apmz_version" >> ${VHD_LOGS_FILEPATH}
installBpftrace installBpftrace
echo " - bpftrace" >> ${VHD_LOGS_FILEPATH} echo " - bpftrace" >> ${VHD_LOGS_FILEPATH}
MOBY_VERSION="19.03.12" MOBY_VERSION="19.03.14"
CONTAINERD_VERSION="1.3.7" CONTAINERD_VERSION="1.3.9"
installMoby installMoby
systemctl start docker systemctl start docker
echo " - moby v${MOBY_VERSION}" >> ${VHD_LOGS_FILEPATH} echo " - moby v${MOBY_VERSION}" >> ${VHD_LOGS_FILEPATH}