From 012fdd4e9d634c6f2fd45470a072d956afdcbbc2 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Wed, 6 May 2020 20:12:33 +1000 Subject: [PATCH] Deprecate 1.13 --- docs/proposal-005-upgrades.md | 4 +- pkg/addons/default/assets.go | 23 - pkg/addons/default/assets/coredns-1.13.json | 336 -------- pkg/addons/default/coredns_test.go | 12 +- pkg/addons/default/testdata/sample-1.13.json | 778 ------------------- pkg/apis/eksctl.io/v1alpha5/types.go | 2 +- pkg/eks/eks.go | 4 - userdocs/src/introduction.md | 2 +- 8 files changed, 10 insertions(+), 1151 deletions(-) delete mode 100644 pkg/addons/default/assets/coredns-1.13.json delete mode 100644 pkg/addons/default/testdata/sample-1.13.json diff --git a/docs/proposal-005-upgrades.md b/docs/proposal-005-upgrades.md index e277313539..de3dd5e599 100644 --- a/docs/proposal-005-upgrades.md +++ b/docs/proposal-005-upgrades.md @@ -95,8 +95,8 @@ It should be possible to provide simple command under utils for each of these. At the time of writing of this proposal version downgrades were not supported by EKS. It's trusted that upgrades will work as expected with EKS SLA. -More specifically, an `eks.UpdateClusterVersion` call for cluster running 1.13+ trying -to go back to 1.10, 1.11 or 1.12 results in the following error: +More specifically, an `eks.UpdateClusterVersion` call for cluster running 1.14+ trying +to go back to 1.10, 1.11, 1.12 or 1.13 results in the following error: ``` An error occurred (InvalidParameterException) when calling the UpdateClusterVersion operation: unsupported Kubernetes version update from the current version, 1.12 to 1.10 ``` diff --git a/pkg/addons/default/assets.go b/pkg/addons/default/assets.go index fcaf861cbe..695ee3f9c0 100644 --- a/pkg/addons/default/assets.go +++ b/pkg/addons/default/assets.go @@ -1,7 +1,6 @@ // Code generated by go-bindata. DO NOT EDIT. // sources: // assets/aws-node.yaml (4.472kB) -// assets/coredns-1.13.json (9.543kB) // assets/coredns-1.14.json (9.919kB) // assets/coredns-1.15.json (10.18kB) // assets/coredns-1.16.json (10.18kB) @@ -93,26 +92,6 @@ func awsNodeYaml() (*asset, error) { return a, nil } -var _coredns113Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x4b\x73\xdb\x38\x12\xbe\xfb\x57\xb0\x58\x95\x5b\x24\x5b\xf1\x23\x1e\xdf\x3c\xb6\x37\xe3\xda\xd8\xab\xb2\x9d\xb9\x6c\xa6\xa6\x20\xb0\x25\x62\x0d\xa2\xb1\x00\x28\x5b\x93\xf2\x7f\xdf\x02\xf8\x26\x01\x5a\xf2\x26\x5b\x39\x2c\x0f\x09\x0d\xf4\x8b\xdd\x5f\x37\x1a\x80\xbe\xed\x45\x51\x4c\x24\xfb\x1d\x94\x66\x28\xe2\xb3\x28\x5e\xcf\xe2\xf7\x76\x94\x19\xc8\x74\x7c\x16\xfd\x73\x2f\x8a\xa2\xe8\x9b\xfb\x37\x44\xec\x66\x1e\x99\x48\xec\xd8\x3d\xa8\x35\xa3\xd0\x4c\x64\x60\x48\x42\x0c\x89\xcf\x6a\x31\x56\x90\x10\x68\x88\x61\x28\x74\x67\x22\x8a\x62\xa9\x30\x03\x93\x42\xae\xa7\x0c\xf7\x25\x2a\x63\xe5\xfe\x32\x3b\x3e\xac\x85\x7a\xe8\x34\x55\x44\x82\xa5\x34\x2a\x87\xb8\x26\x7c\x69\x78\x62\x4e\x16\xc0\x07\xfa\xe0\x51\x4f\x49\x46\xfe\x42\x41\x9e\xf4\x94\x62\xb6\x4f\x31\x93\x28\x40\x38\xc5\x8f\xf9\x02\x26\x89\xd0\x5d\xe5\x8f\xa7\x7a\x42\xa4\x1c\x21\xc8\x17\xa0\x04\x18\x70\xd6\x51\x9e\x6b\x03\x6a\xa2\x4b\xef\x54\x66\x8e\xb0\x08\x92\x39\xba\x0b\x54\x70\x79\x7b\xef\xff\xa2\x8a\xc8\x63\x83\x9b\xd3\x92\xd0\x86\x40\x6f\xb4\x81\xac\x92\x54\xcb\x89\xb5\x04\xda\x0d\x8f\xf5\x7a\x13\xfe\xe2\x69\x3b\xad\xa5\xba\xff\xe5\x25\x77\x7c\x16\x1d\x1f\xf6\xc7\x15\x1a\xa4\xc8\x2d\xdb\x97\xcb\x79\x9f\xcd\x10\xb5\x02\x33\xaf\x98\x5b\x93\x2f\xef\xb7\xb2\x63\x62\xa8\x7c\x8b\x2d\x0f\x17\xbb\xd8\x52\xbf\xff\xd1\x72\xb6\x06\x0e\xd4\xa0\xea\x83\xcb\x87\x13\x6f\x24\x35\x68\x9b\x56\xe7\xcb\x25\x13\xcc\x6c\x2c\xc3\x2d\x8a\x36\x42\x62\xb3\x29\x00\x7e\x51\x80\xe9\x7a\x5e\x47\x72\xaf\x25\x6d\xf7\x5c\x3d\xa7\x14\x73\x61\x76\x4c\xd9\xff\x3a\xb1\x28\x2a\xd8\x2a\xaf\x46\x91\x3f\x94\xf2\x3a\xf0\x77\x74\xd7\xd0\x15\x36\x27\x97\x8c\x3b\x05\xd3\xb3\xe3\xc3\xe8\xdb\x57\x61\x27\x40\x29\x54\xba\x78\x4f\x81\x70\x93\x16\xef\x4d\x66\x47\x65\x25\x98\x72\xa4\x84\x47\x4c\x4c\x48\x92\xa8\x29\x51\x92\x44\x4c\x9e\x14\x2f\xa5\xb4\x28\x92\x98\xe8\x88\x09\x0d\x34\x57\x50\x0d\xe6\x52\x1b\x05\x24\xab\xfe\x5e\x12\xce\x4d\xaa\x30\x5f\xa5\x7e\x79\x05\xe1\x4b\xf1\x5f\x53\x35\xa3\x33\x5b\x53\xeb\xd1\xe7\x4d\x34\x8d\xf6\xc1\xd0\x7d\x05\x1a\xf9\x7a\x4a\x51\x2c\x8b\x59\x4a\x68\x0a\xd1\xe1\x41\xf1\x17\x47\x94\xc5\x9b\x02\x8e\x24\xa9\x46\x49\xb2\x20\x9c\x08\x0a\x5f\xc5\xcb\x57\x31\xac\x32\x15\xea\x2e\x50\x2c\xd9\xea\x86\xc8\xff\x03\xae\x05\x38\x22\xa5\xde\xf7\x25\xe9\x25\x48\x8e\x9b\x0c\x7e\xe2\x04\xfd\x5e\xab\xd8\x5b\x5c\x3b\xb6\x88\x29\x5c\x29\xd0\xfa\x12\x48\xc2\x99\x80\x7b\xa0\x28\x12\xeb\x85\x0f\xb3\xa3\x8f\x47\xa7\x87\x27\x47\x1f\x5b\xaa\x14\x48\xce\x28\x71\xf3\x9d\xe1\x35\xb3\x41\xfa\x8d\x69\x83\x6a\xf3\x99\x65\xcc\x84\x44\x84\x56\x81\x8c\x18\x9a\x7e\xf6\xc5\xe0\x6d\x51\x78\x0d\xb7\xed\x55\xaa\xb3\xc8\x18\x45\x0c\xac\x36\x7d\xfb\x14\x72\xce\xc4\xea\x8b\x4c\x88\x81\xa1\x85\x19\x79\xbe\xcf\xd5\xca\xce\xcc\xde\x0f\xa6\xbe\x08\xb2\x26\x8c\x93\x85\xab\x87\xb3\xd0\xb2\x5d\x2f\x5f\x77\x1d\x65\x5e\x3b\x0d\x64\x92\x0f\x4d\xf1\xe3\xde\xcd\x50\x05\x0e\xf9\x0f\x2c\x03\x6d\x48\x66\x1d\x23\x72\xce\x7b\xe6\x7a\xf3\xe0\xed\x51\x78\x3d\x0e\xed\x48\xf4\x1d\x32\x40\xac\x1b\x25\x4d\x07\x30\x30\x52\x60\x02\xe7\xe1\x79\x87\xd6\x7f\xe7\x4c\x41\x72\x99\x2b\x26\x56\xf7\x34\x85\x24\xb7\xde\xbe\x5e\x09\xac\x87\xaf\x9e\x81\xe6\xa6\x28\x3c\x43\x19\xa5\x9e\xfb\x12\xcb\x0f\xa0\xb2\x7e\x2b\xd8\x3c\x3e\xf6\xa8\x86\xfc\xd5\xb3\x54\x45\x5f\x13\x96\x30\x26\xc5\x49\x7a\x04\xd7\x0d\x2d\xc0\x90\x69\xb7\xb8\xe0\x30\x1e\x1d\x4e\x94\xa0\x48\x91\x8e\xf1\xb5\x18\xa7\x5d\x13\x9e\xc3\xb8\x95\x8e\x8e\x33\x91\x3f\xc7\x23\x34\x7f\x04\xe7\x5e\xc2\x06\xbc\xd1\x01\x44\xd1\xf4\x7f\xef\x02\x92\x25\x27\x47\x6f\x74\x41\x60\xc6\xcf\xe1\xa3\x1e\x52\xf6\xa9\x06\x6e\x8e\x25\x26\xe7\xc2\xb0\xf1\xcc\x91\x0a\x96\xa0\x76\x49\x1d\x9f\x9b\xfc\x81\x74\x16\x94\xda\x6d\x3e\x05\xf2\x2e\xaa\x4b\xd4\xbd\x7f\x21\xe9\x91\xee\x94\x63\xe3\x20\x6b\x60\x56\x15\xb4\x31\xa8\xec\x06\xac\xed\xa1\x15\x85\x8a\x68\xff\x09\x23\x2c\x8c\xb1\x30\x57\x30\x31\x63\x83\x12\x39\xae\x36\x7f\x2f\x7d\xd3\xc9\xbe\x14\xb5\x71\xad\x8b\x1f\xbc\x7e\xa1\xf1\x13\xb0\x55\x6a\xd7\x94\xd9\xc1\x81\x87\x62\x68\x7d\xdf\xea\x2e\x45\x4f\x4d\x4c\x51\x18\xc2\x04\x28\x9f\xb7\x3d\xb0\x27\x6a\x15\x8a\x4b\x3c\xb1\x5b\x00\x6f\x68\x63\xb7\x51\x28\x17\xc5\xfd\x7a\x3b\x34\xb4\x7d\xc8\x1c\xb3\x8c\xb8\x56\x22\x7e\xa7\xa7\xc9\xa3\x9a\x02\x55\xd3\x77\x7a\xfa\x4e\xef\xc3\xa3\xae\x64\x9e\xad\x67\xd3\x0f\xd3\x13\x8f\xf2\x82\x7f\x9e\x73\x3e\x47\xce\xa8\x8b\xcb\xf5\xf2\x16\xcd\x5c\x81\x6e\x77\xc9\x2d\x16\xce\xd6\x20\x40\xeb\xb9\xc2\xc5\xb0\xbf\x29\x89\x96\x84\xf1\x5c\xc1\x43\xaa\x40\xa7\xc8\x6d\xf3\x7d\xec\xfd\xf6\xd4\x18\xf9\x09\x4c\x30\x37\x63\x49\x4c\x6a\xcd\xda\x2f\xf6\x80\x81\xe4\xa8\x8e\x26\x4e\x0f\x4e\x0f\x02\x14\x9a\xa6\x50\xb4\xc6\xbf\x3d\x3c\xcc\x7d\x38\xf3\xa2\x2c\xb6\x85\x86\x11\x7e\x09\x9c\x6c\x9a\xae\xf7\xc4\xab\x26\x96\xa0\x18\x26\x0d\xd9\xcc\x4f\xa6\x73\x4a\x41\xeb\xb6\x7b\x66\x5e\x42\xc3\x32\xc0\xdc\x34\x02\x8f\x87\x25\xdb\x13\xa3\xf0\x26\xa0\xb1\xd4\x73\x2a\x55\x3d\x81\x50\xd4\xe9\x30\xf7\x9f\x03\x0d\xd4\xfb\x55\x47\xbe\xe3\xab\x6d\xc3\xf1\x1d\x4d\xf3\x9c\x70\x79\xcd\x7b\xb8\xf8\xee\xe6\xfd\x32\x7b\xd5\xc0\x0c\x8c\x62\x74\x2b\xff\x85\x0c\xdc\xaa\x82\x28\xd0\x98\x2b\x0a\xbe\x46\x3e\x2a\xf2\x3d\x63\x26\x34\xeb\xf6\x11\x19\x2a\x57\x39\x66\x1f\x0f\x6e\xd8\xf6\x89\x65\xdb\x6b\xd0\x63\xa2\xa9\xcc\x9d\xdc\x83\x83\x2c\xe4\x87\x46\x7b\x50\xf9\x56\x19\xe3\x8e\x85\x98\xd9\x5c\xa0\x30\xf0\x1c\xaa\x47\x31\xe1\x1c\x9f\xe6\x8a\xad\x19\x87\x15\x5c\x69\x4a\x38\x29\x3b\x98\x25\xe1\x1a\xbc\x1f\x4a\x89\x24\x0b\xc6\x99\x61\x41\x2f\x5b\xd1\x49\x32\xb2\xa6\xc7\xb7\x57\x0f\x7f\xfe\x7a\x7d\x7b\xf9\xe7\xfd\xd5\xdd\xef\xd7\x17\x57\xfe\x85\xd2\x13\x61\xc7\x9d\x28\x94\x63\xd2\x09\xe7\x01\x81\x5b\x87\x53\x2a\xa4\x37\xee\xec\xd3\x1d\xb4\x2c\x49\xce\x7d\xeb\x87\x0b\x3c\x49\xfe\x21\xf8\xe6\x0e\xd1\xfc\x8d\x71\x28\x4f\x21\xce\x22\xa3\x72\xd8\x2a\x5a\x06\x54\xc6\x84\xf3\xfc\x0d\x68\x6d\xd7\xb0\x6a\x99\x48\x60\xbd\xdf\x9a\x9e\x70\x5c\xf9\xca\x9f\x47\x42\xbd\x02\x5a\x9b\x7c\x3c\x6b\xe4\x79\x06\xee\x1b\x77\xac\x9c\x99\xe5\xa9\x4d\x6c\x2d\xf7\x21\x58\x37\x05\x5c\x2c\xd9\x6a\x52\x68\x0e\x11\x57\xfe\x0c\x79\x70\xf7\x46\xa8\x07\x23\x5b\x2d\x1b\xf7\xf8\x63\x1b\x4b\xc5\xd0\x65\x10\x27\x5a\xdf\x96\xf6\x17\xa1\x9d\xd8\x3d\xf0\x84\x2a\x66\x18\x25\xbc\xcf\xa8\x40\x1b\xa2\x4c\xa3\xe0\x9c\x3f\x91\xcd\xe0\x90\x46\x17\x9b\x08\x50\x95\xec\xa4\xb0\x63\x52\x4f\x0c\x38\x86\x39\xdd\xef\xf0\x74\xf7\xd4\x3e\x7c\x44\xd4\x25\xbc\x1d\x5d\x5f\xdb\xe0\xfa\xa4\x08\x85\x79\xaf\x2b\x38\x3c\xe8\x33\x20\xb7\x3b\x80\xc0\xbe\xc3\xd3\x69\xc2\x72\x09\xd4\x14\x17\x1b\xe5\xee\xca\x0b\xd9\x72\x1f\xe2\xfc\xaf\x90\x43\x6f\xcf\x9b\x11\x6d\x40\xf5\x33\x7f\x90\x71\x1e\x03\x4a\xc1\x17\x65\x4c\xcf\x93\x04\x85\x76\x20\xf4\x58\xd1\xde\xdf\x5c\x3d\x33\x5b\xf3\x77\x82\x5f\x01\xff\x2d\x5d\x43\xeb\x23\xf1\x40\x0d\x2f\x71\x73\x83\x89\x8d\xe1\xd1\x07\x7f\x8b\xd6\xbd\xb4\xed\x3f\xc1\x1d\x67\xe5\x97\xaa\x8b\x0f\xee\x86\xaa\xbe\x36\xdc\xef\x47\xa1\x5d\xbb\xd7\xde\x7e\xcb\xb7\x63\x9f\xd8\x2e\x33\xe3\xb1\xd9\xf3\xcd\x54\x6f\xdb\x9c\xce\xab\x05\xa1\x53\x92\x9b\x14\x15\xfb\xcb\x81\x7e\xfa\x78\xea\xe0\xe8\x3b\xb2\x2f\x2f\xe8\xee\x90\xef\x7a\x0f\xfe\x53\x9c\xd9\x2f\x10\x8d\x36\x8a\x48\xc9\xc4\xaa\xfa\xfa\x49\x09\xc1\x57\x6e\x47\x8a\xe2\x79\xd6\x8b\x68\x73\x4a\xaf\x72\xde\x4b\x8a\xce\xd7\x11\xc9\x3e\x29\xcc\xe5\x10\xc5\x71\x3b\xc4\x1d\x38\x75\xda\xc1\x1e\x13\x88\x44\x22\xb3\x6b\x9f\xbf\x36\x7a\xae\xae\x93\xc1\x58\x7d\x07\xa1\xc3\x36\xac\x41\x2d\x3c\xfa\x39\xd3\x83\x45\xe7\x89\x18\x9a\x76\x24\xf9\x3c\xfa\x43\xdd\x62\x6b\xeb\xee\x1f\xb3\x02\x13\x30\x7b\xaf\x3d\xf2\x83\x32\xe9\x57\x26\x12\x8b\xc7\xdd\x12\xaa\xe3\x10\x8f\xea\xee\x71\x6a\x6e\x30\xaf\xee\x40\xbe\xf7\xef\x48\x7e\xfa\xcc\x44\x0e\x77\xb0\xec\x79\xb3\x04\xde\x68\xe4\xda\xf7\x75\x63\x25\x70\x07\x63\x74\xbe\xf8\x17\x50\x33\x52\x29\x5e\xf9\x0d\x43\xf4\xda\x91\xc2\xab\x37\x8b\x03\x58\xef\x95\x69\x52\xab\xfe\x6c\x93\x7b\xef\x65\xef\x3f\x01\x00\x00\xff\xff\xb0\xdb\x07\x8f\x47\x25\x00\x00") - -func coredns113JsonBytes() ([]byte, error) { - return bindataRead( - _coredns113Json, - "coredns-1.13.json", - ) -} - -func coredns113Json() (*asset, error) { - bytes, err := coredns113JsonBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "coredns-1.13.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x47, 0x97, 0xd5, 0x44, 0x1b, 0x9a, 0xb2, 0xc3, 0xff, 0x2b, 0xf7, 0xa1, 0xf1, 0xb0, 0x6c, 0x7c, 0x92, 0x5c, 0xe4, 0xc9, 0x7, 0x58, 0x15, 0x46, 0xdc, 0xdd, 0xed, 0x9d, 0xa8, 0xea, 0x75, 0xb2}} - return a, nil -} - var _coredns114Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x53\x1b\x39\x12\x7f\xe7\x53\x4c\x4d\x55\xde\xd6\xc6\x24\x0b\x97\xe5\x8d\x05\x2e\x4b\x5d\xe0\x5c\x40\xf6\xe5\xb2\xb5\xd5\xd6\xb4\x3d\x3a\x34\x6a\x5d\x4b\x63\xf0\xa6\xf8\xee\x57\xf3\xcf\x9e\x3f\x92\xb1\xd9\xe4\x2a\x75\xb5\x7e\x48\x8c\xd4\x6a\xfd\xd4\xfd\xeb\x56\x4b\xf2\x97\x83\x28\x8a\xc1\xc8\x5f\x91\xad\x24\x1d\x9f\x46\xf1\xf2\x28\xfe\xa1\x68\x95\x0e\x33\x1b\x9f\x46\xff\x3a\x88\xa2\x28\xfa\x52\xfe\x1b\x12\x2e\x7b\x1e\xa4\x4e\x8a\xb6\x3b\xe4\xa5\x14\xb8\xe9\xc8\xd0\x41\x02\x0e\xe2\xd3\xb5\x9a\x28\x8a\x35\x64\x58\x88\x3f\xe4\x33\x1c\x25\xda\xae\xe5\xeb\x3e\x6b\x40\x6c\x04\xec\xca\x3a\xcc\xda\x32\xa0\x35\x39\x70\x92\xb4\xed\x28\x8e\xa2\xd8\x30\x65\xe8\x52\xcc\xed\x58\xd2\xa1\x21\x76\x85\x9e\x9f\x8e\x8e\xdf\xb5\x14\x0c\xe4\xac\x60\x30\xe5\x8c\x8e\x73\x8c\xd7\x82\xcf\xad\x49\x15\xcc\x50\x0d\xe6\xc3\x07\x3b\x86\x0c\xfe\x20\x0d\x8f\x76\x2c\x28\x3b\x14\x94\x19\xd2\xa8\x5d\x60\x85\x85\xb9\xde\xdb\x11\x18\xb3\x45\x20\x9f\x21\x6b\x74\x58\xa2\x13\x2a\xb7\x0e\x79\x64\x6b\xeb\x36\x30\xb7\x0c\x69\x2c\x7c\x4e\x8c\x17\x37\x77\xad\x15\x1d\xf4\x56\x16\x5b\x83\xa2\xeb\x9e\xc2\x6a\x1b\xf7\x57\x9f\xf6\xa2\x5b\x1e\xec\x23\xaf\x47\xc7\xa7\xd1\xf1\xbb\x7e\x3b\x93\x23\x41\xaa\x18\xf6\xe9\x62\xda\x1f\xe6\x80\x17\xe8\xa6\xcd\xe0\x56\xe7\xf3\x0f\x3b\xe1\x18\x39\x61\x5e\x83\xe5\xfe\x7c\x1f\x2c\xeb\xef\xbf\xb5\xa8\x61\x51\xa1\x70\xc4\x7d\x72\xf8\xfc\xec\xe5\x96\x45\x5b\x84\xd5\xd9\x7c\x2e\xb5\x74\xab\x62\xc0\x0d\xe9\xb6\x87\x63\xb7\xaa\x08\x7a\x5e\x91\xe1\x6a\xda\x68\xaa\x20\xd5\xda\xf6\x8f\xd5\x33\x21\x28\xd7\x6e\xd7\x90\x15\xc4\xf8\xe7\x23\xf6\x4f\xc7\xd5\x10\xc6\x8b\xe6\x7e\xa5\xb9\x86\xa6\x28\x62\x6a\x2e\x55\xb9\xdc\xf1\xe9\xf1\xbb\xe8\xcb\x67\x5d\x74\x20\x33\xb1\xad\xbe\xa7\x08\xca\xa5\xd5\xf7\x4d\x64\x46\x75\x24\x8f\x15\x09\x50\x91\xd4\x23\x48\x12\x1e\x03\x1b\x88\xa4\x39\xa9\xbe\xd4\xda\xa2\xc8\x50\x62\x23\xa9\x2d\x8a\x9c\xb1\x69\xcc\x8d\x75\x8c\x90\x35\x7f\xcf\x41\x29\x97\x32\xe5\x8b\xd4\xaf\xaf\x12\x7c\xae\xfe\xdb\x64\xbd\xe8\xb4\xc8\x89\x55\xeb\x9c\xf8\x11\x38\x89\xc6\xd1\x21\x3a\x71\xc8\x68\x49\x2d\xc7\x82\xf4\xbc\xea\x17\x20\x52\x8c\xde\x4d\xaa\xbf\x14\x91\xa9\xbe\x31\x2a\x82\xa4\x69\x85\x64\x06\x0a\xb4\xc0\xcf\xfa\xf9\xb3\x8e\x07\x79\xa6\xe1\xdd\x39\xe9\xb9\x5c\x5c\x83\xf9\x8b\x72\x2d\xca\x81\x31\xf6\xd0\x17\xa6\x17\x68\x14\xad\x32\xfc\xff\x0d\xd1\x6f\xb6\x8d\x31\x2d\x18\xad\xbd\x40\x48\x94\xd4\x78\x87\x82\x74\x52\x2c\xe3\x64\x32\x69\xad\x8e\xd1\x28\x29\xa0\xe8\x78\xdb\x69\x5e\xca\xc2\x3b\xbf\x48\xeb\x88\x57\x1f\x65\x26\x8b\x75\x1d\x4d\x76\x48\xfc\x19\x38\x91\x7e\xf4\x59\xed\x75\x76\x7b\x89\x69\xed\x8d\xa9\xb3\xaf\x38\x06\x87\x8b\x55\x1f\x1f\x93\x52\x52\x2f\x3e\x99\x04\x1c\x0e\x11\x66\xf0\x74\x97\xf3\xa2\x34\xfd\xdb\xe3\x37\x7d\x28\x19\x3c\x7d\xd2\xb0\x04\xa9\x60\x56\xa6\xc1\xa3\xd0\x6e\xbd\xde\xb5\x6e\x3b\x13\x7a\xb1\x3a\xcc\x8c\x1a\xc2\xf1\x93\xbd\xec\x11\x8c\x25\x5f\xef\x65\x86\xd6\x41\x56\x18\x47\xe7\x4a\xf5\xe0\x7a\xd9\xfb\x7a\x4f\xbc\xec\x8b\xb6\x37\xfa\x06\x19\xd0\xb4\x6c\x85\xcd\xc6\x3f\x00\xa9\x29\xc1\xb3\x70\x7f\xc9\xd4\xff\xe4\x92\x31\xb9\xc8\x59\xea\xc5\x9d\x48\x31\xc9\x0b\x6b\x5f\x2d\x34\xad\x9b\x2f\x9f\x50\xe4\xae\xca\x36\x43\x1d\xf5\x3c\x77\x35\x9f\xef\x91\xb3\x7e\x05\xb8\xf9\xf8\x86\x47\x6b\xda\x5f\x3e\x19\xae\xca\x99\xb0\x86\x6d\x5a\x4a\x4d\x0f\x58\x16\x41\x33\x74\x30\xee\xa6\x04\x1a\xfa\xa3\x33\x92\x0c\x32\x54\x21\x19\x5f\xe9\xed\xb2\x4b\x50\x39\x6e\x47\x59\xca\x29\xa9\xf3\xa7\x78\x8b\xcc\x6f\xc1\xbe\xe7\x30\x80\x57\x1a\x00\x58\xa4\xff\x7b\x13\x40\x96\x9c\xfc\xf8\x4a\x13\x04\x7a\xfc\x23\x7c\xd2\x43\xc9\xbe\xd4\xc0\xcc\xb1\xa1\xe4\x4c\x3b\xb9\x3d\x72\x0c\xe3\x1c\x79\x9f\xd0\xf1\x99\xc9\xef\xc8\x12\x41\x3d\x7b\x11\x4f\x81\xb8\x8b\xd6\x29\xea\xce\xbf\x99\xf4\x44\xf7\x8a\xb1\xed\x24\xdb\xd0\xac\x49\x68\xdb\xa8\xb2\x1f\xb1\x76\xa7\x56\x14\x4a\xa2\xfd\x4f\x98\x61\x61\x8e\x85\x47\x05\x03\x33\x76\x64\x48\xd1\x62\xf5\x8f\xda\x36\x9d\xe8\x4b\xc9\xba\xb2\x2a\xf1\x93\xd7\xaf\x34\x7e\x44\xb9\x48\xab\xea\x61\xe2\x91\x18\xa2\xef\xa3\xee\x4a\xf4\xa6\x89\x05\x69\x07\x52\x23\xfb\xac\xed\xa1\x3d\xf0\x22\xe4\x97\x78\x54\xd4\xfd\x5e\xd7\xc6\xe5\xe9\xa0\xde\x14\x0f\xd7\xa7\xa0\x21\xf6\xe1\xe0\x58\x66\x50\x95\x13\x6f\xec\x38\x79\xe0\x31\x0a\x1e\xbf\xb1\xe3\x37\xf6\x10\x1f\x6c\xa3\xf3\x74\x79\x34\x3e\x19\x9f\x78\x26\xaf\xc6\x4f\x73\xa5\xa6\xa4\xa4\x28\xfd\x72\x35\xbf\x21\x37\x65\xb4\xed\xd2\xb8\x35\x44\xc9\x25\x6a\xb4\x76\xca\x34\x1b\xd6\x38\xb5\xd0\x1c\xa4\xca\x19\xef\x53\x46\x9b\x92\x2a\x2a\xee\x63\xef\xda\x53\xe7\xcc\x07\x74\xc1\xd8\x8c\x0d\xb8\xb4\x80\x75\x58\x1d\xfd\x02\xc1\xd1\xdc\x48\xbc\x9f\xbc\x9f\x04\x24\xac\x48\xb1\xaa\x7a\x7f\xb9\xbf\x9f\xfa\x78\xe6\x65\x59\x5c\x24\x1a\x09\xea\x02\x15\xac\xda\xa5\xae\x57\xd8\x20\x4b\x4a\x36\x62\x47\x7e\x31\x9b\x0b\x81\xd6\xb6\xcd\x73\xe4\x15\x74\x32\x43\xca\xdd\x46\xe1\xf1\x30\x65\x7b\x7c\xc4\x08\x89\x7c\xd1\x49\xdf\x95\xed\x77\x5a\x57\xf8\x28\xd6\x01\x13\x0a\xc2\xc0\x32\xd7\x61\x3e\xf5\x5f\x6b\x0d\xa6\xf7\x4f\x1d\xf9\x6e\xe3\x76\xa5\xd9\x57\x84\xe6\xb9\xb0\xf3\xc2\xbb\x3f\xff\xea\xf0\x7e\x3a\x7a\x11\x60\x86\x8e\xa5\xd8\xc9\x7e\x21\x80\x3b\x65\x46\x46\x4b\x39\x0b\xf4\x1d\x50\xa2\x2a\x8f\x65\xd2\x85\x7a\xcb\xf3\x51\x46\x5c\x66\xc4\xa3\xbf\x4d\xae\xe5\xee\x09\xa3\x38\x36\xa0\xdd\xa6\x5a\x98\xbc\xd4\x3b\x99\x64\x21\x3b\x6c\x66\x0f\x4e\xbe\x53\xc4\x94\xb7\x5c\xd2\xad\xce\x49\x3b\x7c\x0a\xc5\x7a\x0c\x4a\xd1\xe3\x94\xe5\x52\x2a\x5c\xe0\xa5\x15\xa0\xa0\xae\xcc\xe6\xa0\x2c\x7a\x17\x2a\xc0\xc0\x4c\x2a\xe9\x64\xd0\xca\x85\xea\x24\xd9\x52\xab\xc4\x37\x97\xf7\xbf\xff\x7c\x75\x73\xf1\xfb\xdd\xe5\xed\xaf\x57\xe7\x97\xfe\x02\xc0\xe3\xe1\x72\x74\xc2\x64\xb6\x69\x07\xa5\x02\x0a\xf7\x70\x27\x24\xff\xd4\x6a\x75\x4b\xe4\xfe\x2e\x15\xd6\x37\x3c\xa7\x91\xe3\x1c\x77\xf2\x81\x43\xce\xa4\x2e\xed\x79\x8d\xd6\x16\x3b\x6e\x93\x58\x13\x5c\x1e\xb6\xba\x47\x8a\x16\xbe\xa4\xe6\xd1\xb0\xde\xaf\x0b\x4c\xbe\x31\x4b\x52\x79\x86\xd7\x94\xeb\x7d\xf3\x61\x56\x8c\x59\x43\x6c\x15\x27\x21\xb2\x6e\xd2\xb2\x9e\xcb\xc5\xa8\x9a\x39\x24\xdc\xd8\x33\x64\xc1\xfd\x32\x50\x17\xab\xcb\x82\x99\xaf\xc1\x58\x88\x7c\x85\x52\xb1\x47\xc8\x22\xef\x6e\x5c\x72\x81\x73\xc8\x55\xbf\x7a\x8a\x0d\x4b\x2a\x63\x51\x81\xb5\x37\x35\x9e\x8a\x4e\x23\x4d\x09\x8e\x04\x4b\x27\x05\xa8\xfe\x40\x46\xeb\x80\xdd\x66\x82\x33\xf5\x08\xab\xc1\x55\x96\xad\x8e\x59\xc8\x8d\xee\xa4\xc2\x31\x5a\x77\x0c\x46\x0c\xb3\x43\xbf\x06\xb6\xdd\xe7\x8c\xf0\x45\x5a\x57\xf0\x66\xeb\x4e\xdd\x26\xf4\x07\x06\x81\xd3\x5e\xdd\xf4\x6e\xd2\x1f\x40\xaa\x38\x23\x05\x4e\x66\x9e\x5a\x1c\xe7\x73\x14\xae\x7a\xf1\xa9\xcf\x9f\xde\x30\xa9\x4f\x6a\xa5\xfd\x99\x14\xf6\x6e\x05\x32\xb0\x0e\xb9\xcf\x98\x01\x43\x3d\x00\x6a\xc5\xe7\xb5\x4f\xcf\x92\x84\xb4\x2d\x89\xef\x41\xd1\x3e\x01\x5e\x3e\xc9\x62\xf7\xd8\x8b\x7e\x55\xc8\xed\x6a\x9a\xcc\xb8\xd5\x85\x64\x8f\xbb\xa3\x17\x42\x65\x97\x85\x8b\xf5\x43\x44\x60\xb3\xa9\x69\x79\x4d\x49\x31\xcd\x8f\x6f\xfd\x35\x72\xf7\xb1\xbc\xff\x09\x1e\xf9\x1b\xb3\x37\xc7\xa8\xe0\x71\xb4\x29\x6e\xc3\x07\xae\x28\x74\x6d\xe2\xc5\xdb\xaf\x4d\xf7\x2c\x68\xdb\x99\x73\xbb\xeb\x0f\x7c\x3d\xfb\xbc\x89\xf0\x0c\xc4\x18\x72\x97\x12\xcb\x3f\xca\x98\x1a\x3f\xbc\x2f\xd9\xee\x7b\x28\xa9\x1f\x46\x6f\x49\xbd\xf8\xfb\x83\xef\xf1\xa9\x63\x46\xe4\xac\x63\x30\x46\xea\x45\xb3\xfa\x51\x4d\xc1\xc0\xb3\xb1\xee\xe4\xe6\xd3\x9e\x47\x37\x6f\x23\x9c\xab\x5e\xcc\x75\x56\x07\x46\x7e\x60\xca\xcd\x90\xc5\x71\xdb\xc5\x1d\x3a\x75\xea\xd6\xde\x20\xd4\x89\x21\x59\x6c\xe7\xfe\xd4\xeb\xf9\xc9\x40\x32\x68\x5b\x3f\x59\xd9\x30\x86\x25\xf2\xcc\x33\xbf\x92\x76\xb0\xa7\x3d\x82\x13\x69\x47\x93\xcf\xa2\xdf\xd4\x2c\x45\xea\xde\x7f\x31\x0b\x74\x01\xd8\x07\xed\x96\x6f\x14\x49\x3f\x4b\x9d\x14\x7c\xdc\x2f\xa0\x3a\x06\xf1\x4c\xdd\xbd\xcf\xce\x1d\xe5\xcd\x43\xd4\xd7\xfe\xfd\xcd\x77\x1f\x99\xa4\xf0\x16\xe7\x3d\x6b\xd6\xc4\xdb\xea\xb9\xf6\xd3\xed\xb6\x14\xb8\x07\x18\x9b\xcf\xfe\x8d\xc2\x6d\xc9\x14\x2f\xfc\x76\x24\x7a\xe9\xee\x23\xfc\x10\x1d\xa2\xf5\x41\x1d\x26\xeb\xa9\x3f\x16\xc1\x7d\xf0\x7c\xf0\xdf\x00\x00\x00\xff\xff\x15\x5b\xde\x84\xbf\x26\x00\x00") func coredns114JsonBytes() ([]byte, error) { @@ -265,7 +244,6 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ "aws-node.yaml": awsNodeYaml, - "coredns-1.13.json": coredns113Json, "coredns-1.14.json": coredns114Json, "coredns-1.15.json": coredns115Json, "coredns-1.16.json": coredns116Json, @@ -313,7 +291,6 @@ type bintree struct { var _bintree = &bintree{nil, map[string]*bintree{ "aws-node.yaml": &bintree{awsNodeYaml, map[string]*bintree{}}, - "coredns-1.13.json": &bintree{coredns113Json, map[string]*bintree{}}, "coredns-1.14.json": &bintree{coredns114Json, map[string]*bintree{}}, "coredns-1.15.json": &bintree{coredns115Json, map[string]*bintree{}}, "coredns-1.16.json": &bintree{coredns116Json, map[string]*bintree{}}, diff --git a/pkg/addons/default/assets/coredns-1.13.json b/pkg/addons/default/assets/coredns-1.13.json deleted file mode 100644 index 69221333f6..0000000000 --- a/pkg/addons/default/assets/coredns-1.13.json +++ /dev/null @@ -1,336 +0,0 @@ -{ - "apiVersion": "v1", - "items": [ - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "prometheus.io/port": "9153", - "prometheus.io/scrape": "true" - }, - "labels": { - "eks.amazonaws.com/component": "kube-dns", - "k8s-app": "kube-dns", - "kubernetes.io/cluster-service": "true", - "kubernetes.io/name": "CoreDNS" - }, - "name": "kube-dns", - "namespace": "kube-system" - }, - "spec": { - "ports": [ - { - "name": "dns", - "port": 53, - "protocol": "UDP", - "targetPort": 53 - }, - { - "name": "dns-tcp", - "port": 53, - "protocol": "TCP", - "targetPort": 53 - } - ], - "selector": { - "k8s-app": "kube-dns" - }, - "sessionAffinity": "None", - "type": "ClusterIP" - } - }, - { - "apiVersion": "v1", - "kind": "ServiceAccount", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - }, - "name": "coredns", - "namespace": "kube-system" - } - }, - { - "apiVersion": "v1", - "data": { - "Corefile": ".:53 {\n errors\n health\n kubernetes cluster.local in-addr.arpa ip6.arpa {\n pods insecure\n upstream\n fallthrough in-addr.arpa ip6.arpa\n }\n prometheus :9153\n proxy . /etc/resolv.conf\n cache 30\n loop\n reload\n loadbalance\n}\n" - }, - "kind": "ConfigMap", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - }, - "name": "coredns", - "namespace": "kube-system" - } - }, - { - "apiVersion": "apps/v1", - "kind": "Deployment", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/name": "CoreDNS" - }, - "name": "coredns", - "namespace": "kube-system" - }, - "spec": { - "progressDeadlineSeconds": 2147483647, - "replicas": 2, - "revisionHistoryLimit": 2147483647, - "selector": { - "matchLabels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - } - }, - "strategy": { - "rollingUpdate": { - "maxSurge": 1, - "maxUnavailable": 1 - }, - "type": "RollingUpdate" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - } - }, - "spec": { - "affinity": { - "nodeAffinity": { - "requiredDuringSchedulingIgnoredDuringExecution": { - "nodeSelectorTerms": [ - { - "matchExpressions": [ - { - "key": "beta.kubernetes.io/os", - "operator": "In", - "values": [ - "linux" - ] - }, - { - "key": "beta.kubernetes.io/arch", - "operator": "In", - "values": [ - "amd64" - ] - } - ] - } - ] - } - }, - "podAntiAffinity": { - "preferredDuringSchedulingIgnoredDuringExecution": [ - { - "podAffinityTerm": { - "labelSelector": { - "matchExpressions": [ - { - "key": "k8s-app", - "operator": "In", - "values": [ - "kube-dns" - ] - } - ] - }, - "topologyKey": "kubernetes.io/hostname" - }, - "weight": 100 - } - ] - } - }, - "containers": [ - { - "args": [ - "-conf", - "/etc/coredns/Corefile" - ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.2.6", - "imagePullPolicy": "IfNotPresent", - "livenessProbe": { - "failureThreshold": 5, - "httpGet": { - "path": "/health", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 60, - "periodSeconds": 10, - "successThreshold": 1, - "timeoutSeconds": 5 - }, - "name": "coredns", - "ports": [ - { - "containerPort": 53, - "name": "dns", - "protocol": "UDP" - }, - { - "containerPort": 53, - "name": "dns-tcp", - "protocol": "TCP" - }, - { - "containerPort": 9153, - "name": "metrics", - "protocol": "TCP" - } - ], - "resources": { - "limits": { - "memory": "170Mi" - }, - "requests": { - "cpu": "100m", - "memory": "70Mi" - } - }, - "securityContext": { - "allowPrivilegeEscalation": false, - "capabilities": { - "add": [ - "NET_BIND_SERVICE" - ], - "drop": [ - "all" - ] - }, - "procMount": "Default", - "readOnlyRootFilesystem": true - }, - "terminationMessagePath": "/dev/termination-log", - "terminationMessagePolicy": "File", - "volumeMounts": [ - { - "mountPath": "/etc/coredns", - "name": "config-volume", - "readOnly": true - } - ] - } - ], - "dnsPolicy": "Default", - "priorityClassName": "system-node-critical", - "restartPolicy": "Always", - "schedulerName": "default-scheduler", - "securityContext": {}, - "serviceAccount": "coredns", - "serviceAccountName": "coredns", - "terminationGracePeriodSeconds": 30, - "tolerations": [ - { - "effect": "NoSchedule", - "key": "node-role.kubernetes.io/master" - }, - { - "key": "CriticalAddonsOnly", - "operator": "Exists" - } - ], - "volumes": [ - { - "configMap": { - "defaultMode": 420, - "items": [ - { - "key": "Corefile", - "path": "Corefile" - } - ], - "name": "coredns" - }, - "name": "config-volume" - } - ] - } - } - } - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRole", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/bootstrapping": "rbac-defaults" - }, - "name": "system:coredns" - }, - "rules": [ - { - "apiGroups": [ - "" - ], - "resources": [ - "endpoints", - "services", - "pods", - "namespaces" - ], - "verbs": [ - "list", - "watch" - ] - }, - { - "apiGroups": [ - "" - ], - "resources": [ - "nodes" - ], - "verbs": [ - "get" - ] - } - ] - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRoleBinding", - "metadata": { - "annotations": { - "rbac.authorization.kubernetes.io/autoupdate": "true" - }, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/bootstrapping": "rbac-defaults" - }, - "name": "system:coredns" - }, - "roleRef": { - "apiGroup": "rbac.authorization.k8s.io", - "kind": "ClusterRole", - "name": "system:coredns" - }, - "subjects": [ - { - "kind": "ServiceAccount", - "name": "coredns", - "namespace": "kube-system" - } - ] - } - ], - "kind": "List" -} diff --git a/pkg/addons/default/coredns_test.go b/pkg/addons/default/coredns_test.go index 57516eb8f9..8ac4ce7901 100644 --- a/pkg/addons/default/coredns_test.go +++ b/pkg/addons/default/coredns_test.go @@ -73,18 +73,18 @@ var _ = Describe("default addons - coredns", func() { }) } - loadSampleAndCheck("1.13", "1.2.6") + loadSampleAndCheck("1.14", "1.6.0") - Context("[1.13 –> 1.14] can update coredns", func() { + Context("[1.14 –> 1.15] can update coredns", func() { - loadSample("1.13", 10) + loadSample("1.14", 10) - It("can load 1.13 sample", func() { - checkCoreDNSImage(rawClient, "eu-west-1", "v1.2.6", true) + It("can load 1.14 sample", func() { + checkCoreDNSImage(rawClient, "eu-west-1", "v1.6.0", true) }) It("can update to correct version", func() { - _, err := UpdateCoreDNS(rawClient, "eu-west-2", "1.14.x", false) + _, err := UpdateCoreDNS(rawClient, "eu-west-2", "1.15.x", false) Expect(err).ToNot(HaveOccurred()) checkCoreDNSImage(rawClient, "eu-west-2", "v1.6.6", false) diff --git a/pkg/addons/default/testdata/sample-1.13.json b/pkg/addons/default/testdata/sample-1.13.json deleted file mode 100644 index 93bd71314e..0000000000 --- a/pkg/addons/default/testdata/sample-1.13.json +++ /dev/null @@ -1,778 +0,0 @@ -{ - "apiVersion": "v1", - "items": [ - { - "apiVersion": "apps/v1", - "kind": "DaemonSet", - "metadata": { - "annotations": { - "deprecated.daemonset.template.generation": "1" - }, - "labels": { - "eks.amazonaws.com/component": "kube-proxy", - "k8s-app": "kube-proxy" - }, - "name": "kube-proxy", - "namespace": "kube-system" - }, - "spec": { - "revisionHistoryLimit": 10, - "selector": { - "matchLabels": { - "k8s-app": "kube-proxy" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "k8s-app": "kube-proxy" - } - }, - "spec": { - "affinity": { - "nodeAffinity": { - "requiredDuringSchedulingIgnoredDuringExecution": { - "nodeSelectorTerms": [ - { - "matchExpressions": [ - { - "key": "beta.kubernetes.io/os", - "operator": "In", - "values": [ - "linux" - ] - }, - { - "key": "beta.kubernetes.io/arch", - "operator": "In", - "values": [ - "amd64" - ] - } - ] - } - ] - } - } - }, - "containers": [ - { - "command": [ - "/bin/sh", - "-c", - "kube-proxy --v=2 --config=/var/lib/kube-proxy-config/config" - ], - "image": "%s.dkr.ecr.%s.%s/eks/kube-proxy:v1.13.7", - "imagePullPolicy": "IfNotPresent", - "name": "kube-proxy", - "resources": { - "requests": { - "cpu": "100m" - } - }, - "securityContext": { - "privileged": true, - "procMount": "Default" - }, - "terminationMessagePath": "/dev/termination-log", - "terminationMessagePolicy": "File", - "volumeMounts": [ - { - "mountPath": "/var/log", - "name": "varlog" - }, - { - "mountPath": "/run/xtables.lock", - "name": "xtables-lock" - }, - { - "mountPath": "/lib/modules", - "name": "lib-modules", - "readOnly": true - }, - { - "mountPath": "/var/lib/kube-proxy/", - "name": "kubeconfig" - }, - { - "mountPath": "/var/lib/kube-proxy-config/", - "name": "config" - } - ] - } - ], - "dnsPolicy": "ClusterFirst", - "hostNetwork": true, - "priorityClassName": "system-cluster-critical", - "restartPolicy": "Always", - "schedulerName": "default-scheduler", - "securityContext": {}, - "serviceAccount": "kube-proxy", - "serviceAccountName": "kube-proxy", - "terminationGracePeriodSeconds": 30, - "tolerations": [ - { - "effect": "NoExecute", - "operator": "Exists" - }, - { - "effect": "NoSchedule", - "operator": "Exists" - } - ], - "volumes": [ - { - "hostPath": { - "path": "/var/log", - "type": "" - }, - "name": "varlog" - }, - { - "hostPath": { - "path": "/run/xtables.lock", - "type": "FileOrCreate" - }, - "name": "xtables-lock" - }, - { - "hostPath": { - "path": "/lib/modules", - "type": "" - }, - "name": "lib-modules" - }, - { - "configMap": { - "defaultMode": 420, - "name": "kube-proxy" - }, - "name": "kubeconfig" - }, - { - "configMap": { - "defaultMode": 420, - "name": "kube-proxy-config" - }, - "name": "config" - } - ] - } - }, - "updateStrategy": { - "rollingUpdate": { - "maxUnavailable": "10%" - }, - "type": "RollingUpdate" - } - } - }, - { - "apiVersion": "v1", - "kind": "Service", - "metadata": { - "annotations": { - "prometheus.io/port": "9153", - "prometheus.io/scrape": "true" - }, - "labels": { - "eks.amazonaws.com/component": "kube-dns", - "k8s-app": "kube-dns", - "kubernetes.io/cluster-service": "true", - "kubernetes.io/name": "CoreDNS" - }, - "name": "kube-dns", - "namespace": "kube-system" - }, - "spec": { - "clusterIP": "10.100.0.10", - "ports": [ - { - "name": "dns", - "port": 53, - "protocol": "UDP", - "targetPort": 53 - }, - { - "name": "dns-tcp", - "port": 53, - "protocol": "TCP", - "targetPort": 53 - } - ], - "selector": { - "k8s-app": "kube-dns" - }, - "sessionAffinity": "None", - "type": "ClusterIP" - } - }, - { - "apiVersion": "v1", - "kind": "ServiceAccount", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - }, - "name": "coredns", - "namespace": "kube-system" - } - }, - { - "apiVersion": "v1", - "data": { - "Corefile": ".:53 {\n errors\n health\n kubernetes cluster.local in-addr.arpa ip6.arpa {\n pods insecure\n upstream\n fallthrough in-addr.arpa ip6.arpa\n }\n prometheus :9153\n proxy . /etc/resolv.conf\n cache 30\n loop\n reload\n loadbalance\n}\n" - }, - "kind": "ConfigMap", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - }, - "name": "coredns", - "namespace": "kube-system" - } - }, - { - "apiVersion": "apps/v1", - "kind": "Deployment", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/name": "CoreDNS" - }, - "name": "coredns", - "namespace": "kube-system" - }, - "spec": { - "progressDeadlineSeconds": 2147483647, - "replicas": 2, - "revisionHistoryLimit": 2147483647, - "selector": { - "matchLabels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - } - }, - "strategy": { - "rollingUpdate": { - "maxSurge": 1, - "maxUnavailable": 1 - }, - "type": "RollingUpdate" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns" - } - }, - "spec": { - "affinity": { - "nodeAffinity": { - "requiredDuringSchedulingIgnoredDuringExecution": { - "nodeSelectorTerms": [ - { - "matchExpressions": [ - { - "key": "beta.kubernetes.io/os", - "operator": "In", - "values": [ - "linux" - ] - }, - { - "key": "beta.kubernetes.io/arch", - "operator": "In", - "values": [ - "amd64" - ] - } - ] - } - ] - } - }, - "podAntiAffinity": { - "preferredDuringSchedulingIgnoredDuringExecution": [ - { - "podAffinityTerm": { - "labelSelector": { - "matchExpressions": [ - { - "key": "k8s-app", - "operator": "In", - "values": [ - "kube-dns" - ] - } - ] - }, - "topologyKey": "kubernetes.io/hostname" - }, - "weight": 100 - } - ] - } - }, - "containers": [ - { - "args": [ - "-conf", - "/etc/coredns/Corefile" - ], - "image": "%s.dkr.ecr.%s.%s/eks/coredns:v1.2.6", - "imagePullPolicy": "IfNotPresent", - "livenessProbe": { - "failureThreshold": 5, - "httpGet": { - "path": "/health", - "port": 8080, - "scheme": "HTTP" - }, - "initialDelaySeconds": 60, - "periodSeconds": 10, - "successThreshold": 1, - "timeoutSeconds": 5 - }, - "name": "coredns", - "ports": [ - { - "containerPort": 53, - "name": "dns", - "protocol": "UDP" - }, - { - "containerPort": 53, - "name": "dns-tcp", - "protocol": "TCP" - }, - { - "containerPort": 9153, - "name": "metrics", - "protocol": "TCP" - } - ], - "resources": { - "limits": { - "memory": "170Mi" - }, - "requests": { - "cpu": "100m", - "memory": "70Mi" - } - }, - "securityContext": { - "allowPrivilegeEscalation": false, - "capabilities": { - "add": [ - "NET_BIND_SERVICE" - ], - "drop": [ - "all" - ] - }, - "procMount": "Default", - "readOnlyRootFilesystem": true - }, - "terminationMessagePath": "/dev/termination-log", - "terminationMessagePolicy": "File", - "volumeMounts": [ - { - "mountPath": "/etc/coredns", - "name": "config-volume", - "readOnly": true - } - ] - } - ], - "dnsPolicy": "Default", - "priorityClassName": "system-node-critical", - "restartPolicy": "Always", - "schedulerName": "default-scheduler", - "securityContext": {}, - "serviceAccount": "coredns", - "serviceAccountName": "coredns", - "terminationGracePeriodSeconds": 30, - "tolerations": [ - { - "effect": "NoSchedule", - "key": "node-role.kubernetes.io/master" - }, - { - "key": "CriticalAddonsOnly", - "operator": "Exists" - } - ], - "volumes": [ - { - "configMap": { - "defaultMode": 420, - "items": [ - { - "key": "Corefile", - "path": "Corefile" - } - ], - "name": "coredns" - }, - "name": "config-volume" - } - ] - } - } - } - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRole", - "metadata": { - "annotations": {}, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/bootstrapping": "rbac-defaults" - }, - "name": "system:coredns" - }, - "rules": [ - { - "apiGroups": [ - "" - ], - "resources": [ - "endpoints", - "services", - "pods", - "namespaces" - ], - "verbs": [ - "list", - "watch" - ] - }, - { - "apiGroups": [ - "" - ], - "resources": [ - "nodes" - ], - "verbs": [ - "get" - ] - } - ] - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRoleBinding", - "metadata": { - "annotations": { - "rbac.authorization.kubernetes.io/autoupdate": "true" - }, - "labels": { - "eks.amazonaws.com/component": "coredns", - "k8s-app": "kube-dns", - "kubernetes.io/bootstrapping": "rbac-defaults" - }, - "name": "system:coredns" - }, - "roleRef": { - "apiGroup": "rbac.authorization.k8s.io", - "kind": "ClusterRole", - "name": "system:coredns" - }, - "subjects": [ - { - "kind": "ServiceAccount", - "name": "coredns", - "namespace": "kube-system" - } - ] - }, - { - "apiVersion": "apps/v1", - "kind": "DaemonSet", - "metadata": { - "annotations": { - "deprecated.daemonset.template.generation": "1" - }, - "labels": { - "k8s-app": "aws-node" - }, - "name": "aws-node", - "namespace": "kube-system" - }, - "spec": { - "revisionHistoryLimit": 10, - "selector": { - "matchLabels": { - "k8s-app": "aws-node" - } - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "k8s-app": "aws-node" - } - }, - "spec": { - "affinity": { - "nodeAffinity": { - "requiredDuringSchedulingIgnoredDuringExecution": { - "nodeSelectorTerms": [ - { - "matchExpressions": [ - { - "key": "beta.kubernetes.io/os", - "operator": "In", - "values": [ - "linux" - ] - }, - { - "key": "beta.kubernetes.io/arch", - "operator": "In", - "values": [ - "amd64" - ] - } - ] - } - ] - } - } - }, - "containers": [ - { - "env": [ - { - "name": "AWS_VPC_K8S_CNI_LOGLEVEL", - "value": "DEBUG" - }, - { - "name": "MY_NODE_NAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - }, - { - "name": "WATCH_NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "602401143452.dkr.ecr.eu-west-1.amazonaws.com/amazon-k8s-cni:v1.4.1", - "imagePullPolicy": "Always", - "name": "aws-node", - "ports": [ - { - "containerPort": 61678, - "hostPort": 61678, - "name": "metrics", - "protocol": "TCP" - } - ], - "resources": { - "requests": { - "cpu": "10m" - } - }, - "securityContext": { - "privileged": true, - "procMount": "Default" - }, - "terminationMessagePath": "/dev/termination-log", - "terminationMessagePolicy": "File", - "volumeMounts": [ - { - "mountPath": "/host/opt/cni/bin", - "name": "cni-bin-dir" - }, - { - "mountPath": "/host/etc/cni/net.d", - "name": "cni-net-dir" - }, - { - "mountPath": "/host/var/log", - "name": "log-dir" - }, - { - "mountPath": "/var/run/docker.sock", - "name": "dockersock" - } - ] - } - ], - "dnsPolicy": "ClusterFirst", - "hostNetwork": true, - "priorityClassName": "system-cluster-critical", - "restartPolicy": "Always", - "schedulerName": "default-scheduler", - "securityContext": {}, - "serviceAccount": "aws-node", - "serviceAccountName": "aws-node", - "terminationGracePeriodSeconds": 30, - "tolerations": [ - { - "operator": "Exists" - } - ], - "volumes": [ - { - "hostPath": { - "path": "/opt/cni/bin", - "type": "" - }, - "name": "cni-bin-dir" - }, - { - "hostPath": { - "path": "/etc/cni/net.d", - "type": "" - }, - "name": "cni-net-dir" - }, - { - "hostPath": { - "path": "/var/log", - "type": "" - }, - "name": "log-dir" - }, - { - "hostPath": { - "path": "/var/run/docker.sock", - "type": "" - }, - "name": "dockersock" - } - ] - } - }, - "updateStrategy": { - "rollingUpdate": { - "maxUnavailable": 1 - }, - "type": "RollingUpdate" - } - } - }, - { - "apiVersion": "apiextensions.k8s.io/v1beta1", - "kind": "CustomResourceDefinition", - "metadata": { - "annotations": {}, - "name": "eniconfigs.crd.k8s.amazonaws.com" - }, - "spec": { - "conversion": { - "strategy": "None" - }, - "group": "crd.k8s.amazonaws.com", - "names": { - "kind": "ENIConfig", - "listKind": "ENIConfigList", - "plural": "eniconfigs", - "singular": "eniconfig" - }, - "scope": "Cluster", - "version": "v1alpha1", - "versions": [ - { - "name": "v1alpha1", - "served": true, - "storage": true - } - ] - } - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRole", - "metadata": { - "annotations": {}, - "name": "aws-node" - }, - "rules": [ - { - "apiGroups": [ - "crd.k8s.amazonaws.com" - ], - "resources": [ - "*", - "namespaces" - ], - "verbs": [ - "*" - ] - }, - { - "apiGroups": [ - "" - ], - "resources": [ - "pods", - "nodes", - "namespaces" - ], - "verbs": [ - "list", - "watch", - "get" - ] - }, - { - "apiGroups": [ - "extensions" - ], - "resources": [ - "daemonsets" - ], - "verbs": [ - "list", - "watch" - ] - } - ] - }, - { - "apiVersion": "rbac.authorization.k8s.io/v1", - "kind": "ClusterRoleBinding", - "metadata": { - "annotations": {}, - "name": "aws-node" - }, - "roleRef": { - "apiGroup": "rbac.authorization.k8s.io", - "kind": "ClusterRole", - "name": "aws-node" - }, - "subjects": [ - { - "kind": "ServiceAccount", - "name": "aws-node", - "namespace": "kube-system" - } - ] - } - ], - "kind": "List" -} diff --git a/pkg/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go index 054fadb71f..640678867f 100644 --- a/pkg/apis/eksctl.io/v1alpha5/types.go +++ b/pkg/apis/eksctl.io/v1alpha5/types.go @@ -311,6 +311,7 @@ func DeprecatedVersions() []string { Version1_10, Version1_11, Version1_12, + Version1_13, } } @@ -327,7 +328,6 @@ func IsDeprecatedVersion(version string) bool { // SupportedVersions are the versions of Kubernetes that EKS supports func SupportedVersions() []string { return []string{ - Version1_13, Version1_14, Version1_15, Version1_16, diff --git a/pkg/eks/eks.go b/pkg/eks/eks.go index 0e44d4b83e..2e081b8f1f 100644 --- a/pkg/eks/eks.go +++ b/pkg/eks/eks.go @@ -239,10 +239,6 @@ func (c *ClusterProvider) NewOpenIDConnectManager(spec *api.ClusterConfig) (*iam return nil, err } - switch c.ControlPlaneVersion() { - case "", api.Version1_10, api.Version1_11, api.Version1_12: - return nil, &UnsupportedOIDCError{"OIDC is only supported in Kubernetes versions 1.13 and above"} - } if c.Status.clusterInfo.cluster == nil || c.Status.clusterInfo.cluster.Identity == nil || c.Status.clusterInfo.cluster.Identity.Oidc == nil || c.Status.clusterInfo.cluster.Identity.Oidc.Issuer == nil { return nil, &UnsupportedOIDCError{"unknown OIDC issuer URL"} } diff --git a/userdocs/src/introduction.md b/userdocs/src/introduction.md index 10acc31ada..5cc2c57441 100644 --- a/userdocs/src/introduction.md +++ b/userdocs/src/introduction.md @@ -23,7 +23,7 @@ eksctl create cluster --name=cluster-1 --nodes=4 ``` -EKS supports versions `1.13`, `1.14`, `1.15` and `1.16` (default) +EKS supports versions `1.14`, `1.15` and `1.16` (default) With `eksctl` you can deploy any of the supported versions by passing `--version`. ```