From bd8b9c8938dabe868c51cd004487d4e63244cf30 Mon Sep 17 00:00:00 2001 From: Johannes Liebermann Date: Mon, 27 Apr 2020 18:52:21 +0200 Subject: [PATCH] platform/aws: Remove 'workers' from target group name Target group name length is limited to 32 characters. We should keep the name short as possible to accommodate clusters with long names, and in addition the word "workers" doesn't add any meaning here. --- .../aws/flatcar-linux/kubernetes/workers/ingress.tf | 4 ++-- pkg/assets/generated_assets.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf index 4b410c0b9..b17310e96 100644 --- a/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf +++ b/assets/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf @@ -21,7 +21,7 @@ resource "aws_lb_listener" "ingress-https" { } resource "aws_lb_target_group" "workers-http" { - name = "${var.cluster_name}-${var.pool_name}-workers-http" + name = "${var.cluster_name}-${var.pool_name}-http" vpc_id = var.vpc_id target_type = "instance" @@ -44,7 +44,7 @@ resource "aws_lb_target_group" "workers-http" { } resource "aws_lb_target_group" "workers-https" { - name = "${var.cluster_name}-${var.pool_name}-workers-https" + name = "${var.cluster_name}-${var.pool_name}-https" vpc_id = var.vpc_id target_type = "instance" diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go index 15ea80a31..5b8068c9d 100644 --- a/pkg/assets/generated_assets.go +++ b/pkg/assets/generated_assets.go @@ -2997,9 +2997,9 @@ var vfsgenAssets = func() http.FileSystem { "/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/ssh.tf": &vfsgen۰CompressedFileInfo{ name: "ssh.tf", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 2792, + uncompressedSize: 2772, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4f\x6f\xdb\x3e\x0c\xbd\xe7\x53\x10\xee\xef\xf4\x43\xed\x74\x58\xbb\x43\x81\x1c\x0b\xec\xb0\xad\x40\xbb\x5b\x51\x18\xae\xc4\xa4\x42\x6c\xd1\x20\xe9\xb4\xc1\xd0\xef\x3e\x48\xb6\x97\x3f\x70\xfe\x0c\xf0\x2e\x6e\xad\xbc\xc7\xa7\x27\x93\x14\x2f\xe0\x11\x4d\xc3\x08\x86\xea\x35\xa0\x1a\x0b\x3f\xbf\x3d\x42\x21\x82\x2a\xa0\x04\x86\xbc\x32\x95\x25\xb2\x64\x13\x46\xa1\x86\x0d\x42\xe2\x9b\xb2\xcc\xfb\xd7\x04\x92\x40\x4f\x37\xd8\x54\xd0\x30\xaa\x24\xf0\x6b\x02\x60\xa8\xf1\x0a\x33\x58\x15\x9c\x6d\x30\x79\x5c\x9e\xc4\xdf\xbd\x47\xa3\x8e\x7c\x84\x03\xe8\xba\xc6\xf0\x77\x06\x89\xc8\x6b\x12\xd7\x5e\x49\xb4\x5d\x2b\xde\x24\x77\x5e\xb4\xf0\x06\xb7\xe2\xc9\x53\x0c\x98\x39\x6f\xf1\xfd\x39\xab\x9b\x97\xd2\x99\xdc\xd5\x91\xdd\x08\x72\x17\xd1\x10\x63\x1b\x52\x5d\x85\xd4\x84\x9d\x25\x9f\x6e\xaa\xb0\xf6\x11\xb6\x53\x33\xad\x9c\x38\xf2\xc8\x90\xcc\x5d\x89\x49\xb7\xad\xa0\x85\x3e\xee\x02\x66\x50\x91\x6d\x4a\xcc\x5e\x88\x74\xd9\xbc\x60\x16\x0e\x2f\x37\x45\x6e\x90\x35\xc2\x2d\x8a\x3a\x5f\x44\x5f\x33\x48\xfe\xfb\x7a\xff\xfd\x6e\x1a\x50\xa9\x29\x1d\x7a\x4d\x4d\x91\x19\xd6\x71\x74\x63\xc4\xf3\xb5\xc7\x16\x5e\xe2\xfa\x3c\xdd\x25\xae\x47\xd1\x15\xe4\x55\xc8\xa1\xd3\x86\x5b\xe4\x68\x86\x3b\xe1\xd3\x86\x3b\xdd\xb1\x0c\xd7\x78\x9e\xdd\x80\x1b\xcd\x6c\x14\x3d\x6d\x35\x6a\x8e\x60\x34\x3c\x0c\xf9\xb9\x5b\xa4\xe1\xdf\x12\x8f\x98\xdd\x60\x87\x55\x19\x2b\x52\x4c\xf1\x1d\x4d\x2f\xee\x7c\xe9\x3c\xc2\x0c\x9e\xe2\x2b\x40\x22\x8d\x25\xa8\x56\xb0\x1f\x12\x82\xaf\xf8\xce\x1e\x15\x65\x5b\xed\x72\x87\x6c\x5e\xe9\xcd\x03\x13\xe9\x6d\x78\xfc\x0d\xb1\x22\x0b\x5f\xae\xaf\xcf\xa7\x54\x4b\xeb\x18\xd2\xba\x65\x88\x94\xf1\xf4\xe3\x63\x1f\xb9\x82\xad\xa2\xfb\x7f\x8f\xb0\xbf\x93\xa1\x80\xbb\x3d\x6a\x00\x30\x6d\xf3\xbb\x6f\x62\xc3\xfa\x9b\xda\x3b\x1c\xe1\x34\x7d\x89\xeb\x23\xf4\x90\x77\xa3\x18\x0a\x59\x7c\xdc\x4e\x5f\x5b\x87\xd8\xa7\xa8\x07\x8c\xfc\x29\x9f\xa1\xd4\x4a\x1f\x62\x80\xdb\x78\x37\xef\x90\x07\x13\x2a\x7d\x80\x9b\xab\xab\x41\xe0\x73\x5f\x27\xca\x6e\xb1\x40\x16\x98\x6d\x55\x65\x77\x29\x3b\x7b\xf6\x0d\xeb\x6c\x0c\xf8\x31\x99\xec\x4e\x11\x7d\x39\x6f\x4d\x11\xf7\x3f\xee\xb6\x44\xa0\xf0\x16\x44\x0b\xd6\x0d\x56\x09\x6a\xe4\x39\x71\x35\xb9\x00\xf2\x98\x86\xcb\x19\x04\xcb\x79\x1a\x6e\x7e\xb4\x60\xca\x46\x14\x39\x52\x44\xb9\xa8\x6b\xe7\x17\xc7\x66\x92\x3e\x76\x1a\xa5\xda\x26\x60\xb1\x46\x6f\x25\x8f\x9d\xa4\x6d\x03\x7b\x4d\xe8\x72\x7b\xf1\x8d\x78\x89\x2c\xed\x5a\x38\x15\xa6\x46\xf1\xe6\x73\xce\x68\x88\x6d\x56\xd4\xae\xcd\xc2\x16\xb1\xb3\x83\xec\xc0\x4c\x14\xa0\xcf\x63\x8e\x3d\x57\xff\x64\xd8\xe9\x4e\xb5\xeb\xd4\x61\x74\x8b\x9f\x33\xb7\x8e\x0f\x37\xe5\xf6\x8b\x8f\xd6\x90\xbb\x04\x9a\x52\xad\xd3\xfe\xfb\xec\x65\xbd\xac\x45\xb1\x32\x5a\xee\x25\xd4\x4e\xce\x7f\x4c\x7e\x07\x00\x00\xff\xff\xb5\x31\xf0\xd1\xe8\x0a\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4d\x6f\xdb\x30\x0c\xbd\xe7\x57\x10\xee\x4e\xc3\xec\x74\x58\xbb\x43\x81\x1c\x0b\xec\xb0\xad\x40\xbb\x5b\x51\x18\xae\xc4\xa4\x42\x6c\xd1\x20\xe9\xb4\xc1\xd0\xff\x3e\x48\xb6\x97\x0f\x38\x1f\x03\xbc\x8b\x5b\x2b\xef\xf1\xe9\xc9\x24\xc5\x0b\x78\x40\xd3\x30\x82\xa1\x7a\x0d\xa8\xc6\xc2\xaf\xef\x0f\x50\x88\xa0\x0a\x28\x81\x21\xaf\x4c\x65\x89\x2c\xd9\x84\x51\xa8\x61\x83\x90\xf8\xa6\x2c\xf3\xfe\x35\x81\x24\xd0\xd3\x0d\x36\x15\x34\x8c\x2a\x09\xfc\x9e\x00\x18\x6a\xbc\xc2\x0c\x56\x05\x67\x1b\x4c\x1e\x97\x27\xf1\x77\xef\xd1\xa8\x23\x1f\xe1\x00\xba\xae\x31\xfc\x9d\x41\x22\xf2\x92\xc4\xb5\x17\x12\x6d\xd7\x8a\x57\xc9\x9d\x17\x2d\xbc\xc1\xad\x78\xf2\x18\x03\x66\xce\x5b\x7c\x7b\xca\xea\xe6\xb9\x74\x26\x77\x75\x64\x37\x82\xdc\x45\x34\xc4\xd8\x86\x54\x57\x21\x35\x61\x67\xc9\xe7\xeb\x2a\xac\xbd\x87\xed\xd4\x4c\x2b\x27\x8e\x3c\x32\x24\x73\x57\x62\xd2\x6d\x2b\x68\xa1\x8f\xbb\x80\x19\x54\x64\x9b\x12\xb3\x67\x22\x5d\x36\xcf\x98\x85\xc3\xcb\x4d\x91\x1b\x64\x8d\x70\x8b\xa2\xce\x17\xd1\xd7\x0c\x92\x0f\xdf\xee\x7e\xdc\x4e\x03\x2a\x35\xa5\x43\xaf\xa9\x29\x32\xc3\x3a\x8e\x6e\x8c\x78\xbe\xf6\xd8\xc2\x4b\x5c\x9f\xa7\xbb\xc4\xf5\x28\xba\x82\xbc\x0a\x39\x74\xda\x70\x8b\x1c\xcd\x70\x27\x7c\xda\x70\xa7\x3b\x96\xe1\x1a\xcf\xb3\x1b\x70\xa3\x99\x8d\xa2\xa7\xad\x46\xcd\x11\x8c\x86\x87\x21\x3f\x77\x8b\x34\xfc\x5b\xe2\x11\xb3\x1b\xec\xb0\x2a\x63\x45\x8a\x29\xbe\xa1\xe9\xc5\x9d\x2f\x9d\x47\x98\xc1\x63\x7c\x05\x48\xa4\xb1\x04\xd5\x0a\xf6\x43\x42\xf0\x15\xdf\xd9\xa3\xa2\x6c\xab\x7d\xda\x21\x9b\x17\x7a\xf5\xc0\x44\x7a\x13\x1e\xff\x42\xac\xc8\xc2\xd7\xab\xab\xf3\x29\xd5\xd2\x3a\x86\xb4\x6e\x19\x22\x65\x3c\xfd\xf8\xd8\x47\xae\x60\xab\xe8\x3e\xee\x11\xf6\x77\x32\x14\x70\xb7\x47\x0d\x00\xa6\x6d\x7e\xf7\x4d\x6c\x58\x7f\x53\x7b\x87\x23\x9c\xa6\x2f\x71\x7d\x84\x1e\xf2\x6e\x14\x43\x21\x8b\x8f\xdb\xe9\x6b\xeb\x10\xfb\x14\xf5\x80\x91\xbf\xe5\x33\x94\x5a\xe9\x7d\x0c\x70\x13\xef\xe6\x1d\xf2\x60\x42\xa5\xf7\x70\x7d\x79\x39\x08\x7c\xea\xeb\x44\xd9\x2d\x16\xc8\x02\xb3\xad\xaa\xec\x2e\x65\x67\xcf\xbe\x61\x9d\x8d\x01\xdf\x27\x93\xdd\x29\xa2\x2f\xe7\xad\x29\xe2\xee\xe7\xed\x96\x08\x14\xde\x82\x68\xc1\xba\xc1\x2a\x41\x8d\x3c\x27\xae\x26\x17\x40\x1e\xd3\x70\x39\x83\x60\x39\x4f\xc3\xcd\x8f\x16\x4c\xd9\x88\x22\x47\x8a\x28\x17\x75\xed\xfc\xe2\xd8\x4c\xd2\xc7\x4e\xa3\x54\xdb\x04\x2c\xd6\xe8\xad\xe4\xb1\x93\xb4\x6d\x60\xaf\x09\xb5\x67\x15\x4e\x80\xa9\x51\xbc\xfe\x92\x33\x1a\x62\x9b\x15\xb5\x6b\x33\xae\x45\xec\xa8\x65\x07\xe6\x9f\x00\x7d\x1a\x73\xc4\xb9\xfc\x2f\x83\x4d\x77\x82\x5d\x57\x0e\x63\x5a\xfc\x74\xb9\x75\x7c\xb8\x01\xb7\x5f\x77\xb4\xe6\xdb\x25\xcb\x94\x6a\x9d\xf6\xdf\x62\x2f\xc3\x65\x2d\x8a\x95\xd1\x72\x2f\x79\x76\xf2\xfb\x7d\xf2\x27\x00\x00\xff\xff\x38\xd5\x71\x30\xd4\x0a\x00\x00"), }, "/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/variables.tf": &vfsgen۰CompressedFileInfo{ name: "variables.tf", @@ -3033,9 +3033,9 @@ var vfsgenAssets = func() http.FileSystem { "/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/ingress.tf": &vfsgen۰CompressedFileInfo{ name: "ingress.tf", modTime: time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC), - uncompressedSize: 1605, + uncompressedSize: 1589, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x92\x4f\x8f\xd3\x30\x10\xc5\xef\xfe\x14\x4f\x86\xeb\x96\x2e\x2d\x12\x97\x5e\xe0\x02\x12\x42\x7b\xe8\xdd\x72\x92\x69\x13\xad\xb1\xc3\x78\xd2\x6a\x59\xf5\xbb\x23\xc7\x69\xe4\x20\x84\x10\xda\xe5\xb4\xbe\x79\x9e\xdf\xfc\xf9\x79\x98\x62\x18\xb8\x26\x68\x7b\x8e\xc6\x55\xc6\x75\x51\xc8\x13\x6b\xe8\xce\x1f\x99\x62\xbc\x69\x45\x7a\x8d\x47\x05\xb8\x60\x1b\x53\x59\x67\x7d\x4d\x6c\x2c\x7b\xec\x70\xb2\xbc\x72\x55\xba\x28\xa0\xe7\x20\xa1\x0e\x0e\xf3\xd9\x41\xef\x3f\xde\xe9\xa4\x05\x16\x2c\xce\x6c\x4e\x15\x4c\xd2\x95\x02\x1a\x3a\xd8\xc1\x89\xb1\xb5\x74\xc1\x8f\x75\x01\x79\xe8\xe9\x17\xaf\x3e\x04\x3e\x5b\x6e\x74\x7e\x60\xf9\x48\x62\x8e\x1c\x86\x7e\xea\x6c\x9a\xa8\x54\x56\xe7\xc0\xf7\xc4\x79\xa6\x55\xee\xf9\xa2\x2e\x4a\xfd\x2d\x87\xf8\xfc\x20\xe2\xff\x27\x11\xff\x88\xa2\xb4\x69\xe8\xd2\x98\x69\x78\xfb\x8d\x8a\x6e\x5e\x3f\xa6\x69\x6a\x37\x44\x21\x36\x49\xbc\xdc\xe4\x58\x1f\x82\x9b\x02\x8b\x2c\x0a\x38\xf5\xb5\xe9\x9a\x12\x47\x8e\xa8\x79\xa0\x71\xf0\x5d\xfa\x8e\x28\x89\xbb\x56\x25\xe7\xdf\xe0\xdd\xe1\xfd\x3a\xbd\x79\x85\x4f\xfb\xfd\x1d\x5a\xb2\x4e\x5a\xd4\x2d\xd5\xf7\x38\x04\xc6\xf4\xaf\x0a\x93\x64\xb2\x94\x31\x97\x89\x93\x3d\xb3\x2d\x72\xdf\xae\xdf\xbe\xdb\xe6\xa0\x95\xf6\x3a\xfb\x9b\x9c\xea\xc7\xd8\x5c\x2a\xfd\xf5\xcb\x87\x08\xa6\xef\x43\xc7\xd4\x40\x02\x86\x48\x88\x09\x58\x7e\xf9\x00\xeb\x1b\x0c\xfe\x7a\x93\x96\x29\xb6\xc1\x35\x71\x4c\x30\x85\xcd\x1c\x1e\xcb\x6c\x46\x6d\x36\x15\x6a\xd2\xa6\xca\x9f\xbd\x10\x9f\xac\x43\x45\x72\x26\xf2\x0b\x00\xcb\x9e\x2a\xc2\xed\x1a\x81\xb1\x59\x8f\xe6\xee\x6a\x4d\x63\xfe\xcb\x5e\xc4\xa7\x59\x8c\xf8\x6c\x9b\xb1\xdd\x6e\x5e\x56\xe3\xa9\x56\xe3\x67\x00\x00\x00\xff\xff\xca\x23\x0c\x18\x45\x06\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x92\x4f\x8f\xd3\x30\x10\xc5\xef\xfe\x14\x4f\x86\xeb\x96\x2e\x2d\x12\x97\x5e\xe0\x02\x12\x42\x7b\xe8\xdd\x72\x92\x69\x13\xad\xb1\xc3\x78\xd2\x68\x59\xf5\xbb\x23\xc7\x69\xe4\x22\x84\x10\xb0\x9c\xd6\x37\xcf\xf3\x9b\x3f\x3f\x0f\x53\x0c\x03\xd7\x04\x6d\xc7\x68\x5c\x65\x5c\x17\x85\x3c\xb1\x86\xee\xfc\x91\x29\xc6\x9b\x56\xa4\xd7\x78\x54\x80\x0b\xb6\x31\x95\x75\xd6\xd7\xc4\xc6\xb2\xc7\x0e\x27\xcb\x2b\x57\xa5\x8b\x02\x7a\x0e\x12\xea\xe0\xb0\x9c\x1d\xf4\xfe\xfd\x9d\x4e\x5a\x60\xc1\xd5\x59\xcc\xa9\x82\x49\xba\x52\x40\x43\x07\x3b\x38\x31\xb6\x96\x2e\xf8\xa9\x2e\x20\x0f\x3d\xfd\xe0\xd5\x87\xc0\xa3\xe5\x46\xe7\x07\x96\x8f\x24\xe6\xc8\x61\xe8\xe7\xce\xe6\x89\x4a\x65\x35\x06\xbe\x27\xce\x33\xad\x72\xcf\x67\x75\x56\xea\x77\x39\xc4\xa7\x07\x11\xff\x3f\x89\xf8\x4b\x14\xa5\x4d\x43\x97\xc6\x4c\xc3\xdb\x2f\x54\x74\xf3\xf2\x31\x4d\x53\xbb\x21\x0a\xb1\x49\xe2\xf9\x26\xc7\xfa\x10\xdc\x1c\x98\xdc\x0a\x38\xf5\xb5\xe9\x9a\x12\x43\x8e\xa8\x65\x90\x69\xe0\x5d\xfa\x86\x28\x89\xb7\x56\x25\xdf\x9f\x60\xdd\xe1\xed\x3a\xbd\x79\x81\x0f\xfb\xfd\x1d\x5a\xb2\x4e\x5a\xd4\x2d\xd5\xf7\x38\x04\xc6\xfc\x9f\x0a\xb3\x64\xb2\x94\xf1\x96\x89\x93\x3d\x33\x2d\x72\xdf\xae\x5f\xbf\xd9\xe6\xa0\x95\xf6\x32\xf3\xab\x9c\xea\xdb\xd4\x5c\x2a\xfd\xf9\xd3\xbb\x08\xa6\xaf\x43\xc7\xd4\x40\x02\x86\x48\x88\x09\x54\x7e\xf9\x00\xeb\x1b\x0c\xfe\x72\x93\x96\x29\xb6\xc1\x35\x71\x4a\x30\x87\xcd\x12\x9e\xca\x6c\x26\x6d\x31\x15\x6a\xd2\xe6\xca\x1f\xbd\x10\x9f\xac\x43\x45\x32\x12\xf9\x2b\x00\xd7\x3d\x55\x84\xdb\x35\x02\x63\xb3\x9e\xcc\xdd\xc5\x9a\xc6\xfc\x93\x7d\x88\x7f\xb7\x10\xf1\xc9\x36\x62\xbb\xdd\x3c\xaf\xc4\xbf\x5a\x89\xef\x01\x00\x00\xff\xff\x82\x69\x8d\x34\x35\x06\x00\x00"), }, "/lokomotive-kubernetes/aws/flatcar-linux/kubernetes/workers/outputs.tf": &vfsgen۰CompressedFileInfo{ name: "outputs.tf",