diff --git a/e2e/scenario/base_vhd_catalog.json b/e2e/scenario/base_vhd_catalog.json index 825cef9235a..fb11c4f8d75 100644 --- a/e2e/scenario/base_vhd_catalog.json +++ b/e2e/scenario/base_vhd_catalog.json @@ -2,17 +2,17 @@ "ubuntu1804": { "gen2containerd": { "artifactName": "1804-gen2-containerd", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1711058371.9154" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1712787825.26381" } }, "ubuntu2204": { "gen2arm64containerd": { "artifactName": "2204-arm64-gen2-containerd", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1711050975.24443" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1712787796.17656" }, "gen2containerd": { "artifactName": "2204-gen2-containerd", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1711058378.5173" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1712787789.1362" }, "gen2containerdprivatekubepkg": { "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1704411049.2812" @@ -21,21 +21,21 @@ "azurelinuxv2": { "gen2arm64": { "artifactName": "azurelinuxv2-gen2-arm64", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1711050992.12578" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1712787785.1412" }, "gen2": { "artifactName": "azurelinuxv2-gen2", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1711058377.30895" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1712787807.28137" } }, "cblmarinerv2": { "gen2arm64": { "artifactName": "marinerv2-gen2-arm64", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1711051003.16083" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1712787820.21615" }, "gen2": { "artifactName": "marinerv2-gen2", - "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1711051012.17839" + "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1712787804.29363" } } } diff --git a/go.mod b/go.mod index fe2dff2ca3a..daeaf6a8250 100644 --- a/go.mod +++ b/go.mod @@ -8,28 +8,29 @@ require ( github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df github.com/blang/semver v3.5.1+incompatible github.com/google/go-cmp v0.5.9 - github.com/google/uuid v1.3.0 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 github.com/onsi/ginkgo v1.12.2 github.com/onsi/gomega v1.27.2 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.6.1 + github.com/stretchr/testify v1.8.0 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v3 v3.0.1 + k8s.io/apimachinery v0.26.2 ) require ( github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.1 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/kr/pretty v0.3.1 // indirect github.com/nxadm/tail v1.4.4 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.14.0 // indirect golang.org/x/text v0.14.0 // indirect - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) diff --git a/go.sum b/go.sum index 69259b6984d..af72e728b65 100644 --- a/go.sum +++ b/go.sum @@ -9,7 +9,9 @@ github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df/go.mod h1:h github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -33,8 +35,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -42,10 +42,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -57,21 +55,23 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.2 h1:SKU0CXeKE/WVgIV1T61kSa3+IRE8Ekrv9rdXDwwTqnY= github.com/onsi/gomega v1.27.2/go.mod h1:5mR3phAHpkAVIDkHEUBY6HGVsU+cpcEscrGPB4oPlZI= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -82,14 +82,10 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -105,12 +101,14 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ= +k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= diff --git a/parts/linux/cloud-init/artifacts/cse_install.sh b/parts/linux/cloud-init/artifacts/cse_install.sh index c15ce17fb9b..bd2bdb9efb0 100755 --- a/parts/linux/cloud-init/artifacts/cse_install.sh +++ b/parts/linux/cloud-init/artifacts/cse_install.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/parts/linux/cloud-init/artifacts/manifest.json b/parts/linux/cloud-init/artifacts/manifest.json index b7f73a8e8c1..00f8c61bc74 100644 --- a/parts/linux/cloud-init/artifacts/manifest.json +++ b/parts/linux/cloud-init/artifacts/manifest.json @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/baker.go b/pkg/agent/baker.go index 7f07e110d84..aff2064c681 100644 --- a/pkg/agent/baker.go +++ b/pkg/agent/baker.go @@ -13,6 +13,7 @@ import ( "strings" "text/template" + "github.com/Azure/agentbaker/pkg/agent/common" "github.com/Azure/agentbaker/pkg/agent/datamodel" "github.com/Azure/agentbaker/pkg/templates" "github.com/Azure/go-autorest/autorest/to" @@ -178,7 +179,7 @@ func (t *TemplateGenerator) getSingleLine(textFilename string, profile interface // getTemplateFuncMap returns the general purpose template func map from getContainerServiceFuncMap. // -//nolint:gocognit + func getBakerFuncMap(config *datamodel.NodeBootstrappingConfiguration, params paramsMap, variables paramsMap) template.FuncMap { funcMap := getContainerServiceFuncMap(config) @@ -906,13 +907,13 @@ func getContainerServiceFuncMap(config *datamodel.NodeBootstrappingConfiguration return getOutBoundCmd(config, config.CloudSpecConfig) }, "GPUNeedsFabricManager": func() bool { - return gpuNeedsFabricManager(profile.VMSize) + return common.GPUNeedsFabricManager(profile.VMSize) }, "GPUDriverVersion": func() string { - return getGPUDriverVersion(profile.VMSize) + return common.GetGPUDriverVersion(profile.VMSize) }, "GPUImageSHA": func() string { - return getAKSGPUImageSHA(profile.VMSize) + return common.GetAKSGPUImageSHA(profile.VMSize) }, "GetHnsRemediatorIntervalInMinutes": func() uint32 { // Only need to enable HNSRemediator for Windows 2019 @@ -974,40 +975,6 @@ func getPortRangeEndValue(portRange string) int { return num } -// NV series GPUs target graphics workloads vs NC which targets compute. -// they typically use GRID, not CUDA drivers, and will fail to install CUDA drivers. -// NVv1 seems to run with CUDA, NVv5 requires GRID. -// NVv3 is untested on AKS, NVv4 is AMD so n/a, and NVv2 no longer seems to exist (?). -func getGPUDriverVersion(size string) string { - if useGridDrivers(size) { - return datamodel.Nvidia535GridDriverVersion - } - if isStandardNCv1(size) { - return datamodel.Nvidia470CudaDriverVersion - } - return datamodel.Nvidia535CudaDriverVersion -} - -func isStandardNCv1(size string) bool { - tmp := strings.ToLower(size) - return strings.HasPrefix(tmp, "standard_nc") && !strings.Contains(tmp, "_v") -} - -func useGridDrivers(size string) bool { - return datamodel.ConvergedGPUDriverSizes[strings.ToLower(size)] -} - -func gpuNeedsFabricManager(size string) bool { - return datamodel.FabricManagerGPUSizes[strings.ToLower(size)] -} - -func getAKSGPUImageSHA(size string) string { - if useGridDrivers(size) { - return datamodel.AKSGPUGridSHA - } - return datamodel.AKSGPUCudaSHA -} - func areCustomCATrustCertsPopulated(config datamodel.NodeBootstrappingConfiguration) bool { return config.CustomCATrustConfig != nil && len(config.CustomCATrustConfig.CustomCATrustCerts) > 0 } diff --git a/pkg/agent/baker_test.go b/pkg/agent/baker_test.go index 5734109fe9f..d46ca1c9b1f 100644 --- a/pkg/agent/baker_test.go +++ b/pkg/agent/baker_test.go @@ -1741,29 +1741,3 @@ var _ = Describe("Test normalizeResourceGroupNameForLabel", func() { Expect(normalizeResourceGroupNameForLabel(s + "-")).To(Equal(s + "-z")) }) }) - -var _ = Describe("getGPUDriverVersion", func() { - It("should use 470 with nc v1", func() { - Expect(getGPUDriverVersion("standard_nc6")).To(Equal(datamodel.Nvidia470CudaDriverVersion)) - }) - It("should use 525 cuda with nc v3", func() { - Expect(getGPUDriverVersion("standard_nc6_v3")).To(Equal(datamodel.Nvidia535CudaDriverVersion)) - }) - It("should use 535 grid with nv v5", func() { - Expect(getGPUDriverVersion("standard_nv6ads_a10_v5")).To(Equal(datamodel.Nvidia535GridDriverVersion)) - Expect(getGPUDriverVersion("Standard_nv36adms_A10_V5")).To(Equal(datamodel.Nvidia535GridDriverVersion)) - }) - // NV V1 SKUs were retired in September 2023, leaving this test just for safety - It("should use 535 cuda with nv v1", func() { - Expect(getGPUDriverVersion("standard_nv6")).To(Equal(datamodel.Nvidia535CudaDriverVersion)) - }) -}) - -var _ = Describe("getAKSGPUImageSHA", func() { - It("should use newest AKSGPUGridSHA with nv v5", func() { - Expect(getAKSGPUImageSHA("standard_nv6ads_a10_v5")).To(Equal(datamodel.AKSGPUGridSHA)) - }) - It("should use newest AKSGPUCudaSHA with non grid SKU", func() { - Expect(getAKSGPUImageSHA("standard_nc6_v3")).To(Equal(datamodel.AKSGPUCudaSHA)) - }) -}) diff --git a/pkg/agent/common/gpu.go b/pkg/agent/common/gpu.go new file mode 100644 index 00000000000..e6201d53728 --- /dev/null +++ b/pkg/agent/common/gpu.go @@ -0,0 +1,262 @@ +/* +Portions Copyright (c) Microsoft Corporation. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package common + +import ( + "strings" + + "k8s.io/apimachinery/pkg/util/sets" +) + +const ( + nvidia470CudaDriverVersion = "cuda-470.82.01" + nvidia535CudaDriverVersion = "cuda-535.54.03" + nvidia535GridDriverVersion = "grid-535.54.03" +) + +// These SHAs will change once we update aks-gpu images in aks-gpu repository. We do that fairly rarely at this time. +// So for now these will be kept here like this. +const ( + aksGPUGridSHA = "sha-20ffa2" + aksGPUCudaSHA = "sha-ff213d" +) + +/* + nvidiaEnabledSKUs : If a new GPU sku becomes available, add a key to this map, but only if you have a confirmation + that we have an agreement with NVIDIA for this specific gpu. +*/ +//nolint:gochecknoglobals +var nvidiaEnabledSKUs = sets.NewString( + // K80: https://learn.microsoft.com/en-us/azure/virtual-machines/nc-series + "standard_nc6", + "standard_nc12", + "standard_nc24", + "standard_nc24r", + // M60: https://learn.microsoft.com/en-us/azure/virtual-machines/nv-series + "standard_nv6", + "standard_nv12", + "standard_nv12s_v3", + "standard_nv24", + "standard_nv24s_v3", + "standard_nv24r", + "standard_nv48s_v3", + // P40: https://learn.microsoft.com/en-us/azure/virtual-machines/nd-series + "standard_nd6s", + "standard_nd12s", + "standard_nd24s", + "standard_nd24rs", + // P100: https://learn.microsoft.com/en-us/azure/virtual-machines/ncv2-series + "standard_nc6s_v2", + "standard_nc12s_v2", + "standard_nc24s_v2", + "standard_nc24rs_v2", + // V100: https://learn.microsoft.com/en-us/azure/virtual-machines/ncv3-series + "standard_nc6s_v3", + "standard_nc12s_v3", + "standard_nc24s_v3", + "standard_nc24rs_v3", + "standard_nd40s_v3", + "standard_nd40rs_v2", + // T4: https://learn.microsoft.com/en-us/azure/virtual-machines/nct4-v3-series + "standard_nc4as_t4_v3", + "standard_nc8as_t4_v3", + "standard_nc16as_t4_v3", + "standard_nc64as_t4_v3", + // A100 40GB: https://learn.microsoft.com/en-us/azure/virtual-machines/nda100-v4-series + "standard_nd96asr_v4", + "standard_nd112asr_a100_v4", + "standard_nd120asr_a100_v4", + // A100 80GB: https://learn.microsoft.com/en-us/azure/virtual-machines/ndm-a100-v4-series + "standard_nd96amsr_a100_v4", + "standard_nd112amsr_a100_v4", + "standard_nd120amsr_a100_v4", + // A100 PCIE 80GB: https://learn.microsoft.com/en-us/azure/virtual-machines/nc-a100-v4-series + "standard_nc24ads_a100_v4", + "standard_nc48ads_a100_v4", + "standard_nc96ads_a100_v4", + // A10 + "standard_nc8ads_a10_v4", + "standard_nc16ads_a10_v4", + "standard_nc32ads_a10_v4", + // A10, GRID only: https://learn.microsoft.com/en-us/azure/virtual-machines/nva10v5-series + "standard_nv6ads_a10_v5", + "standard_nv12ads_a10_v5", + "standard_nv18ads_a10_v5", + "standard_nv36ads_a10_v5", + "standard_nv36adms_a10_v5", + "standard_nv72ads_a10_v5", + // A100 + "standard_nd96ams_v4", + "standard_nd96ams_a100_v4", + "standard_nd96amsrf_a100_v4", + "standard_nd96amsf_a100_v4", + // H100: https://learn.microsoft.com/en-us/azure/virtual-machines/nd-h100-v5-series + "standard_nd96isr_h100_v5", + "standard_nd96is_h100_v5", + "standard_nd96isrf_h100_v5", + "standard_nd96isf_h100_v5", + // NC: https://learn.microsoft.com/en-us/azure/virtual-machines/ncads-h100-v5 + "standard_nc40ads_h100_v5", + "standard_nc80adis_h100_v5", +) + +/* + marinerNvidiaEnabledSKUs : List of GPU SKUs currently enabled and validated for Mariner. Will expand the support + to cover other SKUs available in Azure. +*/ +//nolint:gochecknoglobals +var marinerNvidiaEnabledSKUs = sets.NewString( + // V100 + "standard_nc6s_v3", + "standard_nc12s_v3", + "standard_nc24s_v3", + "standard_nc24rs_v3", + "standard_nd40s_v3", + "standard_nd40rs_v2", + // T4 + "standard_nc4as_t4_v3", + "standard_nc8as_t4_v3", + "standard_nc16as_t4_v3", + "standard_nc64as_t4_v3", +) + +/* convergedGPUDriverSizes : these sizes use a "converged" driver to support both cuda/grid workloads. +how do you figure this out? ask HPC or find out by trial and error. +installing vanilla cuda drivers will fail to install with opaque errors. +nvidia-bug-report.sh may be helpful, but usually it tells you the pci card id is incompatible. +That sends me to HPC folks. +see https://github.com/Azure/azhpc-extensions/blob/daaefd78df6f27012caf30f3b54c3bd6dc437652/NvidiaGPU/resources.json +*/ +//nolint:gochecknoglobals +var convergedGPUDriverSizes = sets.NewString( + "standard_nv6ads_a10_v5", + "standard_nv12ads_a10_v5", + "standard_nv18ads_a10_v5", + "standard_nv36ads_a10_v5", + "standard_nv72ads_a10_v5", + "standard_nv36adms_a10_v5", + "standard_nc8ads_a10_v4", + "standard_nc16ads_a10_v4", + "standard_nc32ads_a10_v4", +) + +/* +fabricManagerGPUSizes list should be updated as needed if AKS supports +new MIG-capable skus which require fabricmanager for nvlink training. +Specifically, the 8-board VM sizes (ND96 and larger). +Check with HPC or SKU API folks if we can improve this... +*/ +//nolint:gochecknoglobals +var fabricManagerGPUSizes = sets.NewString( + // A100 + "standard_nd96asr_v4", + "standard_nd112asr_a100_v4", + "standard_nd120asr_a100_v4", + "standard_nd96amsr_a100_v4", + "standard_nd112amsr_a100_v4", + "standard_nd120amsr_a100_v4", + // TODO(ace): one of these is probably dupe... + // confirm with HPC/SKU owners. + "standard_nd96ams_a100_v4", + "standard_nd96ams_v4", + // H100. + "standard_nd46s_h100_v5", + "standard_nd48s_h100_v5", + "standard_nd50s_h100_v5", + "standard_nd92is_h100_v5", + "standard_nd96is_h100_v5", + "standard_nd100is_h100_v5", + "standard_nd92isr_h100_v5", + "standard_nd96isr_h100_v5", + "standard_nd100isr_h100_v5", +) + +// IsNvidiaEnabledSKU determines if an VM SKU has nvidia driver support. +func IsNvidiaEnabledSKU(vmSize string) bool { + // Trim the optional _Promo suffix. + vmSize = strings.ToLower(vmSize) + vmSize = strings.TrimSuffix(vmSize, "_promo") + return nvidiaEnabledSKUs.Has(vmSize) +} + +// IsMarinerNvidiaEnabledSKU determines if an Mariner VM SKU has nvidia driver support. +func IsMarinerEnabledGPUSKU(vmSize string) bool { + // Trim the optional _Promo suffix. + vmSize = strings.ToLower(vmSize) + vmSize = strings.TrimSuffix(vmSize, "_promo") + return marinerNvidiaEnabledSKUs.Has(vmSize) +} + +func UseWindowsCudaGPUDriver(vmSize string) bool { + lowerVMSize := strings.ToLower(vmSize) + return strings.Contains(lowerVMSize, "_nc") || strings.Contains(lowerVMSize, "_nd") +} + +func UseWindowsGridGPUDriver(vmSize string) bool { + lowerVMSize := strings.ToLower(vmSize) + return strings.Contains(lowerVMSize, "_nv") +} + +// Below GPU helper functions are used for populating cse_cmd, +// may move these to a separate package specifically for bootstrapping for self-contained later on. + +// IsMIGNode check if the node should be partitioned. +func IsMIGNode(gpuInstanceProfile string) bool { + return gpuInstanceProfile != "" +} + +func GetAKSGPUImageSHA(size string) string { + if useGridDrivers(size) { + return aksGPUGridSHA + } + return aksGPUCudaSHA +} + +func GPUNeedsFabricManager(size string) bool { + return fabricManagerGPUSizes.Has(strings.ToLower(size)) +} + +func GetCommaSeparatedGPUSizes() string { + return strings.Join(nvidiaEnabledSKUs.List(), ",") +} + +func GetCommaSeparatedMarinerGPUSizes() string { + return strings.Join(nvidiaEnabledSKUs.List(), ",") +} + +// NV series GPUs target graphics workloads vs NC which targets compute. +// they typically use GRID, not CUDA drivers, and will fail to install CUDA drivers. +// NVv1 seems to run with CUDA, NVv5 requires GRID. +// NVv3 is untested on AKS, NVv4 is AMD so n/a, and NVv2 no longer seems to exist (?). +func GetGPUDriverVersion(size string) string { + if useGridDrivers(size) { + return nvidia535GridDriverVersion + } + if isStandardNCv1(size) { + return nvidia470CudaDriverVersion + } + return nvidia535CudaDriverVersion +} + +func isStandardNCv1(size string) bool { + tmp := strings.ToLower(size) + return strings.HasPrefix(tmp, "standard_nc") && !strings.Contains(tmp, "_v") +} + +func useGridDrivers(size string) bool { + return convergedGPUDriverSizes.Has(strings.ToLower(size)) +} diff --git a/pkg/agent/common/gpu_test.go b/pkg/agent/common/gpu_test.go new file mode 100644 index 00000000000..bdbe2f8232c --- /dev/null +++ b/pkg/agent/common/gpu_test.go @@ -0,0 +1,214 @@ +/* +Portions Copyright (c) Microsoft Corporation. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package common + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestIsNvidiaEnabledSKU(t *testing.T) { + assert := assert.New(t) + tests := []struct { + name string + input string + output bool + }{ + {"Valid SKU - NC6", "standard_nc6", true}, + {"Valid SKU - NC6 promo", "standard_nc6_promo", true}, + {"Valid SKU - NC12", "standard_nc12", true}, + {"Valid SKU - NC24", "standard_nc24", true}, + {"Valid SKU - NC24r", "standard_nc24r", true}, + {"Valid SKU - NC6s v2", "standard_nc6s_v2", true}, + {"Valid SKU - NC12s v2", "standard_nc12s_v2", true}, + {"Valid SKU - NC24s v2", "standard_nc24s_v2", true}, + {"Valid SKU - NC24rs v2", "standard_nc24rs_v2", true}, + {"Valid SKU - NC6s v3", "standard_nc6s_v3", true}, + {"Valid SKU - NC6s v3 Promo", "standard_nc6s_v3_promo", true}, + {"Valid SKU - NC12s v3", "standard_nc12s_v3", true}, + {"Valid SKU - NC24s v3", "standard_nc24s_v3", true}, + {"NValid SKU - C24rs v3", "standard_nc24rs_v3", true}, + {"Valid SKU - NV6", "standard_nv6", true}, + {"Valid SKU - NV12", "standard_nv12", true}, + {"Valid SKU - NV24", "standard_nv24", true}, + {"Valid SKU - NV24", "standard_nv24r", true}, + {"Valid SKU - ND6", "standard_nd6s", true}, + {"Valid SKU - ND12s", "standard_nd12s", true}, + {"Valid SKU - ND24s", "standard_nd24s", true}, + {"Valid SKU - ND24rs", "standard_nd24rs", true}, + {"Non-Existent SKU", "non_existent_sku", false}, + {"Invalid SKU", "standard_d2_v2", false}, + {"Valid SKU - T4 Series", "standard_nc4as_t4_v3", true}, + {"Empty SKU", "", false}, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + result := IsNvidiaEnabledSKU(test.input) + assert.Equal(test.output, result, "Failed for input: %s", test.input) + }) + } +} + +func TestUseWindowsCudaGPUDriver(t *testing.T) { + t.Parallel() + + testCases := []struct { + name string + vmSize string + expected bool + }{ + {"Standard_NC6", "Standard_NC6", true}, + {"Standard_NC12", "Standard_NC12", true}, + {"Standard_NC24", "Standard_NC24", true}, + {"Standard_NV6", "Standard_NV6", false}, + {"Standard_ND6s", "Standard_ND6s", true}, + {"Standard_D2_v2", "Standard_D2_v2", false}, + {"Nonexistent", "gobbledygook", false}, + {"EmptyString", "", false}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + result := UseWindowsCudaGPUDriver(tc.vmSize) + assert.Equal(t, tc.expected, result) + }) + } +} + +func TestUseWindowsGridGPUDriver(t *testing.T) { + t.Parallel() + + testCases := []struct { + name string + vmSize string + expected bool + }{ + {"Standard_NC6", "Standard_NC6", false}, + {"Standard_NC12", "Standard_NC12", false}, + {"Standard_NV6", "Standard_NV6", true}, + {"Standard_ND6s", "Standard_ND6s", false}, + {"Standard_D2_v2", "Standard_D2_v2", false}, + {"Nonexistent", "gobbledygook", false}, + {"EmptyString", "", false}, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + result := UseWindowsGridGPUDriver(tc.vmSize) + assert.Equal(t, tc.expected, result) + }) + } +} + +func TestIsMarinerEnabledGPUSKU(t *testing.T) { + assert := assert.New(t) + tests := []struct { + name string + input string + output bool + }{ + {"Invalid Mariner SKU - NC6", "standard_nc6", false}, + {"Invalid Mariner SKU - NC6 promo", "standard_nc6_promo", false}, + {"Invalid Mariner SKU - NC12", "standard_nc12", false}, + {"Invalid Mariner SKU - NC24", "standard_nc24", false}, + {"Invalid Mariner SKU - NC24r", "standard_nc24r", false}, + {"Invalid Mariner SKU - NC6s v2", "standard_nc6s_v2", false}, + {"Invalid Mariner SKU - NC12s v2", "standard_nc12s_v2", false}, + {"Invalid Mariner SKU - NC24s v2", "standard_nc24s_v2", false}, + {"Invalid Mariner SKU - NC24rs v2", "standard_nc24rs_v2", false}, + {"Valid Mariner SKU - NC6s v3", "standard_nc6s_v3", true}, + {"Valid Mariner SKU with Promo", "standard_nc6s_v3_promo", true}, + {"Valid Mariner SKU - NC12s v3", "standard_nc12s_v3", true}, + {"Valid Mariner SKU - NC24s v3", "standard_nc24s_v3", true}, + {"Valid Mariner SKU - NC24rs v3", "standard_nc24rs_v3", true}, + {"Invalid Mariner SKU - NV6", "standard_nv6", false}, + {"Invalid Mariner SKU - NV12", "standard_nv12", false}, + {"Invalid Mariner SKU - NV24", "standard_nv24", false}, + {"Invalid Mariner SKU - NV24", "standard_nv24r", false}, + {"Invalid Mariner SKU - ND6", "standard_nd6s", false}, + {"Invalid Mariner SKU - ND12s", "standard_nd12s", false}, + {"Invalid Mariner SKU - ND24s", "standard_nd24s", false}, + {"Invalid Mariner SKU - ND24rs", "standard_nd24rs", false}, + {"Non-Existent Mariner SKU", "non_existent_sku", false}, + {"Valid Mariner SKU - T4", "standard_nc4as_t4_v3", true}, + {"Invalid Mariner SKU", "standard_d2_v2", false}, + {"Valid Mariner SKU - ND Series", "standard_nd40s_v3", true}, + {"Invalid Mariner SKU - ND Series", "standard_nd96asr_v4", false}, + {"Nonexistent", "gobledygook", false}, + {"Empty Mariner SKU", "", false}, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + result := IsMarinerEnabledGPUSKU(test.input) + assert.Equal(test.output, result, "Failed for input: %s", test.input) + }) + } +} + +func TestGetAKSGPUImageSHA(t *testing.T) { + assert := assert.New(t) + tests := []struct { + name string + size string + output string + }{ + {"GRID Driver - NC Series v4", "standard_nc8ads_a10_v4", aksGPUGridSHA}, + {"Cuda Driver - NV Series", "standard_nv6", aksGPUCudaSHA}, + {"CUDA Driver - NC Series", "standard_nc6s_v3", aksGPUCudaSHA}, + {"GRID Driver - NV Series v5", "standard_nv6ads_a10_v5", aksGPUGridSHA}, + {"Unknown SKU", "unknown_sku", aksGPUCudaSHA}, + {"CUDA Driver - NC Series v2", "standard_nc6s_v2", aksGPUCudaSHA}, + {"CUDA Driver - NV Series v3", "standard_nv12s_v3", aksGPUCudaSHA}, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + result := GetAKSGPUImageSHA(test.size) + assert.Equal(test.output, result, "Failed for size: %s", test.size) + }) + } +} + +func TestGetGPUDriverVersion(t *testing.T) { + assert := assert.New(t) + tests := []struct { + name string + size string + output string + }{ + {"CUDA Driver - NC Series v1", "standard_nc6", nvidia470CudaDriverVersion}, + {"CUDA Driver - NCs Series v1", "standard_nc6s", nvidia470CudaDriverVersion}, + {"CUDA Driver - NC Series v2", "standard_nc6s_v2", nvidia535CudaDriverVersion}, + {"Unknown SKU", "unknown_sku", nvidia535CudaDriverVersion}, + {"CUDA Driver - NC Series v3", "standard_nc6s_v3", nvidia535CudaDriverVersion}, + {"GRID Driver - A10", "standard_nc8ads_a10_v4", nvidia535GridDriverVersion}, + {"GRID Driver - NV Series v5", "standard_nv6ads_a10_v5", nvidia535GridDriverVersion}, + {"GRID Driver - A10", "standard_nv36adms_a10_V5", nvidia535GridDriverVersion}, + // NV V1 SKUs were retired in September 2023, leaving this test just for safety + {"CUDA Driver - NV Series v1", "standard_nv6", nvidia535CudaDriverVersion}, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + result := GetGPUDriverVersion(test.size) + assert.Equal(test.output, result, "Failed for size: %s", test.size) + }) + } +} diff --git a/pkg/agent/datamodel/const.go b/pkg/agent/datamodel/const.go index faf57e79cc6..5ef482c36a0 100644 --- a/pkg/agent/datamodel/const.go +++ b/pkg/agent/datamodel/const.go @@ -117,74 +117,6 @@ const ( TempDiskContainerDataDir = "/mnt/aks/containers" ) -const ( - Nvidia470CudaDriverVersion = "cuda-470.82.01" - Nvidia535CudaDriverVersion = "cuda-535.54.03" - Nvidia535GridDriverVersion = "grid-535.54.03" -) - -// These SHAs will change once we update aks-gpu images in aks-gpu repository. We do that fairly rarely at this time -// So for now these will be kept here like this. -const ( - AKSGPUGridSHA = "sha-20ffa2" - AKSGPUCudaSHA = "sha-ff213d" -) - -/* ConvergedGPUDriverSizes : these sizes use a "converged" driver to support both cuda/grid workloads. -how do you figure this out? ask HPC or find out by trial and error. -installing vanilla cuda drivers will fail to install with opaque errors. -nvidia-bug-report.sh may be helpful, but usually it tells you the pci card id is incompatible. -That sends me to HPC folks. -see https://github.com/Azure/azhpc-extensions/blob/daaefd78df6f27012caf30f3b54c3bd6dc437652/NvidiaGPU/resources.json -*/ -//nolint:gochecknoglobals -var ConvergedGPUDriverSizes = map[string]bool{ - "standard_nv6ads_a10_v5": true, - "standard_nv12ads_a10_v5": true, - "standard_nv18ads_a10_v5": true, - "standard_nv36ads_a10_v5": true, - "standard_nv72ads_a10_v5": true, - "standard_nv36adms_a10_v5": true, - "standard_nc8ads_a10_v4": true, - "standard_nc16ads_a10_v4": true, - "standard_nc32ads_a10_v4": true, -} - -/* -FabricManagerGPUSizes list should be updated as needed if AKS supports -new MIG-capable skus which require fabricmanager for nvlink training. -Specifically, the 8-board VM sizes (ND96 and larger). -Check with HPC or SKU API folks if we can improve this... -*/ -//nolint:gochecknoglobals -var FabricManagerGPUSizes = map[string]bool{ - // A100 - "standard_nd96asr_v4": true, - "standard_nd112asr_a100_v4": true, - "standard_nd120asr_a100_v4": true, - "standard_nd96amsr_a100_v4": true, - "standard_nd112amsr_a100_v4": true, - "standard_nd120amsr_a100_v4": true, - // TODO(ace): one of these is probably dupe... - // confirm with HPC/SKU owners. - "standard_nd96ams_a100_v4": true, - "standard_nd96ams_v4": true, - // H100. - "standard_nd46s_h100_v5": true, - "standard_nd48s_h100_v5": true, - "standard_nd50s_h100_v5": true, - "standard_nd92is_h100_v5": true, - "standard_nd96is_h100_v5": true, - "standard_nd100is_h100_v5": true, - "standard_nd92isr_h100_v5": true, - "standard_nd96isr_h100_v5": true, - "standard_nd100isr_h100_v5": true, - // A100 oddballs. - "standard_nc24ads_a100_v4": false, // NCads_v4 will fail to start fabricmanager. - "standard_nc48ads_a100_v4": false, - "standard_nc96ads_a100_v4": false, -} - const ( OSSKUCBLMariner = "CBLMariner" OSSKUMariner = "Mariner" diff --git a/pkg/agent/datamodel/helper.go b/pkg/agent/datamodel/helper.go index 80637169a58..483aa0340f2 100644 --- a/pkg/agent/datamodel/helper.go +++ b/pkg/agent/datamodel/helper.go @@ -43,11 +43,6 @@ func IsSgxEnabledSKU(vmSize string) bool { return false } -// IsMIGNode check if the node should be partitioned. -func IsMIGNode(gpuInstanceProfile string) bool { - return gpuInstanceProfile != "" -} - // GetStorageAccountType returns the support managed disk storage tier for a give VM size. func GetStorageAccountType(sizeName string) (string, error) { spl := strings.Split(sizeName, "_") diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 4e74eb97c39..598996a5031 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 75ab62479ac..91b566e3ea6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 75ab62479ac..91b566e3ea6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index b95090f3903..912de01727e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index b95090f3903..912de01727e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 4e74eb97c39..598996a5031 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 82d0a44d766..fa6203d9c27 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index b15e13b6074..8aad156c852 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 4e74eb97c39..598996a5031 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 238ad1da18a..3ca43d0084c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 4e74eb97c39..598996a5031 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index a8b6a3664fb..8c9f9fce4d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index de71cfcad8a..6cf0c59d7a9 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index a8b6a3664fb..8c9f9fce4d0 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index a833edfe6b1..0b5c5833a67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 94dcd62e67c..b51486bc1a7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 7386b0550c9..de3e79da8b6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 75cbdce4019..08b165803ef 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 27fa6ad4fe1..85aa258d41c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 94dcd62e67c..b51486bc1a7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 94dcd62e67c..b51486bc1a7 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 246ff9c1bf9..65aeb8a206d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 306b8c99ea0..ab44e394edf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index fa97b9e2b2d..b1e508c9129 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index a833edfe6b1..0b5c5833a67 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 7386b0550c9..de3e79da8b6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 9f2a2ee42f4..f2315cd467e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index bbf8af8ee61..cac574075f1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index 8e167c1f138..71099c7571b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index ac7deda869c..e5eddae27db 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 328e630c36d..f18a9edad72 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index c78e48d2f70..0a252336886 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index cc2636124f3..f652b04fb9f 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index e67a1e86afb..4bf49d9e597 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index ac7deda869c..e5eddae27db 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index ac7deda869c..e5eddae27db 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 0534d605b1c..8ac19d72978 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 52407ee4c49..66adcdfe860 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index a833edfe6b1..0b5c5833a67 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index ac7deda869c..e5eddae27db 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index c2c5adeab6f..6128f855c37 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index c2c5adeab6f..6128f855c37 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index c2c5adeab6f..6128f855c37 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index c2c5adeab6f..6128f855c37 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index c2c5adeab6f..6128f855c37 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index e73cc792659..0d2b47ad5d2 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -32,7 +32,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -69,7 +69,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImage/line35.sh b/pkg/agent/testdata/CustomizedImage/line35.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/CustomizedImage/line35.sh +++ b/pkg/agent/testdata/CustomizedImage/line35.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/CustomizedImage/line72.sh b/pkg/agent/testdata/CustomizedImage/line72.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/CustomizedImage/line72.sh +++ b/pkg/agent/testdata/CustomizedImage/line72.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index e73cc792659..0d2b47ad5d2 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -32,7 +32,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -69,7 +69,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/CustomizedImageKata/line35.sh b/pkg/agent/testdata/CustomizedImageKata/line35.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line35.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line35.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/CustomizedImageKata/line72.sh b/pkg/agent/testdata/CustomizedImageKata/line72.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line72.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line72.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index e6113eb7094..0539167afdf 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/+R8fXebSLL3//oUNYSJ7UwA25mZzeNd5bmKTDw6tiUfJCX33myWg6AlsQZa2zSyY5nvfk/z2kAjy3ZmJveu55xkAt3V1fXyq6ruwi9+0GZuoM2scNnp9PvmWDc+Dvq6ORiak8urroZXVLPuIoI0GwfUcgNEQs22lRXBt1/VEJG1ayPVDZK5o/65Ptl1KravEU1mDgdmfzT8MDgzTwdGV9IQtTU7cLUAUdWRkvfvB8PsJaPKXs7cIH11Ovo0vBj1Tse1AQ6+CTxsOaHU6RuD/uSiGMkPJK5NPcHYcsEoJJqHbcvLlhwNJ73BUDdOxSvnW3V4osZ02BcOJ1Fg8wPP346F466jGSIBoiisj74yBh97E9286vXPe2f62Oz3+r/pD0zVVsRdWxQpK8u+thYolDrT99PhZGoa+oXeG+tded8LZyZBHrJCBAoBJTzojPX+1NDNycXYfD8aTcYTo3dlnk/f6xf6xNT/U++bVxfTMya5pqRTS6BeOMOYhpRYK2l3eh91YzwYDbvS+lA9Ug8Vy1stLfVY6kz0C/1qZExOt6xMkYdWmNCKRhoTd1H4p974MudlnDDzRj2E9aH6i3rE/nqrHkqdy95w8EEfT8wPgwv9qjf5rSIA3wrcOQqp+s8QB8lg8/S92ZtORub06pQp8sNF74yfu7aI5rkzNlNxZpoVUaxEK8eiSOr0p8aFOZpOrqaTrkb9lWZHxDPXiMxwiFQc0U6HIB+v0aUVnM56EcXTZOYHz1p8cD20fwCbDgAA8UGZg/wQO52407EJsuiDBCmO7OWOBD1kBdGqX3jOqcdIhRXmyBzkNtdjRNwgpJbnFUSMKKCuX/LjzuEzSPJmqOunY7OkFEvQ7YJESYQk+PJXoEsUJBPYD7KXGCQ3gBbqoACzVmOoT/RxbhjQBXnTfBxLBdnEuKBECqaw0MXlugmzyhwkuWFMTSbZT5NWV5L3//kv5rhq+VJFzgIJqR5IFXq5tKqgkMnq6K16+LOYj4d42eOZWblBgBxVOnp7+LO0twtbc7dUjReiyrtUV596xnAwPDvhuICMCwgwhTmOAgfcAHI/fA0OmluRR91gARTD0iKOjR3GV4dbtiPY3cqi9pLfY8qC3BSABPdgRxQURwFlfsTtihtL0Np9JKVjjlJqM3fVWRUWJfgC9/eJYtuHMAUHkeeJB+c8VsYJ7CB3nLXluU65yVwVJyDaWpXCrUtB1g2D81VzMBxPehcX5mRwqY+mE6GCPLwITYpNtEYBDUHqnY/V/lhXW1w4fz6mVuBYHg5QiUMS20LrW5A3bWKMq+9yqXEQsAOycPv+qBs5sLQumdKuuEVG+xLPvkInk1MJlUNEbzC5vvKihRtUcDIDysmnkXGehUfm+iAlIUyCL3WVZxR77HV/OOhwvprvL3taQHk9cYOXjLU8QPeHg4Ij/9pxCSgrwaTkPXs6OfvvJOeUN+xfKctjc2pcvHjxSovhBUxDBCzHhVnkMl+HFyk7iJKvtu+YC0RNapGZ5XlwdHwIv4DUXE5LyWeLxRI0louZz3Cmy1EojJbb5hjZEUGTi/H7PCc6j2bIQ1S/RXZNMWnQWCUPzYh4XWlJ6So80bTrt2GWp4XqzMMz1cYEqTdu4OCbUA0Q1azrUKFeqBSpl2J7LgqoJm8em4LFmucG0a1m+c6vP2siohJnR/K+G/aMy19/PmCAcdS0nO9nP8Tfup8cYkprfFIy3OE2nVsBc+RlV3oE7zzFuIXpMuv5IU0lRKs20bvwCHduzi3XiwiCN8wffj0EllyCMh9fgIJbCRbPI+JJVXco2N55o3Wgt5f4JgDFAIIxPWF/gPQ0RXAheOljh9H8yy+/PI9aCq8FhhVI/ckK/fHS9cuMdo4JhEvXz9GbZSRyW6HxV3Bwwe3MDSzyVZB1bHh6McsTKAEVlIMteeeNFfpV37PsUPFdQjBRE7BnCWPicuUshc1S2GqhVluVx4aHlp27HkoNv15w8RnNDhBSS6N+rz0xfBCnhLyTte2SX4uRV8KVGygNpWU516OJee5iSQXkBKLaycHXqYc/djdV44yV9ZEkoBIRT0yADT9+9/KI2S5CIHPVLbzTHLTWWMYJ97AgaAWKDtI/9hnLJ+qrg/v9z0j/Qoj66kCW4OVL2LctWiXx8iWHRefGdDxhLl2Pzwd/gLRydT1DXimJfxeJ3dyEzxIXm/8dyioNPWnc+Qa+9g1ob7HM51Nv1SIPq+wvBweID6V5YfHEmuDjUJ+Yf3BhIFrzkdVBPzmbLvacHUznR6HyUfr0amr2jP5vXXl/gWj/atoj9vKgLqTm+TdPsng+NS52CZvEVSjGXqit5U2Vq1hLtOuiMDtZV5pDlCSgKvImZz1WqUXUxZ3E85TIUk9LuiaXifaqikpOPpnpwVGGNpJo31pBL18hreOaa8T8sWJNFe1CtyNCUEA/ZvmZvJ/KARQlT/WOK2ATIgf2cmkVR1Wattg7qNbjVcKxBD90QRLU4mk6mBNqzAM8h2wxyyPIcr7mJTpyVAiv3dXKDRZQ2TebQy2yQBRKus0Tzh/VV7F6KDiHqKtUeqptlALJMqRdFSxMGvOziIbyWVUlOM5aEaTYlr1ETi7B4kTxpEVyUj00RiSAozrclUtMg5VlXzMy2QpuQHHJYXZHwZ0jUYvA3e36MbJQ+k2CtQKrrK7k6sDMTjvNMLBlYLUsmuS3MbXzjQoIZeBWXtIUqHf8mNOFVOCV+j2dqdyBvKk4e5sj5WwDS11WFrF8RBFJCriWHcGNFSaWsXDXiCtnSuAvt1WwoBtG5dSs5LIhg1ZWi3uuyon3M7goA8jWa7aHcXizdX5c3tAxSGhumGV5VW1pwnElHe7gYdO+Vx7h28zy6ZbWnxqGPpyUprtfKuiBaNDU5LqMCGk5PekZZ3pJXMouHzOWQ+SvEeljf2URxNy9ysuJIh2qh+qhFDMDq1CKhaaVBRGPCxbQZLKxTgxuyNJpi7kMXVoB7GMC6F+R5QHFB3lQmVkh4ojUGGpGpZquVEHIafPNbaaYwEBj+YKkv/5Gltx29byT/eZXIIn5NmH4m5PPoKCIldv3zxwqRDRa9YeDU5eELQl7xlEHxEd6gjHcEV3lrYB42UqylX5jWBnJqm+5LJCrQJ5z65Ak/gODm5tR+lGli7uYDakEK2dLzZHREeU4/jq7oKjMi2sTtVdNeVdvkSoJ14OljzDVeuhSbjhQuasfCbh/CI/cWNqj3N7txhFLeOo7zIk9ZH2l8hs16LNrzB3MAP79bCGXs1ov/kurqNwz/pmmgW4psWx6Hs3Q+6zurd3XXb8NubP67KQjexXNkJkdhiTn1fIx/9oNzaxJK3v7JrvTKQnTxZ1J/VWSbQWWj7rypkY0rZP5RKZKlmUzlESoqSmOfleSN9s7zZgdiRiKpY7YdPjRbXaSZR5pwZX1qUF1ZlmAPVxo1TOarXQTmq/hxvU8yJTM8hdaLpMFxOrdRdJr5yGqvBK9YCXvq6ZPCSTdcNIW4RbeXQRAwfRO825PdKhVU0nDlGqHV/w6jWs6Ttc1wYo1zahKrWQbx4O5NhNXVyixgnCOid+Vwnv11f1LJV0zP2C8l0BRwiW+KUciR2ESDBlQrAX2+PdiRUUJKXFXio39FQ4YYHXfMNSoqhe4HssAO4i3hdZ3rLxviJTLvzo1SbZYVHWz8CW9Qmqfw8yzMaee9G/lqVpKCxBlbnmhAFLSHsO6sLkjgiwCZD0Q5+kGe4HD/u+K4NuvZeydjiejy+RaluFxz/iv2iEmK0UaQ6bGxUk3WzEHs20kRGN4GimSRCErTTIRQES8ExBPrRQar8GOQor9fMIDO8pWzCRkZj1rpjs3fTdkDHQZjHeqNnO3A12xmp6EbNyF79YI365fVRBQJRA8FHdY7rLdxDZLoGqXZzkQeRWJPqjapkj/RIE8zG1iOE2/TiN1K+iIGlxr4COanKJPy+R6V1l29N2uJKk9f2E/Lyaj09EJpB3Q7DXYOHBc6uIA7CWyrwEHUHNuwIGNwLgCe2kFCwRuCFkzklOh7c5hfz9rvhDLPm/UlFQpadWEd104+svBAbx8CZ9BCRgS1hZvubL/k02ozmTNh6B6kF3GaMgOTR5nBi3DpW3ktphky3Cpw1X91k+3LXDXAnad5+AkaEvsI235dYUIe6gUXyWkPZCriGsHHfjWomxi718MzMloVJyPFx1D5uCyd6anR+fHXGxitJLG5iUC108TXcGkGNIgJm/yFeJKF1/5OOn7tSkRuGurhbJ1GSM2Jap4eQkkUdvAr4dwxPLTQ7Apy/SSnG1l2YjlzKqLsy0x2lz3VEk3OebK+qOo6yMHcEQhl8lWeaxdC5JtVq71uQ6t/oSNPzOvpmU/8kElXDSklt4IPUVwycwnyy69SfrdpJRtq1VQ6b1Qm6w4IHlQDk+VgIPta0R+Nwmk5GsSOB31z/U2E0nTXYKotXi+pxv6pHfGP37DAUCyxoJtY06w37aL5I6xRuebYMJWv6XWQqgOkGusPM2t8hvUJ61VuUpIrOcpdDg9X/aNRMPhB0z6Szewmh33JVljOmT2kn1vY3MfJDR2aXleQbq7L+9vk3gInhvSvMNp7x++TVTftQkO8ZyqNva1PbgH6+Ya9jYr4gYU5KN470DgqvVVeRmFuy0QUgJdCJN15vvSj+HJj6H0GuSj1yAfH8SQcRBSUrBQuRyV5A3PRSar1oYIhgrIYZY+dwMHfLvgdo4JJCqSWm7zIGvY9e3USZNm3crin//jy09S41EsxZXW3YoddIvcMScbZ/d/CoK9UBPIjj2x7phC7aC4DXy+BRWsVaEoc2meP3lT2UJ5/9T4GEtIL8fJnUjWOsHSHP75YFmKqgC1REI5bw3pVLyf+ELnb/pHhj3Ed9snpOCQfPw4XaVGUzs8Tq9HM3NJt4ZuV5hQ/k1KKwrstKxJv6VMyRlReY8NT/0GcpvUWrG3mJjwwYK6w7JiVPZDFVBRhRvpRJKP472iC3Ot52VSLbOX74WP1c+Hyv/78lPLW0X82JTy9eQNJ9k47aHfY//9Pdirtm42TL5tu7vgcR1yv//tb/sSUyCFanxQlDkmvkVhb7NRDbTCoUsx+RrHJ5uNOrEW8fcuAW73qaeyvM+0sYO68v+vwbJcvIMfunC45QS8HMnJtnC9ulTbOwChCHrCWfdws3Q9BARZTqqRSpR6NljkPyLIrmRvGXdxY7bQt1pJcnGlhR6nLshjSu1dzKOrMm/gaFrxC6qMpMnp6PgwveBV7ObMEuSLM5ka2qeJwL5jUXTwWt5f4pAywDh4DSG1CO0LZ6fnF3z0ACk5Tkh+vYb0AGEUOC1kyw/yjaR2QE6N28Iis0aZ/sVoeppZY3ozy9LbvocjUbbxvy8GpWlskXjt/elR4TEM/VE4vStPHD//x5AtT5e/H0yrLJmKreikKz/Jz5w9qXDq7tvMU6t8chCWImcztvJvc8+tYa0AVhsjmjISAXaOhOJ3IgCtoHZjSHogW9+6U/nFJMYDv5gErxEhroOyz+37OJi7i7J0SfvMuF/3kvzyIyb99E/Vni9UR3t7aCYfYZgBYikCo8HepBrKftfKpkYsNRrbovC3v+mjD/DunWCIY1ErxBGx0UkyPDGBk7LQX628r2xRxnu28El2AaCPPnTizgv21/8EAAD//6TxFR1GSgAA + H4sIAAAAAAAA/+Rce3PbOJL/X5+ih+HYUiYkbc9jc97V3Coy41XZllyUlNxdNsuiSEjimiK0ICg7lvndr8AnSIKybM9MsndOVRITQKPRjx+60SBffafNXF+bWcGy1er3zbFufBj0dXMwNCdX110Nr6lm3YcEaTb2qeX6iASabStrgu++qAEiG9dGquvHY0f9C32y71Bs3yAajxwOzP5o+H5wbp4NjK6kIWprtu9qPqKqI8Xt7wbDtJFRZY0z10+azkYfh5ej3tm40sHBt76HLSeQWn1j0J9c5j35jsS1qSfoW0wYBkTzsG156ZSj4aQ3GOrGmXjmbKkOT9SYDvvC7iT0bb7jxduxsN9NOEPERxQF1d7XxuBDb6Kb173+Re9cH5v9Xv9v+iNDtTVxNxZFytqyb6wFCqTW9N10OJmahn6p98Z6V257wcwkyENWgEAhoASd1ljvTw3dnFyOzXej0WQ8MXrX5sX0nX6pT0z9v/S+eX05PWeSq0s6sQTqBTOMaUCJtZb2p/dBN8aD0bArbY7UY/VIsbz10lJPpNZEv9SvR8bkbMfMFHlojQktaaQ2cB+Ff+yNrzJexjEzP6pHsDlSf1aP2T9v1SOpddUbDt7r44n5fnCpX/cmfysJYGX57hwFVP1ngP24s3n2zuxNJyNzen3GFPn+snfOj91YRPPcGRupODPNCilWwrVjUSS1+lPj0hxNJ9fTSVejq7Vmh8QzN4jMcIBUHNJWi6AV3qAryz+b9UKKp/HI9561eO96qN2BbQsAgKxAmYP8GDutqNWyCbLoowQpDu3lngQ9ZPnhup97zpnHSAUl5sgc5CbXY0RcP6CW5+VEjNCn7qrgx53DJ5Dk7VDXz8ZmQSmSoNsFiZIQSfD5z0CXyI8HsB9kLzFIrg8N1EEBZq3GUJ/o48wwoAvytv44knKysXFBgRRMYYGLi3ljZpU5SHLNmOpMsp86ra4kt//5L+a4atGoImeBhFQ7UoleJq0yKKSyOn6rHv0k5uMxXg55Ztau7yNHlY7fHv0kHe7D1twtVOMFqNSW6OpjzxgOhuenHBeQcgE+pjDHoe+A60Pmh2/AQXMr9KjrL4BiWFrEsbHD+Gpx07YEq1tb1F7ya0xYkOsCkOAB7JCC4iigzI+5VXF9Cdq4T6R0wlFKbOa+PKrEogSf4eEhVmxzF6ZgP/Q8ceeMx1I/gR1kjrOxPNcpFpmp4hRESytTuHMpyLphcL5qDobjSe/y0pwMrvTRdCJUkIcXgUmxiTbIpwFIvYux2h/raoMLZ8/H1PIdy8M+KnBIYktobAV52yTGqNyWSY2DgD2QhVv3B93IgKVxyoR2yS1S2ld49gVaqZwKqBwieovJzbUXLly/hJMpUE4+joyLdHtkrg9SvIVJ8Lmq8pRijzX3h4MW56vZ+tKnOZRXAzc4YKxlG3R/OMg5Wt04LgFlLRgUt7Onk/P/iWNOect+S1gem1Pj8tWr11oEr2AaIGAxLsxCl/k6vErYQZR8sVeOuUDUpBaZWZ4HxydH8DNI9em0hHw6WSRBbbqI+QxnuhyF3Gi5ZY6RHRI0uRy/y2Kii3CGPET1O2RXFJNsGuv4oRkSrystKV0Hp5p28zZI47RAnXl4ptqYIPXW9R18G6g+opp1EyjUC5Q89FJsz0U+1eTtU0OwSPNcP7zTrJXzy0+aiKjE2ZHcdoOecfXLTx0GGMd1y/l21kNWO9eTQUxhjc8KhlvcojMrYI687EpP4J2nGDUwXUQ93yWhhGjWOnrnHuHOzbnleiFB8CPzh1+OgAWXoMzHl6DgRoL585B4Utkdcrb3XmgV6O0lvvVBMYBgTE/ZXyA9TxHcFrxcYYfR/NPPP7+MWgKvOYblSP3RClbjpbsqIloH2Z5FECgW3KaN164TdNudhBAmECzdVQbuLGCRm/KQP4OD88XMXN8iXwRByZanF7EwghJQQensCEsZa+bc9VBioNXEaPe4kktbdqCsXEIwUeM9hMWhsScXoxQ2SmFcBlqFWx5yygHPHghTibJ+L94YfIgjRt4Hm4TLz8XIK8Ha9ZWa0tKQ7MnEPHexpAJyAlHt5f+bBACeupqycUbK5lgSUAmJJybAup/8enDMbBchkLnkF37VHLTRWEAKD7AgaA2KDtI/2ozlU/V156H9CemfCVFfd2QJDg6gbVu0TOLggIOqC2M6njCPr27fHTgoyYt33x+6bfm7zh8gzkyfLxBoQuLfUaRpbsrbcpKOpAcwjYnp76KL29vgRYpg479JLeyhCS4dT//rYD9JP24tNuGWJ/Dpr5+jr7i7Jdt8ssf/BsD1Qro7PLj1IkN/FjuNRizULxfjZBnfM5O1D0N9Yv7BGZtoziembf24aJCvOa0YZGfU8nHy9Hpq9oz+37pye4Fo/3raI/ayUxVSvTDBk8yfT43LfQIW4ioUYy/QNvK2zFWkxdp1UZCWPJR6FyUOZRR5m7EeqdQi6uJe4nmKZaknuXady1h7ZUXFR9LM9OA4BVtJtG4tp5fNkCTY9Tki/ry3oopmodshIcinH1LskNuJHEBRMhg6KWFtgBw4zKSVnyFq2uKwUz4oKROOJPiuC5LgkCSBqoxQbRzgOaSTWR5BlvMlOztBjgrBjbteu/4CSutmY6hFFohCQbd+9Py9+jpSjwQHRFWVSs+1jUIgaWy6r4KF4Xp2SFRTPkt3BeeMa4IU27KXyMkkmB/1njZITqpGaSHx4bgKd8UUU39t2TeMTDqD61NccJgWj7gDPmoRuL/bPEUWSr9OsJL5FmmvXO6Y2qlgV9rRsZyvTrIyWeXgqQRCKbgV1bMc9U6ecuyTCLx0sJKMVO5B3pacvcmRMraBRW5ri1grRBGJg4uGFbFwJraMhbtBXP5aAH+xrJwF3TBKx5kFlzUZNLKaFyBLpYgXcFFsIDvrn4/j8Hbn+KgonTJIqC+YBbllbWnCfgUd7kRo27xWHuGbzPL5ltafGoY+nBSm2y4U9MhuUNfkptgRknOQSc841wviUloVTlkO0GqDSB+v1hZBzN3LvJwq0pF6pB5JETOwEqVIaFrpJuJxmwXUmazNE4EbsGzCYi5Dl5YPbUwA/Su0PKC4k20qMytAHJEKQ/VdqaIrVbDlNPnmLlOMYaA2fU5ytfmNLLnpTsBe9pvVpmLzrcPwb04+hYJ8r9y9fuZQAaLhuj8cnLkkaAjYU45aID5rFfThzk5LrQLixR2fnfRr3YqdrNzKRYFcBvKSclAc+A8MbmxK6XuVLu4j1qW0WTk7co6UjijGWW3SylFpXFQZqL2uy7tc3isFXI+mPsJQ67Fq6XCgcjU5CbhfhIedLOxR7u7344gFPNUVZsQes75C+bUc9MU55h5mAP//bCGTs1pN/gurKBWAv6ZpoDtKLJtehDP0Ls17K4XUm7cBd46UnnSkTeEMmelhSFwpkE/4Zjcw09tzaeuPabGtIEwX9yZdreNoy7dWqCtvK0STPJkPZMpkWTRDSYjqmuLodyV5u/sKILMjEUOR1BKbDt+7yU7SyCNJuNILhFAeWSRgjyda1YhmJ92Y5hu4dT0PUiWz+IUW06QbYrlYFV+C9BBVXosaWMr7uu5TAknXnLRBuLl35xugYHirXnQVHWpVVFIzpcrhFT9PrX7K6boiWLGmGVWpkWzteDDTZuzqCiWWH8wxWXWl4EF9/XCgJHNmB4wPEihKsMS3RU/kKEyCAQOKjcAe/57PqCgBJe5asfFqjX0GWN0fGWqU1Qvc5VcfO4i3hcY2lt7XRMrFX62KJBssqrxY+JwU75rHMPOsjakG/Tt5KqfSAkSZW14ggJTk8mdV2NwRQboDpJdTLpIF9nyH/e+a4Lsvxd47HU9GV3G9nOFxz/jvyiEmS0VqXabG5Wk3nTEDs10kRH14GgmShAFLTVIRQEi8UxAPLSUab8AOA4pX2YBHVpTOmErITC8Tmu7cXLkBY6DLYLxVtpn7PeiK1fQsZMspPLLDN+tXFWyoEggeiq++7rPc2DYLoGqWZ9EReSWJPqrauki/okAe5zY2nLpfJzt1I+iIbh5XwEc0OEGfhsHV637p0XezkqTm+IX9vJqMzkankFxNZ81gY99xqYt9sJfIvgHsQ8W5Afs2AuMa7KXlLxC4AaS3xJwSbXcO7XZaGBTLPrtBK6lSfIcWfu3C8Z86HTg4gE+g+AwJK5M3XJb4yiZUZbLiQyAs0WZHiJunmkFDd2kXuR0m2dBdanFZv/XDXQPcNYBd6yU4CdoSr5C2/LJGhD1U8tdFksup65C7pztYWYvi7YL+5cCcjEb5+XhezTYHV71zPTk6P+H2JkYrvnG+ROCukkBXMCiCZBOTt9kMUel6ZfE4LgzblAjctdFC2byMEZsSVTy9BJLo1sQvR3DM4tMjsCmL9OKYbW3ZiMXMqovTJTHaXGW/oBsfc6W1e+qukAM4pJDJZKc8Nq4F8TJLtxq42wP9Cet/bl5Pi4vindJ2UZNaUhF6juDikc+WXVJJ+t2klC6rUVBJXahJVhyQPCqH50rAwfYNIr+bBBLyFQmcjfoXepOJJOEuQdRavNzTDX3SO+cf/8gBQDzHgi1jTvCqaRVxjbFC5zfBhJ1+S62FUB0gV1h5nltlFdRnzVUqJcTW8xw6nJ6v+kas4eA9Jv2l61v1VyEKssZ0yOwlfRHK5t4Uqa3S8rycdLctt3dJPADPDWh2wevwHyubqCvXJjjAc6raeKUdwgNYtzdwuF0T16cgH0eHHYGrVmflZRTsN0FACXQhiOeZt6Xvg9PvA+kNyMdvQD7pRJByEFCSs1AqjkrylucilVXjhQiGCshhlj53fQdWds7tHBOIVSQ1VPMgvUy2shMnjS+SlSb/9NfPP0i1R5EUla6Vleygm8eOGdkorf8pCA4DTSA79sS6Zwq1/bwa+HILylkrQ1Hq0jx/8ra0hKL+VHtLTkgvw8m9SFZugiUx/MvBshBVDmqxhDLeatIpeT9ZCZ2/7h8p9pCV2zwgAYf4rdTpOjGayuFxUh5NzSVZGrpbY0L5loRW6NtJWpO85JqQM8Kijg3PfTl1l9QasTcfGPPBNnWHRcWouA+VQ0UZbqRTST6JDvNLqBs9S5Mqkb38IHysfjpS/uPzDw2tivixKWXzyVtOslFyv/OQ/fm7f1i+lFoz+abl7oPHVcj99pe/6xVZgRTK+4OizDFZWRQOt1vVQGscuBSTL1F0ut2qE2sRfesS4FafeCqL+0wbO6gr/2cFluW8Db7rwtGOE/CiJyfb3PWqUm2+AQj5picc9QC3S9dDQJDlJBop7VIvBovsRwTZpegt5S6qjRb6ViNJbl9poMepC/jb41xbxKOrMq/haJLxC7KM+JLT8clRUuBV7PrIAuTzM5kK2ieBQNuxKOq8kdtLHFAGGJ03EFCL0L5wdHJ+we8eIMXHCfF3T6RHCCPfaSBbfCnBiHMH5FS4zS0yvSjTvxxNz1JrTCqzLLztezgURRv/fntQEsbmgdfhV98VnsLQH4XT+/LE8fN/DNmycPnbwbTSlInY8pt0xbcSUmePM5yq+9bj1DKfHIQlyFnfW/nWzHMrWCuA1VqPuoxEgJ0hobhNBKAl1K51SQ5kq0t3Sl+MMR75YgzeIEJcB6XfQehjf+4uitQluWfGfYcn/ioVk37yt2rPF6qjvT0y45cwTB+xEIHRYC2JhtKP4GwrxBKjsS0Kf/mLPnoPv/4q6OJY1ApwSGx0GnePTeC0SPTXa+8Lm5Txnk58mhYA9NH7VtR6xf753wAAAP//ZuIjbd9LAAA= - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line39.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line39.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index 5f350ee6c13..1eba808e361 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line39.sh b/pkg/agent/testdata/MarinerV2+Kata/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line39.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/MarinerV2+Kata/line75.sh b/pkg/agent/testdata/MarinerV2+Kata/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line75.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index 5f350ee6c13..1eba808e361 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index 5f350ee6c13..1eba808e361 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index 5f350ee6c13..1eba808e361 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index 5f350ee6c13..1eba808e361 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -36,7 +36,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -72,7 +72,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line39.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 4e74eb97c39..598996a5031 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntu/line40.sh b/pkg/agent/testdata/RawUbuntu/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/RawUbuntu/line40.sh +++ b/pkg/agent/testdata/RawUbuntu/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/RawUbuntu/line77.sh b/pkg/agent/testdata/RawUbuntu/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/RawUbuntu/line77.sh +++ b/pkg/agent/testdata/RawUbuntu/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 342c9680a57..261987c2fc1 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -37,7 +37,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_redact_cloud_config.py permissions: "0744" @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA= + H4sIAAAAAAAA/8STUW/TMBSF3/srotA3iL0Mpm59S1ujVZR0yhokhFDkxN5mkdqV47SwKv8d2dAkLU6GYNJej49977n3837gOI7jZoIrzDiVxB07vzSj37GchnhN3bHjrkX6w2uMyXA/XYarYB6iaJZ8QtHtfBlWr/FjKal3dHYTrKbXtQMQmrpvmhJE7HguMFmIDCsmuC4FxUbBphQ8eArbxTha6DsPSm2KMYS6TZDmIgWZkBTsGCdiVwBOlTmCJzFgTww43MeTOFzFyXQ5Q2HwEVUwZ7z8rrPfxEkQTa+r0wd751KmJVdl/WyEFii4RVXZM692rdPZbaksmOCFO3a+fG3pG8Y5PV6l0f3Ls3d6Vj4YAd/z3fq0al2m5J7WpouD67fDlSXPnmBEW5LhPorDaVd+c/b3OTsZ0aWenw7zqjUATJngLOui4PmT//uGfeCf2xfMeKFwntuuE3qHy1xZXzjCgG8ZYbjBXkdXzEDQgcZT++xZXudAbC0RybTnBRv5VqZUcqpoTxONx+OCUM8A5WGZPQCFJbh//I8uD6zjrPDWTEohgWFQf2xDelMcbod7AyOaJR/iCUom8zCIPtdowpRxLBktoL3hNrl/9t0e0Qmm4HwERi1vo15Z1Evw1qpeWNQrcGZVWygfrytRdL3JsXoRdgfV4BVavh/8DAAA//+ilP/giAcAAA== - path: /opt/azure/containers/init-aks-custom-cloud.sh permissions: "0744" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh b/pkg/agent/testdata/RawUbuntuContainerd/line40.sh index 761f57e129f..2f8a921ea06 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line40.sh @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh index b7f73a8e8c1..00f8c61bc74 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh @@ -38,13 +38,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/pkg/agent/variables.go b/pkg/agent/variables.go index 4b317df94a3..71b52ae4a43 100644 --- a/pkg/agent/variables.go +++ b/pkg/agent/variables.go @@ -8,6 +8,7 @@ import ( "strconv" "strings" + "github.com/Azure/agentbaker/pkg/agent/common" "github.com/Azure/agentbaker/pkg/agent/datamodel" "github.com/blang/semver" ) @@ -142,7 +143,7 @@ func getCSECommandVariables(config *datamodel.NodeBootstrappingConfiguration) pa "sgxNode": strconv.FormatBool(datamodel.IsSgxEnabledSKU(profile.VMSize)), "configGPUDriverIfNeeded": config.ConfigGPUDriverIfNeeded, "enableGPUDevicePluginIfNeeded": config.EnableGPUDevicePluginIfNeeded, - "migNode": strconv.FormatBool(datamodel.IsMIGNode(config.GPUInstanceProfile)), + "migNode": strconv.FormatBool(common.IsMIGNode(config.GPUInstanceProfile)), "gpuInstanceProfile": config.GPUInstanceProfile, } } diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 4215ab52247..93f047ae9d7 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -3604,20 +3604,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() { } downloadContainerdWasmShims() { + declare -a wasmShimPids=() for shim_version in $CONTAINERD_WASM_VERSIONS; do binary_version="$(echo "${shim_version}" | tr . -)" - local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" local containerd_wasm_filepath="/usr/local/bin" + local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64" if [[ $(isARM64) == 1 ]]; then containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64" fi if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) - chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" - chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + if [ "$shim_version" == "v0.8.0" ]; then + retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) & + wasmShimPids+=($!) + fi + fi + done + wait ${wasmShimPids[@]} + for shim_version in $CONTAINERD_WASM_VERSIONS; do + binary_version="$(echo "${shim_version}" | tr . -)" + chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" + chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" + if [ "$shim_version" == "v0.8.0" ]; then chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" fi done @@ -5389,13 +5401,8 @@ var _linuxCloudInitArtifactsManifestJson = []byte(`{ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz", "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/schemas/manifest.cue b/schemas/manifest.cue index 97f716c6698..3161c909358 100644 --- a/schemas/manifest.cue +++ b/schemas/manifest.cue @@ -89,13 +89,8 @@ "downloadLocation": "", "downloadURL": "https://acs-mirror.azureedge.net/kubernetes/v${PATCHED_KUBE_BINARY_VERSION}/binaries/kubernetes-node-linux-${CPU_ARCH}.tar.gz" "versions": [ - "1.26.6", - "1.26.10", - "1.26.12", - "1.27.3", "1.27.7", "1.27.9", - "1.28.1", "1.28.3", "1.28.5", "1.29.0", diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json index eabebf6aeed..a423d05f192 100644 --- a/vhdbuilder/packer/components.json +++ b/vhdbuilder/packer/components.json @@ -43,12 +43,12 @@ "multiArchVersions": [ "v1.4.50", "v1.4.52", - "v1.5.17", - "v1.5.23" + "v1.5.23", + "v1.5.26" ], "prefetchOptimizations": [ { - "version": "v1.5.23", + "version": "v1.5.26", "binaries": [ "usr/local/bin/azure-cns" ] @@ -255,6 +255,7 @@ "multiArchVersions": [ "v1.26.9", "v1.28.6", + "v1.28.7", "v1.29.3", "v1.29.4" ] @@ -275,11 +276,11 @@ "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/blob-csi:*", "amd64OnlyVersions": [], "multiArchVersions": [ - "v1.21.7", - "v1.22.5", "v1.22.5-3", + "v1.22.6", "v1.23.3", - "v1.23.4" + "v1.23.4", + "v1.24.1" ] }, { diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 index 8139bd5e452..55ab858a0c6 100644 --- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 +++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 @@ -87,6 +87,7 @@ $global:imagesToPull += @( "mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.10.0", # for k8s 1.29.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.26.9", # for k8s 1.25.x, 1.26.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.6-windows-hp", # for k8s 1.27.x + "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.7-windows-hp", # for k8s 1.27.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.3-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.29.4-windows-hp", # for k8s 1.28.x "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.26.11", # for k8s 1.26.x @@ -113,7 +114,7 @@ $global:imagesToPull += @( # CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn) "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52", "mcr.microsoft.com/containernetworking/azure-cns:v1.5.23", - "mcr.microsoft.com/containernetworking/azure-cns:v1.5.24", + "mcr.microsoft.com/containernetworking/azure-cns:v1.5.26", # Dropgz (init container to CNS). Owner: pjohnst5 (Paul Johnston) "mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.13" ) @@ -154,15 +155,8 @@ $global:map = @{ # 2. Keep 1.18.10, 1.18.14, 1.18.17, 1.18.18 # 3. Keep v1.18.17-hotfix.20210322 when adding v1.18.17-hotfix.20210505 "c:\akse-cache\win-k8s\" = @( - "https://acs-mirror.azureedge.net/kubernetes/v1.26.3-hotfix.20231102/windowszip/v1.26.3-hotfix.20231102-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.26.6-hotfix.20231102/windowszip/v1.26.6-hotfix.20231102-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.26.10-hotfix.20231103/windowszip/v1.26.10-hotfix.20231103-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.26.12/windowszip/v1.26.12-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.27.1-hotfix.20231102/windowszip/v1.27.1-hotfix.20231102-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.27.3-hotfix.20231102/windowszip/v1.27.3-hotfix.20231102-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.27.7-hotfix.20231103/windowszip/v1.27.7-hotfix.20231103-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.27.9/windowszip/v1.27.9-1int.zip", - "https://acs-mirror.azureedge.net/kubernetes/v1.28.0-hotfix.20231102/windowszip/v1.28.0-hotfix.20231102-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.28.3-hotfix.20231103/windowszip/v1.28.3-hotfix.20231103-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.28.5/windowszip/v1.28.5-1int.zip", "https://acs-mirror.azureedge.net/kubernetes/v1.29.0/windowszip/v1.29.0-1int.zip", diff --git a/vhdbuilder/packer/kube-proxy-images.json b/vhdbuilder/packer/kube-proxy-images.json index bbf540dce24..29e4e5ce295 100644 --- a/vhdbuilder/packer/kube-proxy-images.json +++ b/vhdbuilder/packer/kube-proxy-images.json @@ -6,16 +6,9 @@ "downloadURL": "mcr.microsoft.com/oss/kubernetes/kube-proxy:v*", "amd64OnlyVersions": [], "multiArchVersions": [ - "1.26.10-hotfix.20231103-5", - "1.26.10-hotfix.20231103-8", - "1.26.12", - "1.27.3-hotfix.20231102", - "1.27.3-hotfix.20240125", "1.27.7-hotfix.20240125", "1.27.7-hotfix.20240125-1", "1.27.9-hotfix.20240131", - "1.28.0-hotfix.20240125", - "1.28.1", "1.28.3-hotfix.20240125", "1.28.3-hotfix.20240125-1", "1.28.5-hotfix.20240131",