diff --git a/pkg/addons/default/assets.go b/pkg/addons/default/assets.go index 695ee3f9c00..df208d88e3d 100644 --- a/pkg/addons/default/assets.go +++ b/pkg/addons/default/assets.go @@ -4,6 +4,7 @@ // assets/coredns-1.14.json (9.919kB) // assets/coredns-1.15.json (10.18kB) // assets/coredns-1.16.json (10.18kB) +// assets/coredns-1.17.json (10.18kB) package defaultaddons @@ -152,6 +153,26 @@ func coredns116Json() (*asset, error) { return a, nil } +var _coredns117Json = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x73\x1b\xb9\x0d\x7f\xf7\xa7\xd8\xd9\x99\xbc\x9d\x64\x29\x3e\xbb\x39\xbf\xf9\x2c\x37\xe7\x69\xec\x6a\x6c\xe7\x5e\x9a\x9b\x1b\x8a\x0b\x49\xac\xb9\x04\x0b\x72\x65\x2b\x19\x7f\xf7\x0e\xf7\x8f\xb4\x7f\xc8\x95\xe4\x3a\x9d\x74\xa6\x7a\x48\xd6\x4b\x00\x04\x01\xfc\x40\x80\xdc\x6f\x47\x51\x14\x33\x2d\x7e\x07\x32\x02\x55\x7c\x1e\xc5\xab\x71\xfc\x93\x7b\x2b\x2c\xa4\x26\x3e\x8f\xfe\x71\x14\x45\x51\xf4\x2d\xff\x37\x44\x9c\x8f\x3c\x0a\x95\xb8\x77\xf7\x40\x2b\xc1\x61\x3b\x90\x82\x65\x09\xb3\x2c\x3e\xdf\x88\x71\x82\x94\x42\xcb\xac\x40\x65\x1a\x03\x51\x14\x6b\xc2\x14\xec\x12\x32\x33\x14\x78\xac\x91\xac\x93\xfb\xcb\xf8\xf4\x64\x23\xd4\x43\x67\x38\x31\x0d\x8e\xd2\x52\x06\xf1\x86\xf0\x65\xcb\x13\x4b\x36\x03\xd9\x99\x0f\x1e\xcd\x90\xa5\xec\x2b\x2a\xf6\x64\x86\x1c\xd3\x63\x8e\xa9\x46\x05\x2a\x9f\xf8\x31\x9b\xc1\x20\x51\xa6\x39\xf9\xe3\x07\x33\x60\x5a\xf7\x10\x64\x33\x20\x05\x16\x72\xed\xb8\xcc\x8c\x05\x1a\x98\xd2\x3a\x95\x9a\x3d\x2c\x8a\xa5\x39\xdd\x25\x12\x4c\x6e\xef\xfd\x2b\xaa\x88\x3c\x3a\xe4\x63\x46\x33\xbe\x25\x30\x6b\x63\x21\xad\x24\x6d\xe4\xc4\x46\x03\x6f\xba\xc7\x59\x7d\xeb\xfe\xe2\x57\x37\x5a\x6d\xea\xf6\xca\x4b\xee\xf8\x3c\x3a\x3d\x69\xbf\x27\xb4\xc8\x51\x3a\xb6\xcf\x93\x69\x9b\xcd\x32\x5a\x80\x9d\x56\xcc\xb5\xc1\x97\x9f\xf6\xd2\x63\x60\xb9\x7e\x8d\x2e\x0f\x97\x87\xe8\xb2\x79\xfe\xa3\x66\x6c\x03\x12\xb8\x45\x6a\x07\x97\x2f\x4e\xbc\x9e\x34\x60\x1c\xac\x2e\xe6\x73\xa1\x84\x5d\x3b\x86\x5b\x54\xf5\x08\x89\xed\xba\x08\xf0\xcb\x22\x98\xae\xa7\x1b\x4f\x1e\xd5\xa4\x1d\x8e\xd5\x0b\xce\x31\x53\xf6\x40\xc8\xfe\xc7\xc0\xe2\x48\xb0\x17\xae\x7a\x23\xbf\x2b\x65\x77\xe0\x1f\x68\xae\xae\x29\x1c\x26\xe7\x42\xe6\x13\x0c\xcf\x4f\x4f\xa2\x6f\x5f\x94\x1b\x00\x22\x24\x53\x3c\x2f\x81\x49\xbb\x2c\x9e\xb7\xc8\x8e\xca\x4c\x30\x94\xc8\x99\x8c\x84\x1a\xb0\x24\xa1\x21\x23\xcd\x22\xa1\xcf\x8a\x87\x52\x5a\x14\x69\x4c\x4c\x24\x94\x01\x9e\x11\x54\x2f\x33\x6d\x2c\x01\x4b\xab\xbf\xe7\x4c\x4a\xbb\x24\xcc\x16\x4b\xbf\xbc\x82\xf0\xa5\xf8\x6f\x9b\x35\xa3\x73\x97\x53\x8b\xb7\x73\xa4\x27\x46\x49\x34\x8c\x8e\xc1\xf2\x63\x02\x83\x72\x35\xe4\xa8\xe6\xc5\x38\x67\x7c\x09\xd1\xc9\xa8\xf8\x4b\x22\xea\xe2\x89\x40\x22\x4b\xaa\xb7\x2c\x99\x31\xc9\x14\x87\x2f\xea\xe5\x8b\xea\xe6\x99\x2a\xee\x2e\x51\xcd\xc5\xe2\x86\xe9\xff\x87\x5c\x2d\xe4\x98\xd6\xe6\xd8\x07\xd3\x09\x68\x89\xeb\x14\x7e\x60\x88\xbe\xd5\x3e\xf6\x1a\xd3\xf6\x6d\x63\x84\x0b\x02\x63\x26\xc0\x12\x29\x14\xdc\x03\x47\x95\x38\x2b\x9c\x8d\x46\xb5\x39\x08\xb4\x14\x9c\xb9\x81\xf7\x8d\xd7\x2b\xe1\xbc\xf3\x9b\x30\x16\x69\xfd\x49\xa4\xc2\x99\x65\x3c\xda\x23\xf1\xa7\xcc\xf2\xe5\x27\x9f\xd1\x5f\x67\xf6\x5d\x81\x5a\xdf\x98\x1a\xfb\x8a\x25\x66\x61\xb1\x6e\xeb\x47\x28\xa5\x50\x8b\xcf\x3a\x61\x16\xba\x1a\xa6\xec\xf9\x3e\xa3\x45\x6e\xf4\xf7\xa7\xef\xda\xaa\xa4\xec\xf9\xb3\x62\x2b\x26\x24\x9b\xe5\x69\x70\x1c\xda\xad\x37\xbb\xd6\x5d\x63\x42\xaf\xae\x16\x52\x2d\xbb\xea\xf8\x83\x3d\xea\x2f\x23\x7b\xec\x9c\x59\x18\x54\x5a\x01\x7f\x1f\x37\xb8\x5e\x5a\x2b\xe5\x04\xb9\xfc\x07\x91\x82\xb1\x2c\x75\xe6\x57\x99\x94\x2d\x32\x2f\xbc\x7a\x74\xd8\xe1\xeb\xdd\xde\xae\xfb\xbb\x6d\xf2\x0e\x10\x0a\x5b\x6d\x4b\x8b\x8e\x92\x0a\x13\xb8\x08\x8f\xe7\x58\xf8\x57\x26\x08\x92\x49\x46\x42\x2d\xee\xf9\x12\x92\xcc\xf9\xf3\x7a\xa1\x70\xf3\xfa\xea\x19\x78\x66\x8b\x7c\xd6\x95\x51\xce\x73\x5f\x22\xe6\x01\x28\x6d\xd7\x98\xdb\x9f\x8f\x3d\xda\x00\xeb\xea\x59\x53\x51\x30\x85\x25\xf4\x49\xc9\x25\x3d\x42\x5e\x66\xcd\xc0\xb2\x61\x33\x67\x61\xd7\x1f\x0d\x4e\xd4\x40\xac\x00\x7d\x7c\xad\xfa\x69\x57\x4c\x66\xd0\xaf\x65\x4e\x27\x85\xca\x9e\xe3\x1e\x9a\x3f\x82\x63\x2f\x61\x05\x5e\x69\x00\x46\x7c\xf9\xdf\x37\x01\x4b\x93\xb3\x9f\x5f\x69\x82\xc0\x88\x9f\xc3\x47\xdd\xa5\x6c\x53\x75\xcc\x1c\x6b\x4c\x2e\x94\x15\xfd\xc8\xd1\x04\x73\xa0\x43\xa0\xe3\x33\x93\xdf\x91\xb9\x06\xe5\xec\x0e\x4f\x01\xdc\x45\x9b\x14\x75\xef\xdf\xae\x5a\xa4\x07\x61\xac\x3f\xc8\xb6\x61\x56\x25\xb4\xbe\x50\x39\x2c\xb0\xf6\x0f\xad\x28\x94\x44\xdb\xbf\x70\x84\x85\x63\x2c\xcc\x15\x04\x66\x6c\x51\xa3\xc4\xc5\xfa\x6f\xa5\x6d\x1a\xe8\x5b\xa2\xb1\x79\x45\xe4\x0f\x5e\xbf\xd0\xf8\x09\xc4\x62\x59\xd4\x27\x23\x0f\x45\x57\xfb\xb6\xd6\x2f\xfd\x1b\x21\x2a\xcb\x84\x02\xf2\x59\xdb\x13\xf6\x8c\x16\x21\xbf\xc4\x03\xd7\x59\x78\x5d\x1b\xe7\xfd\x47\xb9\x29\x1e\x6f\xfa\xac\xae\xee\x5d\xe6\x58\xa4\xac\x28\x58\xde\x99\x61\xf2\x48\x43\xe0\x34\x7c\x67\x86\xef\xcc\x31\x3c\x9a\x4a\xe6\xf9\x6a\x3c\x3c\x1b\x9e\x79\x26\x2f\xf8\xa7\x99\x94\x53\x94\x82\xe7\x7e\xb9\x9e\xdf\xa2\x9d\x12\x98\x7a\xf1\x5d\x63\x91\x62\x05\x0a\x8c\x99\x12\xce\xba\x55\x54\x49\x34\x67\x42\x66\x04\x0f\x4b\x02\xb3\x44\xe9\x6a\xfa\x53\xef\xda\x97\xd6\xea\x8f\x60\x83\xd8\x8c\x35\xb3\x4b\xa7\xd6\x71\xd1\x5c\x06\xc0\x51\x9d\x79\x7c\x18\x7d\x18\x05\x28\x0c\x5f\x42\x51\x71\xff\xf6\xf0\x30\xf5\xc5\x99\x37\xca\x62\x97\x68\x04\x93\x13\x90\x6c\x5d\x2f\xa6\xbd\xc4\x1a\x48\x60\xb2\x25\x1b\xfb\xc9\x4c\xc6\x39\x18\x53\x37\xcf\xd8\x4b\x68\x45\x0a\x98\xd9\xad\xc0\xd3\x6e\xca\xf6\xf8\x28\xdc\x5b\x6c\x35\xf5\x1c\x77\x55\xbf\x80\x2b\x36\x70\x98\xfa\x0f\x98\x3a\xd3\xfb\xa7\x8e\x7c\xe7\x62\xfb\xba\xe3\x0d\x55\xf3\x1c\x9d\x79\xd5\x7b\xb8\x7c\x73\xf5\x7e\x19\xef\x54\x30\x05\x4b\x82\xef\x65\xbf\x90\x82\x7b\x65\x10\x02\x96\x88\xd7\xe0\xd9\xbb\x80\xff\x01\x3c\x7f\x77\x88\x8e\xf7\x82\x28\x81\xc1\x8c\x38\xf8\x1a\xa8\xa8\xc8\xb3\xa9\xb0\xa1\xd1\xbc\x43\x4c\x91\xf2\x8c\x3d\xfe\xcb\xe8\x46\xec\x6f\x00\xd7\xd6\x80\xe9\x13\xcd\x75\x96\xcb\x1d\x8d\xd2\x90\x7f\xb6\xb3\x07\x27\xdf\xcb\x0c\xf9\x39\x9f\xb0\xeb\x4b\x54\x16\x9e\x43\x71\x13\x33\x29\xf1\x69\x4a\x62\x25\x24\x2c\xe0\xca\x70\x26\x59\x59\x39\xce\x99\x34\xe0\x5d\x28\x67\x9a\xcd\x84\x14\x56\x04\xad\xec\x44\x27\x49\x4f\x2d\x15\xdf\x5e\x3d\xfc\xf9\xeb\xf5\xed\xe4\xcf\xfb\xab\xbb\xdf\xaf\x2f\xaf\xfc\x05\x8a\x07\x59\x39\x77\x42\xa8\xfb\xa4\x33\x29\x03\x02\x0f\x70\x27\x4b\xfe\xae\xe4\xfa\x0e\xd1\xfe\x55\x48\x28\x8f\x8a\xce\x23\x4b\x19\xec\xe5\x03\x0b\x94\x0a\x95\xdb\xf3\x06\x8c\x71\x15\x41\x05\xd2\x04\x56\xc7\xb5\xe1\x81\xc4\x85\x6f\x33\xf1\x48\xd8\xd4\x13\x4e\x27\x1f\xcf\x0a\x65\x96\xc2\x0d\x66\xea\xd0\x7d\x28\x75\x3c\x1b\x15\x6b\xc5\x53\x28\x58\xb7\xdb\xa1\x9a\x8b\xc5\xa0\x98\x39\x44\x5c\xd9\x33\x64\xc1\xc3\x32\x7f\x53\x57\x9b\x06\x77\x9c\x4a\x47\x47\xf2\x06\xa5\x6c\x2b\x20\xdd\x7e\xb7\x75\xc9\x04\xe6\x2c\x93\xed\xea\x2e\xd6\x24\x30\xc7\xa2\x64\xc6\xdc\x96\xfa\x14\xe1\x34\xa8\x6e\xf3\x38\x09\x2b\x38\x93\x6d\x5e\x02\x63\x19\xd9\xed\x1c\x17\xf2\x89\xad\x3b\xe7\x79\xa6\xe8\x04\x81\x2a\xf1\x49\xa1\xca\x60\x33\xd0\xe1\xe8\x26\x88\x76\x99\x6e\x9a\x77\x3a\xe1\xd3\xc4\x26\xe1\x6d\x6f\x91\x54\x8f\xe9\x8f\xc4\x38\x4c\x5b\xfb\xc6\xc9\xa8\xcd\x80\xd2\xb5\x71\x81\xe6\xd1\xd3\x2e\xc0\x7c\x0e\xdc\x16\xd7\x5e\x65\x8b\xec\x45\x4a\xd9\x4c\x2a\x4c\x60\x40\x28\xa1\x75\x70\x91\x32\xe7\x99\x76\xd0\x74\x82\xd4\xa3\x40\x29\xf8\xb2\xf4\xe9\x45\x92\xa0\x32\x79\xec\x7b\xb4\xa8\x37\xa9\x57\xcf\xc2\x6d\x20\x07\x45\x60\x81\xba\x7d\x4d\x93\x6a\xbb\x9e\x08\xf2\xb8\x3b\xda\x81\x96\x7d\x16\xce\x37\xb7\x31\x81\xfd\xa6\x0c\xcb\x1b\x4c\xdc\x34\x3f\xbf\xf7\xd7\x08\xcd\x2f\x06\xda\xbf\xe0\xa9\x44\x65\xf6\xaa\xd3\x0b\x76\xcc\x55\xad\x14\xee\x09\xa3\xd0\xc9\x8e\x57\xdf\x76\x5b\x70\x60\x2f\x51\x4f\x9e\xfd\xae\x3f\xf2\x8d\x54\x4f\xfb\x5c\x0c\xd1\x8c\xf1\x21\xcb\xec\x12\x49\x7c\xcd\x31\x35\x7c\xfc\x90\x47\xbb\xef\xb6\xa8\xbc\x1d\xbe\x43\x79\xe8\x47\x18\x3f\xc4\x75\xd1\x0c\xd1\x1a\x4b\x4c\x6b\xa1\x16\xd5\xea\x07\x65\x08\xee\xb8\x98\x2b\xd2\xf3\x79\xcb\xa3\xdb\x0b\x22\xca\x64\x0b\x73\x8d\xd5\x31\x2d\x3e\x12\x66\xba\x1b\xc5\x71\xdd\xc5\x8d\x70\x6a\x94\xae\x2d\x26\x50\x89\x46\xe1\x76\x74\x7f\xea\xf5\x7c\x37\x91\x74\xde\x6d\xae\xbf\x4c\x58\x87\x15\xd0\xcc\x33\xbf\x14\xa6\xb3\xad\x3d\x31\xcb\x97\x0d\x49\x3e\x8b\x7e\x57\xb3\xb8\xd4\x7d\xf8\x62\x16\x60\x03\x6a\x1f\xd5\xdf\x7c\x27\x24\xfd\x2a\x54\xe2\xe2\xf1\x30\x40\x35\x0c\xe2\x99\xba\x79\xe4\x9e\x59\xcc\xaa\xdb\xb8\xb7\xfe\x88\xe9\x87\x47\x26\x4a\xb8\x83\x79\xcb\x9a\x65\xe0\xf5\x7a\xae\x7e\x55\xdc\x97\x02\x0f\x50\xc6\x64\xb3\x7f\x02\xb7\x3d\x99\x62\xc7\x07\x34\xd1\xae\x63\xa7\x9d\x97\xda\x9d\xb0\x3e\x2a\x61\xb2\x99\xfa\x93\x03\xf7\xd1\xcb\xd1\xbf\x03\x00\x00\xff\xff\xcc\xb2\x2a\xb9\xc4\x27\x00\x00") + +func coredns117JsonBytes() ([]byte, error) { + return bindataRead( + _coredns117Json, + "coredns-1.17.json", + ) +} + +func coredns117Json() (*asset, error) { + bytes, err := coredns117JsonBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "coredns-1.17.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xb2, 0x4a, 0x2d, 0xc0, 0xc0, 0x44, 0x91, 0xb8, 0x4a, 0x68, 0xe9, 0x44, 0x50, 0x1, 0x27, 0x85, 0x8b, 0xd7, 0x19, 0x2a, 0x90, 0xbe, 0x39, 0x46, 0xc, 0xc8, 0xb8, 0x3a, 0x93, 0xd7, 0x45, 0xf0}} + return a, nil +} + // Asset loads and returns the asset for the given name. // It returns an error if the asset could not be found or // could not be loaded. @@ -247,6 +268,7 @@ var _bindata = map[string]func() (*asset, error){ "coredns-1.14.json": coredns114Json, "coredns-1.15.json": coredns115Json, "coredns-1.16.json": coredns116Json, + "coredns-1.17.json": coredns117Json, } // AssetDir returns the file names below a certain @@ -294,6 +316,7 @@ var _bintree = &bintree{nil, 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{}}, + "coredns-1.17.json": &bintree{coredns117Json, map[string]*bintree{}}, }} // RestoreAsset restores an asset under the given directory. diff --git a/pkg/addons/default/assets/coredns-1.17.json b/pkg/addons/default/assets/coredns-1.17.json new file mode 100644 index 00000000000..05695d5f9c6 --- /dev/null +++ b/pkg/addons/default/assets/coredns-1.17.json @@ -0,0 +1,357 @@ +{ + "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 forward . /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": 600, + "replicas": 2, + "revisionHistoryLimit": 10, + "selector": { + "matchLabels": { + "eks.amazonaws.com/component": "coredns", + "k8s-app": "kube-dns" + } + }, + "strategy": { + "rollingUpdate": { + "maxSurge": "25%", + "maxUnavailable": 1 + }, + "type": "RollingUpdate" + }, + "template": { + "metadata": { + "annotations": { + "eks.amazonaws.com/compute-type": "ec2" + }, + "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.6.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" + } + ], + "readinessProbe": { + "failureThreshold": 3, + "httpGet": { + "path": "/health", + "port": 8080, + "scheme": "HTTP" + }, + "periodSeconds": 10, + "successThreshold": 1, + "timeoutSeconds": 1 + }, + "resources": { + "limits": { + "memory": "170Mi" + }, + "requests": { + "cpu": "100m", + "memory": "70Mi" + } + }, + "securityContext": { + "allowPrivilegeEscalation": false, + "capabilities": { + "add": [ + "NET_BIND_SERVICE" + ], + "drop": [ + "all" + ] + }, + "readOnlyRootFilesystem": true + }, + "terminationMessagePath": "/dev/termination-log", + "terminationMessagePolicy": "File", + "volumeMounts": [ + { + "mountPath": "/etc/coredns", + "name": "config-volume", + "readOnly": true + }, + { + "mountPath": "/tmp", + "name": "tmp" + } + ] + } + ], + "dnsPolicy": "Default", + "priorityClassName": "system-cluster-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": [ + { + "emptyDir": {}, + "name": "tmp" + }, + { + "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/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go index f864683e832..2627eaa5051 100644 --- a/pkg/apis/eksctl.io/v1alpha5/types.go +++ b/pkg/apis/eksctl.io/v1alpha5/types.go @@ -112,14 +112,17 @@ const ( // Version1_16 represents Kubernetes version 1.16.x Version1_16 = "1.16" - // Version1_17 represents Kubernetes version 1.16.x + // Version1_17 represents Kubernetes version 1.17.x Version1_17 = "1.17" + // Version1_18 represents Kubernetes version 1.18.x + Version1_18 = "1.18" + // DefaultVersion represents default Kubernetes version supported by EKS DefaultVersion = Version1_16 // LatestVersion represents latest Kubernetes version supported by EKS - LatestVersion = Version1_16 + LatestVersion = Version1_17 // DefaultNodeType is the default instance type to use for nodes DefaultNodeType = "m5.large" @@ -334,6 +337,7 @@ func SupportedVersions() []string { Version1_14, Version1_15, Version1_16, + Version1_17, } } diff --git a/pkg/ctl/upgrade/cluster.go b/pkg/ctl/upgrade/cluster.go index 1765d8200f0..a5af9e47887 100644 --- a/pkg/ctl/upgrade/cluster.go +++ b/pkg/ctl/upgrade/cluster.go @@ -189,6 +189,8 @@ func getNextVersion(currentVersion string) (string, error) { return api.Version1_16, nil case api.Version1_16: return api.Version1_17, nil + case api.Version1_17: + return api.Version1_18, nil default: // version of control plane is not known to us, maybe we are just too old... return "", fmt.Errorf("control plane version %q is not known to this version of eksctl, try to upgrade eksctl first", currentVersion) diff --git a/userdocs/src/introduction.md b/userdocs/src/introduction.md index 5cc2c574411..b8696699b52 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.14`, `1.15` and `1.16` (default) +EKS supports versions `1.14`, `1.15`, `1.16` (default) and `1.17`. With `eksctl` you can deploy any of the supported versions by passing `--version`. ```