Skip to content
GitLab
Unverified Commit cda6d6f5 authored by Jacob Payne's avatar Jacob Payne Committed by GitHub
Browse files

updated kontainer engine (#29586)

parent f210f54b
Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 59 deletions
+118 -59
go.mod
+ 1
- 1
View file @ cda6d6f5
......@@ -78,7 +78,7 @@ require (
github.com/prometheus/common v0.9.1
github.com/prometheus/tsdb v0.8.0 // indirect
github.com/rancher/dynamiclistener v0.2.1-0.20200418023342-52ede5ec9234
github.com/rancher/kontainer-engine v0.0.4-dev.0.20200805195909-3e842ecc0384
github.com/rancher/kontainer-engine v0.0.4-dev.0.20201015171854-580147bc78de
github.com/rancher/machine v0.15.0-rancher25
github.com/rancher/norman v0.0.0-20200806175025-f974dbfb2734
github.com/rancher/rdns-server v0.0.0-20180802070304-bf662911db6a
......
go.sum
+ 2
- 0
View file @ cda6d6f5
......@@ -845,6 +845,8 @@ github.com/rancher/dynamiclistener v0.2.1-0.20200418023342-52ede5ec9234 h1:wZ1Zh
github.com/rancher/dynamiclistener v0.2.1-0.20200418023342-52ede5ec9234/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU=
github.com/rancher/kontainer-engine v0.0.4-dev.0.20200805195909-3e842ecc0384 h1:84KSQEqcY2yaFn6ANcvY+VEDUQazRG94DGd9O+d1tlw=
github.com/rancher/kontainer-engine v0.0.4-dev.0.20200805195909-3e842ecc0384/go.mod h1:CofnuNGQefXjvq95fwXNVFJzOdrVW3ZUtQZC9ezQzHQ=
github.com/rancher/kontainer-engine v0.0.4-dev.0.20201015171854-580147bc78de h1:7ky9jVXSTSYiau1sc/P1Osxj1jMuMfp9nBp3QTJ4ouE=
github.com/rancher/kontainer-engine v0.0.4-dev.0.20201015171854-580147bc78de/go.mod h1:CofnuNGQefXjvq95fwXNVFJzOdrVW3ZUtQZC9ezQzHQ=
github.com/rancher/machine v0.15.0-rancher25 h1:i78iohBm9QLmxHOMM1ZssYwSNIObPdDUQjZ9h1mo8Jc=
github.com/rancher/machine v0.15.0-rancher25/go.mod h1:Q7gKLOkNb8z8A/fYUhHFJ/ChJfpF8JVFxHPKZgEgpPA=
github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 h1:Xsxh7fX3+2wAUJtPy8g2lZh0cYuyifqhBL0vxCIYojs=
......
vendor/github.com/rancher/kontainer-engine/drivers/eks/eks_driver.go
+ 114
- 57
View file @ cda6d6f5
......@@ -41,68 +41,125 @@ const (
)
var amiForRegionAndVersion = map[string]map[string]string{
"1.18": {
"af-south-1": "ami-0dcfa2d757494da7c",
"eu-north-1": "ami-0a674c329567c6456",
"ap-south-1": "ami-0b53169adb5906e18",
"eu-west-3": "ami-02444825d174fbd7b",
"eu-west-2": "ami-062c2b6eee26e5603",
"eu-south-1": "ami-0d236a46607b78f5e",
"eu-west-1": "ami-0ca9e57915fd7e017",
"ap-northeast-2": "ami-09b14b49f6e5be4a1",
"me-south-1": "ami-058f6a482ed37d011",
"ap-northeast-1": "ami-0e9f5606a6d10ffb1",
"sa-east-1": "ami-0bfae48e8718fde5f",
"ca-central-1": "ami-0becc01e0dd0dd238",
"ap-east-1": "ami-0824aac4c54c763d3",
"ap-southeast-1": "ami-0042bc79e92fb3c8a",
"ap-southeast-2": "ami-0dadf836fc8220165",
"eu-central-1": "ami-045e4ecd708ac12ba",
"us-east-1": "ami-0fae38e27c6113140",
"us-east-2": "ami-0dc6bc43da1b962d8",
"us-west-1": "ami-002e04ca6d86d255e",
"us-west-2": "ami-04f0f3d381d07e0b6",
"cn-north-1": "ami-05f4602d53296019a",
"cn-northwest-1": "ami-0fd4593eac92f686f",
},
"1.17": {
"us-east-2": "ami-044cba456c7d6a2fe",
"us-east-1": "ami-04125ecea1c9b3b27",
"us-west-2": "ami-037843f6aeb12e236",
"ap-east-1": "ami-092dc7701bd03af3e",
"ap-south-1": "ami-0e51866c4b1e01c77",
"ap-northeast-1": "ami-095dcd341e28f2599",
"ap-northeast-2": "ami-06a3ded9b6c463c6f",
"ap-southeast-1": "ami-0365ad3c8cfd3cb4c",
"ap-southeast-2": "ami-0e55c01aa1b1cf3cd",
"ca-central-1": "ami-00a3415fa128f17c5",
"eu-central-1": "ami-0c28233a2bd46bd3e",
"eu-west-1": "ami-0cb5f54d0d7b2ed21",
"eu-west-2": "ami-05f8e36acad8edc61",
"eu-west-3": "ami-0d6f4cc928f18710e",
"eu-north-1": "ami-043dbb11ff9b5a350",
"me-south-1": "ami-0209971c7465bb090",
"sa-east-1": "ami-0ff3ff7ab99c06946",
"cn-north-1": "ami-0bd0f836c99725df4",
"cn-northwest-1": "ami-09be27ee84f66b04f",
"af-south-1": "ami-00e923e1e72dd6127",
"eu-north-1": "ami-067bfa3d76de7a6b7",
"ap-south-1": "ami-0cd8562db082e8c1a",
"eu-west-3": "ami-0c1f4efd77302f897",
"eu-west-2": "ami-08c210420094a901b",
"eu-south-1": "ami-03c6f34023cdadbfe",
"eu-west-1": "ami-0c504dda1302b182f",
"ap-northeast-2": "ami-025592e84db381916",
"me-south-1": "ami-01b2fefee93216e1a",
"ap-northeast-1": "ami-0aa15614ef924fd1e",
"sa-east-1": "ami-040a741cd6e254cad",
"ca-central-1": "ami-032321703c4a51e39",
"ap-east-1": "ami-068cd0572b507ae91",
"ap-southeast-1": "ami-084ea7596600d9844",
"ap-southeast-2": "ami-056a5f106add4d37a",
"eu-central-1": "ami-06cfd5b2a2d58e09a",
"us-east-1": "ami-07250434f8a7bc5f1",
"us-east-2": "ami-0135903686f192ffe",
"us-west-1": "ami-05bfd72ad17ebedb8",
"us-west-2": "ami-0c62450bce8f4f57f",
"cn-north-1": "ami-05f4602d53296019a",
"cn-northwest-1": "ami-0fd4593eac92f686f",
},
"1.16": {
"us-east-2": "ami-04cab20cf4ae39867",
"us-east-1": "ami-0c8a11610abe0a666",
"us-west-2": "ami-0841f061f8e44c4aa",
"ap-east-1": "ami-005b3839f2d9dbb28",
"ap-south-1": "ami-017cd1c6bec820e9d",
"ap-northeast-2": "ami-07a4a6b54bac7e1e5",
"ap-southeast-1": "ami-055656b3b805b5875",
"ap-southeast-2": "ami-04619364961f7cb8c",
"ap-northeast-1": "ami-05db606f27c208dff",
"ca-central-1": "ami-06f9642a643dc1ef7",
"eu-central-1": "ami-0a2a6ee03ded5168d",
"eu-west-1": "ami-03156acdb42eb5a2b",
"eu-west-2": "ami-03bf20b3bb5d00e90",
"eu-west-3": "ami-098270d0b239917a7",
"eu-north-1": "ami-0e342b3155c477ea2",
"me-south-1": "ami-04a12d5f3b7983b34",
"sa-east-1": "ami-094d875bc33820805",
"cn-north-1": "ami-06ab9635ff6edebf6",
"cn-northwest-1": "ami-095af05476e5b9cf8",
"af-south-1": "ami-004caadd8fd18aee6",
"eu-north-1": "ami-0b483af7cd3079758",
"ap-south-1": "ami-0c37aec140141b5fa",
"eu-west-3": "ami-0d1badbc7843bf2eb",
"eu-west-2": "ami-0afeda8fcb3e79571",
"eu-south-1": "ami-0cfe17838ad3a6710",
"eu-west-1": "ami-0313d49570831d7f4",
"ap-northeast-2": "ami-024c291fb23ec5253",
"me-south-1": "ami-06c259406da782e50",
"ap-northeast-1": "ami-0e75cf37211a7b9c1",
"sa-east-1": "ami-073549ba2423737e4",
"ca-central-1": "ami-0215927206ce98fed",
"ap-east-1": "ami-0bf06ed6ab00bdc8b",
"ap-southeast-1": "ami-071bba9de77f5666a",
"ap-southeast-2": "ami-02fdbc9449e2edac5",
"eu-central-1": "ami-0951ecbcce367c97b",
"us-east-1": "ami-0b0dffffb5ba92f97",
"us-east-2": "ami-0f8d6052f6e3a19d2",
"us-west-1": "ami-009a9a6ad7a1670c6",
"us-west-2": "ami-04445f1c3b2132901",
"cn-north-1": "ami-0d8224847193197f7",
"cn-northwest-1": "ami-0664d08e603e6e72e",
},
"1.15": {
"us-east-2": "ami-03c1ef6e2dcef9091",
"us-east-1": "ami-055e79c5dcb596625",
"us-west-2": "ami-0b4f1df0761911a2a",
"ap-east-1": "ami-06c4a53520070412d",
"ap-south-1": "ami-0fd5657d22dd97c7a",
"ap-northeast-1": "ami-0e263d94d831d6e3f",
"ap-northeast-2": "ami-0696aab7814e872d5",
"ap-southeast-1": "ami-07ec30950a8cf5f5e",
"ap-southeast-2": "ami-0163006b79677185b",
"ca-central-1": "ami-032072399f84866fa",
"eu-central-1": "ami-05acf7139b3fa4195",
"eu-west-1": "ami-0b4cbc24e98bbe268",
"eu-west-2": "ami-051e5ec4ed42120bf",
"eu-west-3": "ami-0fced5d71992f332d",
"eu-north-1": "ami-0cc9a5fbe0fb4846f",
"me-south-1": "ami-0b55422936e1febca",
"sa-east-1": "ami-0c882223525ac33e9",
"cn-north-1": "ami-054beb3a95a57dfb5",
"cn-northwest-1": "ami-06dc79ea6f9e0235e",
"af-south-1": "ami-04072d5b282afb06b",
"eu-north-1": "ami-0b88d4ed6217a3018",
"ap-south-1": "ami-0d93857f3c351a307",
"eu-west-3": "ami-01c1194e8e2743a0b",
"eu-west-2": "ami-0af730da10ac8b0b7",
"eu-south-1": "ami-0e1ac6e3bac59db7a",
"eu-west-1": "ami-0e454bb2832574b25",
"ap-northeast-2": "ami-03de2b93e19fc1e32",
"me-south-1": "ami-07ba1047a42f3ff55",
"ap-northeast-1": "ami-0fad58b4886213487",
"sa-east-1": "ami-0fae027dad99aaefa",
"ca-central-1": "ami-04957e41a52bfc38f",
"ap-east-1": "ami-05581693aaba1f770",
"ap-southeast-1": "ami-0aaecfe8a45d922dd",
"ap-southeast-2": "ami-086f3dbe335a7bc71",
"eu-central-1": "ami-010266493fc743a3d",
"us-east-1": "ami-0ef76ba092ce4e253",
"us-east-2": "ami-0eda59dcbd424485d",
"us-west-1": "ami-0a8d9b717b89fdd17",
"us-west-2": "ami-0d552892d1327b499",
"cn-north-1": "ami-08a0b75e41967d789",
"cn-northwest-1": "ami-02112f277d6eb2c4c",
},
"1.14": {
"af-south-1": "ami-016b65c518c4d3419",
"eu-north-1": "ami-059855484758944d6",
"ap-south-1": "ami-0c16646c85f24652d",
"eu-west-3": "ami-0cac45c390722111a",
"eu-west-2": "ami-02832b3dffa1f8432",
"eu-south-1": "ami-08f6162a9cfbb1e0c",
"eu-west-1": "ami-0f5a80cfb11fbda5b",
"ap-northeast-2": "ami-08449bd0854b50a4a",
"me-south-1": "ami-0adacffc1cb1840cd",
"ap-northeast-1": "ami-0c04b46d5b7c69191",
"sa-east-1": "ami-038f4c5db2d62203f",
"ca-central-1": "ami-048c87a0c93e3bd79",
"ap-east-1": "ami-03e902f04ba30efb5",
"ap-southeast-1": "ami-0cb794a6e40561558",
"ap-southeast-2": "ami-087315adc4086bcef",
"eu-central-1": "ami-0e941b21b7ccd9fff",
"us-east-1": "ami-0fc7c80d4d288ab2c",
"us-east-2": "ami-08984d8491de17ca0",
"us-west-1": "ami-0e796ccc93168da3a",
"us-west-2": "ami-0f8fb024d10446ce1",
"cn-north-1": "ami-0e4cb8067782b693a",
"cn-northwest-1": "ami-047594a1f70bab3e2",
},
}
......
vendor/modules.txt
+ 1
- 1
View file @ cda6d6f5
......@@ -364,7 +364,7 @@ github.com/rancher/dynamiclistener/server
github.com/rancher/dynamiclistener/storage/file
github.com/rancher/dynamiclistener/storage/kubernetes
github.com/rancher/dynamiclistener/storage/memory
# github.com/rancher/kontainer-engine v0.0.4-dev.0.20200805195909-3e842ecc0384
# github.com/rancher/kontainer-engine v0.0.4-dev.0.20201015171854-580147bc78de
github.com/rancher/kontainer-engine/cluster
github.com/rancher/kontainer-engine/drivers/aks
github.com/rancher/kontainer-engine/drivers/eks
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全