diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index a8958e2401..d06e5091d4 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -131,8 +131,8 @@ type BootConfig struct { } type ConfigServerOptions struct { - // Server is the address of the configuration server to use (kops-controller) - Server string `json:"server,omitempty"` + // Servers are the addresses of the configuration servers to use (kops-controller) + Servers []string `json:"servers,omitempty"` // CACertificates are the certificates to trust for fi.CertificateIDCA. CACertificates string } diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index ed75464869..3c9c233ec9 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.additionalobjects.example.com:3988/ + servers: + - https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: tfuA/yOBMkyzUdOFQ2VxWd9NyI0JunojL3USA1fxHCg= diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index bc39008561..c7bd6ece66 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: PM8Y1FJ/6915C2+4h//2DzB9CM8oJebCI+1J3/NJmU8= diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index e9b8dd84ec..0e31789006 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -181,7 +181,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.bastionuserdata.example.com:3988/ + servers: + - https://kops-controller.internal.bastionuserdata.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: N/pJos50pVcwxPEi8Z3SrfaDDApcVuNkblQj+4RMzuE= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data index c9d16c3c50..69a53f80d9 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node NodeupConfigHash: cGtBqK5f+RAxLPyujkiWJttEzrQnU9JzQEj737PpOqk= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data index 57bd7868ba..756e4e8bc2 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node NodeupConfigHash: cGtBqK5f+RAxLPyujkiWJttEzrQnU9JzQEj737PpOqk= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data index 6cd3ba93a5..707e6abd5a 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander-custom.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: cGtBqK5f+RAxLPyujkiWJttEzrQnU9JzQEj737PpOqk= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data index 1cef02de34..5a55f32217 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-high-priority InstanceGroupRole: Node NodeupConfigHash: yBtqwhREt1OMoB+lmrBjIOqhMc40VMXQNeFknWx41Bw= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data index 4bed4eca16..5bb6d57451 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes-low-priority InstanceGroupRole: Node NodeupConfigHash: yBtqwhREt1OMoB+lmrBjIOqhMc40VMXQNeFknWx41Bw= diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data index 2979cb01c6..c80900c19e 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.cas-priority-expander.example.com:3988/ + servers: + - https://kops-controller.internal.cas-priority-expander.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: yBtqwhREt1OMoB+lmrBjIOqhMc40VMXQNeFknWx41Bw= diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 9f4e44c5ad..75941e0a13 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -181,7 +181,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.complex.example.com:3988/ + servers: + - https://kops-controller.internal.complex.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: H76jvTyml9tKO7xFcI5e14zp+Qxvz+Ai+Lp4Uaf9hEk= diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 4903bb415c..42600ee2c7 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -133,7 +133,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2IQeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeY9eUpFhUHCaZAc73I6GOjRR6oAOqeSjyvlkdRAPMVEg32e/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv65mPd1ov2FZEBOZj5WHvppkUKuPe0on12joN7wGA96RwdgEbuEkt4QLUGBhpETzWOyL7s3S7adsNXQSz18c34ch5y+cYvSnT76fKKB3T/S+fpG20F0BOmrHSPiWJ5PoDlbr1hp1gi3f3eGbgoOS8mtg4/lWjrs+PCfgUlx+Wyr1Sli24qbYulgWZEbTzvm3NJzYugAvDivtFI3sCHCuAodh16xaWEhBxI1yW2gScbPdWPn2PN0hwxRzLX9c3TzgYD9xTT2ZBSN5looESxGc40FrFKoi59LcyvqMfs00sT82123YFsnh7vmcVDTlb+hHvFjrakLNbAdRvfR0vlxB36rdhYfpdY/QMAAP//AQAA//+ifSCJzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6yUTY+qSBSG9/4K9uZeERXBpBeHokBUEASh6R1i8SUfxYeWmvnxk7YnuZnMzWQy6VrU4n1znsXJk4PK5nq2u+aWn0m34iLWj1BTJ3nqku5GutWI4xAg0g15ksfRQPoV98eI4zjux+dTsG5YHMIHz9AMBB5+pa/eNAzlVCAEhzwFZiiQGqZGwWoVVbJcVRLg6JrA68htddc4zVQHK4gdwVTSu1bA8QVRUstXwPTUYJiGlf84VT7/8W4OoYDZOosts8DMesLMVGO2V4EFn9nzV/aCvIoCQvMQMg1C1XccFbNpdw42ZVwtyrPuP3eBlZkaY6oTbrbNh5HdYgscrCgOqC+Iy4C5sFHA0ozZs+O9i3Tp+kC6sSIx6XOzLwNHEqfiTZ+FdiS0kBpLf95sWeLzDyOdviDFMF6LydyesIsNtmd7yYHKxkNq1hhrjEfAMEBkIRMDU9NQ9Q+8Dc56ooCjQor1r8WCpMP0eMYMKxPmaCaYCiQSWzuvgb2ihFiz9NnTL7x4V26Y2m/mk62s+sttkx3hL8g/Nw88BkU687MkFNgy2NJkL8itIcgLehXQPI5kyH19T1M3ll6QoXL6Vuzi+zDzxt1pIcm2Pzz5ik3irXffX8R0LSCExo918hDY29svb7Cl/t6a/2vVrXIjfg9lWL1vv9cqzxR+b9Vn8W1WmZqozaOPMyX84Ugfj0uk0IB9oJqdkiQL9T0bJ714OO+ux3bpIKvaVBPcLl+QINg/czNUc0N2T3FJ1bHo5BvemuGWUv/4jVbtjIqKcChsFdZinRnjPg78YebIp/pfrfId/74wj8MVDELsqy03i+l9oJ7gitotyaXN3ED3uvxSU1aWR1W49lnsa/YQkWYn68lVisL5dqOQtk0XTVHO2+pQe1nxX6zqvy4Zlw0D7VeTyaWh/Y+4qYeuKUvS/czrgXR1VP6Mm4p2pO9/kntU0ZJ8BquZLEmTkVH3Q1THRO+aK7Wiiqy4ujmT/u/FoSnJirOaMxl9flf6dUrXUZ+tOCH2lw4Ckj3K5Qk9PUlrMKnXerN9irWnvaNpt2x9KLwd/zb6EwAA//8BAAD//7AdRqeXBQAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/6yUzY6ySBiF914Fe9MtoiKY9OKlKBAVBEFoeodY/Mk/aKmZi59IT/JlMl8mk0mzYHFO6lm8eXJQXl3PZlvd0jNpV0xAuxGqyiiNbdLeSLsaMQwCRNo+jdIw6Em3Yv4YMQzDvL0+CauawSB8cDRFQ+DgIR16XdOkU4YQHNIYqCZBrOlKDUYjyYJhywIHR1sHVkV2o9raaSZbWEL0CLoU35UMjgNEig1XAt2RvX7qF+7jVLjs16fe+xym6yQ09AxT4wkzXQ7pXgbqvbLnr2yADEUGvn7wqQK+7FqWjOm0PXubPCwW+Vl1nzvPSHSFUtnyN9vqS0tuoQEWliQL5AFiU6A2bCQwFG32bFnnIlzazhNuNIv0+rnZ554l8FP+ps58M+AaiLWlO6+2NHLZhxZPB0jWj9d8NDcn9GKC6ZhOdKhF7SFUa4wVyiKgGCAwkI6ByrEvuwfWBGs9kcCSIcbq92FBUGF6PGOKpQm1FB10CSKBrq3hwV6SfKwY6uzpZk64yzdU7jbzyVaU3eW2So7wF+SflwcWgySc2Vnkc3Tpbetoz4mNxomL+sqheRiIkLrqvo7tUBggfWF1Dd+G937mjNvTQhBNt3+yBZ2EW+e+v/DxmkMIjR/r6MHRj49f3mBD/r01/9eqW2EH7B5yv/jc/qxVjs793qpX8WNW6QqvzIOvc03Yw7F+PC6BVHv0C5X0FEWJr+7pOOr4w3l3PTZLCxnFppjgZjlAPG//THVfTjXRPoV5LY95K92wxgw3de0ef9CqnVbUPBwyU4Y1XybauAs9t59Z4qn8V6tcy70v9GN/BY0Q82qK1WJ672uHs3nlFqXCZq6he5l/qylKy6PMXbskdBWzD0i1E9XoKgT+fLuRSNPEiyrL501xKJ0k+y9WdcOSda8pe2OSvq+71WRyqeruLazKvq3ynLTvadmTtgzy97Aq6pZ03Tu5B0Wdk1ewmomCMBlpZdcHZUjUtrrWRlCQFVNWZ9L9vThUOVkxRnUmo9fvWn/v6TrokhXDhe7SQkCSR748oacjKBUm5Vqttk++dJRPNG2XjQuZs2M/Rn8CAAD//wEAAP//G4LZN5wFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data index 144bf9baa2..b9939fff7e 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.containerd.example.com:3988/ + servers: + - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 28eu6oLLtNLHh8ifWYRtZ6hLKA09BVkcQgcL3VhQs4Q= diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data index d4ce05f01a..135cc2eb1d 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.containerd.example.com:3988/ + servers: + - https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: kQ/OlNIxa47o9baxKMADT7lcXjJ5Fqsuxs6YQmKtWh8= diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index 030fb754f9..2fa881839a 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.123.example.com:3988/ + servers: + - https://kops-controller.internal.123.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: KvDCW8MkojJdVvfrDaDAj/O2mkpPw0aHIJ14UNcQVRk= diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data index 7aa706415a..d333b9b780 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.docker.example.com:3988/ + servers: + - https://kops-controller.internal.docker.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: lXjOhQ54DnLh9GMpqJEP++MyCzavR6vCCF0QJ5r0Kps= diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index 5a7b3c61a0..756399bbc2 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.existing-iam.example.com:3988/ + servers: + - https://kops-controller.internal.existing-iam.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: S/3Nqwwl9YgL1WXsx8yrXCBE5Po1+Liulb75NjUiVcI= diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index 4871f2c04f..bda6df376a 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.existingsg.example.com:3988/ + servers: + - https://kops-controller.internal.existingsg.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 3JpXZx3rmEtK0tSs0O5YgV7jjpX21EdViprcr679M8k= diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index 4635491e52..e98d89b88a 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.externallb.example.com:3988/ + servers: + - https://kops-controller.internal.externallb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 5OxCo715QEsf3Rn++NsAa/sU/0MU+bmD8065nUBoDdY= diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index 7d0d2f614a..d4462653b3 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.externalpolicies.example.com:3988/ + servers: + - https://kops-controller.internal.externalpolicies.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: tqw1zCQDzY8KXE5XDYAYmD7Gczh2tGJcwhw1nNCPQ58= diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index 67d186404d..28c1c7afb7 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.ha.example.com:3988/ + servers: + - https://kops-controller.internal.ha.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 568Hd+dPvHIXOeBJ2dVK+PYCQRY/X8W6gC1Fjfic6N4= diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index 7b020a53e3..66e2b5a61d 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.ha-gce.example.com:3988/ + servers: + - https://kops-controller.internal.ha-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: B7T/kjXB6yq2BSoSjVWaalbc6Wf83tbd9zLhH9uf06k= diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data index b954e73086..ab1087a94e 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-default InstanceGroupRole: Node NodeupConfigHash: o0diSFjIDNcz67+EB4ILRbjMf/sVSBiv98QdC/ZSohQ= diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data index 51c978a10e..8f46ca9e0c 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-single-machinetype InstanceGroupRole: Node NodeupConfigHash: 6j6Ptwcf8KYMX6Lr+aGcvazdWY8ZWWsT/pS5QXtbP8E= diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data index 04727e0c81..9024f17ecb 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 47fLGpJEds7vMoKgAvWwROABOdfdBk9QzqONtlyvxfg= diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index dae82befc2..db4ac3dffe 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: /Af6O4J/G2gxaz9+e2+5oDcG9bNHh7BlNkf4gc7CTIY= diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data index dc49ee133e..e73ad3f441 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: LydBgwjH3ppGRlmv2uWSCPJcAq9rqG/xrdCBT2NBg/0= diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data index 1066daa6d2..93e0fa3941 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: EYR6yR9WHjmZe6MDb4XCLtGxgZRelx+9kk+wlC47K8E= diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index 0d79ca7c00..649b0f23a5 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: t6fCt+evvJgP/R528vydyS8SE3mSBMslwDJKKWvl0iY= diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index 2e887726bb..b4bf068106 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: OScebhz+leZP0LjXCFTSypYJ066ObcCEwrpBO1mpPt4= diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index dae82befc2..db4ac3dffe 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: /Af6O4J/G2gxaz9+e2+5oDcG9bNHh7BlNkf4gc7CTIY= diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script index f9e2dd0605..6c7bf10703 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: On1XuT0uh7IFc6anmxeZkxAI7mpfQrhl8p84QgfUZW8= diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index dae82befc2..db4ac3dffe 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: /Af6O4J/G2gxaz9+e2+5oDcG9bNHh7BlNkf4gc7CTIY= diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data index 6392459db5..9c64847ff1 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: p2F8jMcKt3HITE2ZxT6dre1t3upUBrv7c76Q2sbpRgc= diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data index af1b093251..3092b72d85 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: VcVRUZsvg3bdUNaGaeKoVl1oo//ilqT0SCasewFWw7U= diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index b0e9ac88bc..654f4518ac 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: ufCuuCn2m/1d3HW81k2MY8OK1/wGCu5pQBPqxiLob44= diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index c25fd38347..6ae580149a 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: VH8E2DKbz1Il9kp1yOsvIxcabuUmLZm0KSbb/vgDipA= diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index c25fd38347..6ae580149a 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: VH8E2DKbz1Il9kp1yOsvIxcabuUmLZm0KSbb/vgDipA= diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data index f5798d20f0..af442fb5af 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-etcd.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-etcd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: UvKs2WJgcZpTfWkN8SlW8MoxgLecRuChNJzqh+HOx9g= diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2ab0bdbdce..ab38940752 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Q8VgsDMEKqDvY/fOlkvJtWF2uaCLDTUuF9Y7VtCx3ns= diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2ab0bdbdce..ab38940752 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Q8VgsDMEKqDvY/fOlkvJtWF2uaCLDTUuF9Y7VtCx3ns= diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2ab0bdbdce..ab38940752 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Q8VgsDMEKqDvY/fOlkvJtWF2uaCLDTUuF9Y7VtCx3ns= diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2ab0bdbdce..ab38940752 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Q8VgsDMEKqDvY/fOlkvJtWF2uaCLDTUuF9Y7VtCx3ns= diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 0e711077f9..1bb415cbc7 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: I21t1ZRscjlaxM5sO+cwKotjvGJJbdAbYlenxHNM5rc= diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 0079eb8c6a..9ce0b8bb97 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-warmpool.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-warmpool.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: q62PU8BOS8rnHpl/cl0zUcUa+fUlhmkkADivn7xzjxs= diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index c800aa4319..58de046fac 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -171,7 +171,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 15AzVRU05kgNuvpesLC7clsaWfRDPP8Nb2+fHAwcg5o= diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index a845d1c2d6..4f1ec207af 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: UElV9KXG/Dqn6qCP4TMxyFnrvKF03CIJ6Yeg8bJhDGE= diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index a845d1c2d6..4f1ec207af 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: UElV9KXG/Dqn6qCP4TMxyFnrvKF03CIJ6Yeg8bJhDGE= diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script index 191b152d73..a4a70c602c 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 99UOEesNDAFp+Bo6/bFaaKYNHWHNJ4M3kuyyYwN+970= diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index a9208f8cb8..d5e8f34f68 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: FvwJPFtazFAcJKhNfrymwm5SFKM2OJ2sFixBH9/8p/8= diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index a9208f8cb8..d5e8f34f68 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: FvwJPFtazFAcJKhNfrymwm5SFKM2OJ2sFixBH9/8p/8= diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index e61648289c..58e8884adf 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -169,7 +169,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-gce-private.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-gce-private.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: U0pFotzJtKzv6lAlzetu+MSUfylh1U0aK8D86dS5cRA= diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data index 9d9b6e60d5..26c9716294 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data @@ -168,7 +168,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes-fsn1 InstanceGroupRole: Node NodeupConfigHash: 7DOVv3j0NWgow1dTZJczqC49UWD9RYwRdA8Y0wOUyRc= diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 30248a273f..5b86f78eda 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.mixedinstances.example.com:3988/ + servers: + - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: vBLeOTl5NDPboT+mvrnM8cB7Vw/cQ89iGTIX4H1iunk= diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 30248a273f..5b86f78eda 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.mixedinstances.example.com:3988/ + servers: + - https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: vBLeOTl5NDPboT+mvrnM8cB7Vw/cQ89iGTIX4H1iunk= diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index b3896461c3..865638854b 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ + servers: + - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: cwGmeFg9W4yjgo0pOzb/cCiQg1FJxLASQWqZ/Ij+/5Q= diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index b3896461c3..865638854b 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ + servers: + - https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: cwGmeFg9W4yjgo0pOzb/cCiQg1FJxLASQWqZ/Ij+/5Q= diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index bfb6a82d80..36ec1f5138 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: sGK/+VG+buXoXpO5K7950RZS/9VLADql0Y2QubFKpiY= diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index 7e768ca318..c856eb2215 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.private-shared-ip.example.com:3988/ + servers: + - https://kops-controller.internal.private-shared-ip.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: l19RjOfJKAKKzR75Hh0vE6wmPxPIWxP9cl8bxoWhnY0= diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 07c66429b4..c010a69123 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.private-shared-subnet.example.com:3988/ + servers: + - https://kops-controller.internal.private-shared-subnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: uCAL1G4Lpy6a79e5Qz+rmWFyZeTahiHEByPUYFrB2sQ= diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index 7bd6489511..a87a623719 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatecalico.example.com:3988/ + servers: + - https://kops-controller.internal.privatecalico.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 59lRlh6ogHMsNzMuS175MEVpoXB3xr3/I9PjuJ2Sd6I= diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index 025217bc46..e6132c409c 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatecanal.example.com:3988/ + servers: + - https://kops-controller.internal.privatecanal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 6HKIxUTfFSQukLCDT+b4C7+o34UTBDdR8uOE03hbK3Y= diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data index b3df3966b3..4d6a8c8ad3 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatecilium.example.com:3988/ + servers: + - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: InmgPTpS8rrk+Olxlq0Y+UxuMzIPGiujCchrPg64BeA= diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index b3df3966b3..4d6a8c8ad3 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatecilium.example.com:3988/ + servers: + - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: InmgPTpS8rrk+Olxlq0Y+UxuMzIPGiujCchrPg64BeA= diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index a9877adb8b..6db0244fe6 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatecilium.example.com:3988/ + servers: + - https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: pUlOOYjrUm8skHYc2cnpCgbdt9rQRyDbIbYN+4miMlI= diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index fff7c8a29c..61753149c6 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privateciliumadvanced.example.com:3988/ + servers: + - https://kops-controller.internal.privateciliumadvanced.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: eKMQWhsXPBNi5QGiAMeSHyO71lYVJTqldFAHDSyiQeE= diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 62f751927c..c94b1dd82d 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatedns1.example.com:3988/ + servers: + - https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: oYV8LT5x7i8MT0AWtmm4LyCDVwtX+cdkxwIZ9avnF0w= diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index 3a86e0ea12..95beb6d4fc 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatedns2.example.com:3988/ + servers: + - https://kops-controller.internal.privatedns2.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: LAtcm0ymNugi5hJDXj1UE961QBtx6mPjOJdWScuj0LQ= diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index 6b419ded54..36401b1391 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privateflannel.example.com:3988/ + servers: + - https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: 1B99QKFoKr8NweUPwskNxwzrdS6QY/6HrahZ3aj+wE4= diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index f3113990b4..8b917831cb 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privatekopeio.example.com:3988/ + servers: + - https://kops-controller.internal.privatekopeio.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: YXyoGFvAkyB2PyhTn5UBx0H8LHZwWl9LRAusKAJD9W8= diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index b6ca14226d..9fff8c30b7 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -173,7 +173,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.privateweave.example.com:3988/ + servers: + - https://kops-controller.internal.privateweave.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: vDMj9RmNsZDdMNVWrnE6pT08AtL8Amjv5suA1ysIzAQ= diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index 502bbd06f3..5771b39ba4 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: /lb9e4lZCH1ykFkZwxhcLuZ+KF8/8WDUROMSmWYK6Ro= diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index a12439b6c9..35bd508f1d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.sharedsubnet.example.com:3988/ + servers: + - https://kops-controller.internal.sharedsubnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: x5r4RiynO3DbMf/Zf3hSYhVYxFxsnO4rx8EbJgUu3QQ= diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index 40480c5394..d663863fa8 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.sharedvpc.example.com:3988/ + servers: + - https://kops-controller.internal.sharedvpc.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Wm0/+1HXu7goSssJBZUK8c2wNxzRMo/QAC+EC5E3ELk= diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2ab0bdbdce..ab38940752 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ + servers: + - https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Q8VgsDMEKqDvY/fOlkvJtWF2uaCLDTUuF9Y7VtCx3ns= diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index e290d084c9..0a8a1e2865 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.unmanaged.example.com:3988/ + servers: + - https://kops-controller.internal.unmanaged.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Rw5FH6iJadkWk13CIZhKsZM0Y975IcJFHOtHgcfW6cQ= diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 28a3252c71..c88ca7d2e2 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -172,7 +172,8 @@ ConfigServer: MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA 9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw== -----END CERTIFICATE----- - server: https://kops-controller.internal.minimal.example.com:3988/ + servers: + - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node NodeupConfigHash: Ew8gyCkRILHViMg0lw7OGtUQx8lyqHfx2z90DBIjwCo= diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 5dd2335c8c..3c97da719f 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -1424,21 +1424,21 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit useConfigServer := apiModel.UseKopsControllerForNodeConfig(cluster) && !ig.HasAPIServer() if useConfigServer { - host := "kops-controller.internal." + cluster.ObjectMeta.Name + hosts := []string{"kops-controller.internal." + cluster.ObjectMeta.Name} if cluster.UsesNoneDNS() && len(bootConfig.APIServerIPs) > 0 { - host = bootConfig.APIServerIPs[0] // TODO: how we could support array? + hosts = bootConfig.APIServerIPs } - baseURL := url.URL{ - Scheme: "https", - Host: net.JoinHostPort(host, strconv.Itoa(wellknownports.KopsControllerPort)), - Path: "/", - } - configServer := &nodeup.ConfigServerOptions{ - Server: baseURL.String(), CACertificates: config.CAs[fi.CertificateIDCA], } - + for _, host := range hosts { + baseURL := url.URL{ + Scheme: "https", + Host: net.JoinHostPort(host, strconv.Itoa(wellknownports.KopsControllerPort)), + Path: "/", + } + configServer.Servers = append(configServer.Servers, baseURL.String()) + } bootConfig.ConfigServer = configServer delete(config.CAs, fi.CertificateIDCA) } else { diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index 3120191ea0..ead9ab3f98 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -37,6 +37,7 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/kms" + "go.uber.org/multierr" "k8s.io/klog/v2" "k8s.io/kops/nodeup/pkg/model" "k8s.io/kops/nodeup/pkg/model/networking" @@ -112,8 +113,8 @@ func (c *NodeUpCommand) Run(out io.Writer) error { // If we're using a config server instead of vfs, nodeConfig will hold our configuration var nodeConfig *nodeup.NodeConfig - if bootConfig.ConfigServer != nil { - response, err := getNodeConfigFromServer(ctx, &bootConfig, region) + if bootConfig.ConfigServer != nil && len(bootConfig.ConfigServer.Servers) > 0 { + response, err := getNodeConfigFromServers(ctx, &bootConfig, region) if err != nil { return fmt.Errorf("failed to get node config from server: %w", err) } @@ -722,8 +723,8 @@ func seedRNG(ctx context.Context, bootConfig *nodeup.BootConfig, region string) return nil } -// getNodeConfigFromServer queries kops-controller for our node's configuration. -func getNodeConfigFromServer(ctx context.Context, bootConfig *nodeup.BootConfig, region string) (*nodeup.BootstrapResponse, error) { +// getNodeConfigFromServers queries kops-controllers for our node's configuration. +func getNodeConfigFromServers(ctx context.Context, bootConfig *nodeup.BootConfig, region string) (*nodeup.BootstrapResponse, error) { var authenticator bootstrap.Authenticator var resolver resolver.Resolver @@ -765,22 +766,31 @@ func getNodeConfigFromServer(ctx context.Context, bootConfig *nodeup.BootConfig, client := &kopscontrollerclient.Client{ Authenticator: authenticator, Resolver: resolver, + CAs: []byte(bootConfig.ConfigServer.CACertificates), } - u, err := url.Parse(bootConfig.ConfigServer.Server) - if err != nil { - return nil, fmt.Errorf("unable to parse configuration server url %q: %w", bootConfig.ConfigServer.Server, err) - } - client.BaseURL = *u - client.CAs = []byte(bootConfig.ConfigServer.CACertificates) + var merr error + for _, server := range bootConfig.ConfigServer.Servers { + u, err := url.Parse(server) + if err != nil { + merr = multierr.Append(merr, fmt.Errorf("unable to parse configuration server url %q: %w", server, err)) + continue + } + client.BaseURL = *u - request := nodeup.BootstrapRequest{ - APIVersion: nodeup.BootstrapAPIVersion, - IncludeNodeConfig: true, + request := nodeup.BootstrapRequest{ + APIVersion: nodeup.BootstrapAPIVersion, + IncludeNodeConfig: true, + } + var resp nodeup.BootstrapResponse + err = client.Query(ctx, &request, &resp) + if err != nil { + merr = multierr.Append(merr, err) + continue + } + return &resp, nil } - var resp nodeup.BootstrapResponse - err = client.Query(ctx, &request, &resp) - return &resp, err + return nil, merr } func getAWSConfigurationMode(c *model.NodeupModelContext) (string, error) {