Skip to content

Commit

Permalink
Merge pull request #15018 from hakman/automated-cherry-pick-of-#15000…
Browse files Browse the repository at this point in the history 
…-upstream-release-1.26

Automated cherry pick of #15000: support multiple ConfigServers
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Jan 17, 2023
2 parents bb96747 + eab9258 commit 5fda685
Show file tree
Hide file tree
Showing 84 changed files with 199 additions and 109 deletions.
4 changes: 2 additions & 2 deletions pkg/apis/nodeup/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,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
}
Expand Down
3 changes: 2 additions & 1 deletion .../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,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: UAXdqfzh+rSvhtQvw8uApigCEUi4c9ipx/OPINA+6sM=
Expand Down
3 changes: 2 additions & 1 deletion ...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: 354orPsI7dNYmQ6/gBPyTojuACUP6YzTe5OmY4RWhYs=
Expand Down
3 changes: 2 additions & 1 deletion ...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: 9DUpZRVmc6wlDASGHOilemwB8uS48cVjaxMtHdeu8oE=
Expand Down
3 changes: 2 additions & 1 deletion ...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,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: gKUr2eAIlOb00Mm3DGrMzLGkPbi6KvX4Ncdhl3aFUso=
Expand Down
3 changes: 2 additions & 1 deletion ...ws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: QJ0L/GseJfWiVMjJ7MZk42VW6m7sjtKAKQYhuUvVf80=
Expand Down
3 changes: 2 additions & 1 deletion ...aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: QJ0L/GseJfWiVMjJ7MZk42VW6m7sjtKAKQYhuUvVf80=
Expand Down
3 changes: 2 additions & 1 deletion ...-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: QJ0L/GseJfWiVMjJ7MZk42VW6m7sjtKAKQYhuUvVf80=
Expand Down
3 changes: 2 additions & 1 deletion .../data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: UKWZN9uNOoNu0GY5xySOnj6G3yPfq8P/6ELGKZNSZDI=
Expand Down
3 changes: 2 additions & 1 deletion ...r/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: UKWZN9uNOoNu0GY5xySOnj6G3yPfq8P/6ELGKZNSZDI=
Expand Down
3 changes: 2 additions & 1 deletion ...ority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: UKWZN9uNOoNu0GY5xySOnj6G3yPfq8P/6ELGKZNSZDI=
Expand Down
3 changes: 2 additions & 1 deletion ...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,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: tgvR9fyyLyOS5bqeYs3oceXerXZ3dzd6b5J46HOS4TU=
Expand Down
2 changes: 1 addition & 1 deletion ...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ensure-install-dir

echo "H4sIAAAAAAAA/2xSwW7bMAy9+yt46a2T7bYrNqGXIcHWAGsRpF/AWIxLRBY9SnKXvx/kJu2y9WT4vSc+8pGdl+wWEnbc2wpgwIA9PSVR7GnhMUaKFpJmqjoJCTmQbnJIPJCFN8S9k65U8dL/pIm8BQ47qQAm0sgSLLTmxrTXlZNuT1qkcc/jKsSE3h999nlLa5Xfh0J3PsdEulgtNxbapjFfb01jmrptCznmDf3KFNPMDRUAD9iTBaWeY9KD2X+JhqUuNT+Nc9GpNVetac66vJpNPaViiUHCYZAcv+X0bGGHPlIx61XyuFSeSC3EQ0w0uDd8I5Is1HPHkt1aZWJXhPgS38dYPj69TnF7YxrTNn8xMiAHe/o1Xjr0FQAF3Hpa0jb3PYf+HoPzpKeVANDEXWIJ96jOwkCD6MHghOzLu7u2aR74MoijXTyDL04gl2/8rkR3ny8u5/j+k57QM20FUELr5tNZY4mqnlBrz9v6mGb9LvgnboBA6UV0v/a55/CI8zkFrgBGcauwU1ycLmr18UpHzJHstbl9ffOAgXcU07ETSt3sroESxXo4smUXr4VIn7pncnme8i3O+JyTk5fwQ7GjNSmLs3DdxI+phXLiDv1aXCx7jdUfAAAA//8BAAD//1htlDFOAwAA" | base64 -d | gzip -d > conf/cluster_spec.yaml

echo "H4sIAAAAAAAA/6yUS4+qSBTH934K9ua2iIpg0osDVSDaIC/h0jvE4qE8ioeWmvnwE+1JbiZzM5lMuha1+P9zfouTX45aNpej3TXX4ki6FRezfqQ2dVpkHumupFuNOE4FlXRDkRZJPJB+xf0x4jiO+/F8CtYNi1Ox6xuaoYKPX+mrNw1DOZxUFdwiA2YokBmmRsFqFSRZHpIE2Hsm8LrqtbpnHGbIwYrK9mAq2U07wf4FUTIrUMD0UThMoyq4H6qA//xpDpGA2TpPLPOEmfWAmYkStkPAwmf2+JW9IK/iBJHpRkyDCAWOgzCbdsdwUybVojzqweMjtHJTYww50WbbfBr5NbHAwYriAHpBPAbMg40ClmbMHh3vn6Vz14fSlZ1Skz42uzJ0JHEqXvVZZMdCC5mxDObNlqUBfzey6QtyGsZrMZ3bE3a2wfZtP3WpbNylZo2xxngVGAaILdXEwFAWocDlbXDWEwUcBBnWvxYLkg7T/REzrEyYo5lgKpBKbO28BnaKEmHN0meP4OQnH+WGoX4zn2xlFCy3Tb6HvyD/3DzwGBTpyM/SSGDLcEvTnSC3hiAv6EVQ50ksQxHoO5p5ifSCDJXTt2KX3IaZP+4OC0m2g+HBV2ySbP3b7ixma0FV1fF9nd4F9v7+yxtsod9b83+tulZezO+gjKqf2++1yjeF31v1LL7NKlMTtXn8eaSEd/f0fj/HCg3Zp1qzQ5rmkb5j47QX3ePHZd8uHdWqNtUEt8sXJAx3j8KMUGHI3iEpKRqLTrHhrRluKQ3232jVh1FREdyTjWAt1rkx7pMwGGaOfKj/1arACW4Lcz9cwCDEvthys5jeBuoLnqhd00LazA31VpdfasrKco+ES58ngWYPMWk+ZD29SHE0324U0rbZojmV87Zyaz8//Rer+q9LxuXDQPvVZHJuaP8jaeqha8qSdG9FPZCujsu3pKloR/r+jdziipbkGaxmsiRNRkbdD3GdEL1rLtSKK7Li6uZI+r8XblOSFWc1RzJ6fhf6dUrXcZ+vOKXTbrLrfqbN4zwupp4t3yfzbq5hTSeP887OaaOh+MovbOd99CcAAAD//wEAAP//IrnY75cFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
echo "H4sIAAAAAAAA/6yUS4+qSBzF934K9ua2iIpg0osqqkC0QV7CpXeIxUN5FA8tJfPhJ9KT3EzmZjKZNAsW56R+i39+OUpR385WW9/zM2k3XMS6iVJXSZ66pL2TdjPhOAUopO3zJI+jnnQb7o8Jx3Hcj9cHsaabnIIdT1d1BXh4TMfe0HV4uigKcPIUMB2CVDdUCswGIsl0kSSAo2sAXlPcRnP10wLZGCrsCAyYPtQLOI4QmJo+BIaHgn4elv7zVPr850+jDwXMtllsGhfMzAEsDBSzAwIseGXDr2yEjMUFhIYTMhWEyLdthNm8PQe7Ii5XxVnzh4/AzAyVMWSHu339qWf32AQ2htAGaIS4DDAX7CAwVX0xtLx3la5tF0h3dkkMOuwORWBL4ly8a4vQioQGpPraX9Z7lvj8U0/nI+TST7disrRm7GoBy7O8xKGy/pTqLcYq4xXAMACRqRgYMJSGyHd4C9jbGQQ2AinWvg4LJA3Mj2fMMJwxWzWAAUEisa09PjhAGGLV1BaDf/Hij2LHULdbzvYy8tf7OjuCvyD/vDzgMYDSmV8kocDWwZ4mB0FudEFe0ZugLONIBrmvHWjqxtII6Uu7a8Q2fvQLb9qeVpJs+f3Al2wW773H4SqmW0FRlOlzmzwF9v7+yxtsot9b83+tupduxB9AEZY/999rlWcIv7fqVXybVYYqqsvo80wJ7xzp83mNIA3Yp1KxU5JkoXZg06QTnfPH7disbcUsd+UMN+sREgSHITdClOuye4oLiqaine94c4EbSv3jN1r1oZdUBM7FQmArVpk+7eLA7xe2fKr+1Srf9h8r49jfgE6IdbPkejV/9NQTXFG9J7m0W+rKoyq+1JTh+oiEW5fFvmr1Eak/ZC25SVG43O8gaZp0VV+KZVM6lZdd/otV3bhk3WvKfnBZ39NuM5tda9r9iOuqb+uiIO1bXvWkraLiLa5L2pKueyOPqKQFeQWbhSxJs4ledX1UxURr6xs1o5JsuKo+k+7vhVMXZMOZ9ZlMXr8b/drTbdRlGw626kN2nM+kHq7TfO5a8nO2bJcqVjUyXA9WRmsVRXd+Zdnvkz8BAAD//wEAAP//iSZHf5wFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml

download-release
echo "== nodeup node config done =="
Expand Down
3 changes: 2 additions & 1 deletion ...cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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: cPB7xe/jlGjsPr0RVNbD4+kgsaZ2L7gBA+0MRKukLAw=
Expand Down
3 changes: 2 additions & 1 deletion ...update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: W8uT9A2ihqTlOR5YC7ISEHGboF8gSu9FXWGPJoDtzFo=
Expand Down
3 changes: 2 additions & 1 deletion ...integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: wWT9EiYKoQeIFOPA+amRF5Qa6HkRVJDsCxUCoQJtDe4=
Expand Down
3 changes: 2 additions & 1 deletion .../update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,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: t1TG9fUtjlCD8/C+cRe88w3kNJffjnRJTzaXGIigpDM=
Expand Down
3 changes: 2 additions & 1 deletion ...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: mnp2MLDRov22hzqoIxiOlA7wZnbSjpM4oG8b7unAEKc=
Expand Down
3 changes: 2 additions & 1 deletion ...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: taQDoa0zPYNt30mJud2E22Nfs1P64teuWXrXAzbft+Y=
Expand Down
3 changes: 2 additions & 1 deletion .../update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: 9DUpZRVmc6wlDASGHOilemwB8uS48cVjaxMtHdeu8oE=
Expand Down
3 changes: 2 additions & 1 deletion ...te_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: 9DUpZRVmc6wlDASGHOilemwB8uS48cVjaxMtHdeu8oE=
Expand Down
3 changes: 2 additions & 1 deletion ...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: iJKilqxspeP23hRmmEoE/6ub0cjhfIb1+5ckx058i1w=
Expand Down
3 changes: 2 additions & 1 deletion ...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: h56pkdr1ej3jJeZ6c5PIpWzoeD7gVmScreR2lYP8KnY=
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: 8xJbQ/1qdMUkDAZ6qr/1Kyr/mKGEL+izahwlfPuH3Ns=
Expand Down
3 changes: 2 additions & 1 deletion ...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: IHO6KSpxg9YKk+lZmU1JCzt4UTtxzLByi8QIZKl3rO8=
Expand Down
3 changes: 2 additions & 1 deletion ...egration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,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: 9DUpZRVmc6wlDASGHOilemwB8uS48cVjaxMtHdeu8oE=
Expand Down
3 changes: 2 additions & 1 deletion .../karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,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: yjSJlUE+YEZxlDQkVJYA5dyaCJVxDhA9jtsDjr+cJMo=
Expand Down
3 changes: 2 additions & 1 deletion ...data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,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: pQ7hJCc1EVgw/8PnPIbipBEaEz2llWBzH0F3JMb/G5c=
Expand Down
3 changes: 2 additions & 1 deletion ...ion/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,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: IeXU8cl2j4sCIpaJxU/EDktEXTaovewa0n/1h+Tn2Zo=
Expand Down
3 changes: 2 additions & 1 deletion ...cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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: StHv+qpx858FKDjhOvBiUb8qwTOAWTfMhbqDAtzlres=
Expand Down
3 changes: 2 additions & 1 deletion ...uster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,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: EZsRx9eUd34dX9q0SKj1DeCg3vjsdghVdhOPoGmWemM=
Expand Down
3 changes: 2 additions & 1 deletion ...uster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: R12402VEkJj6Lh8YE0FnJy1rQn3qalbDfmETC9Z4DQ4=
Expand Down
3 changes: 2 additions & 1 deletion ...uster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: norQE/3KAbUmZq5eTSPvPxIOH6+nqr0O5Bknhr3taPw=
Expand Down
3 changes: 2 additions & 1 deletion ...uster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: QMwzHqOErUDY7a0j4oN1YWudOMlQ9y9eRCd+FT590k0=
Expand Down
3 changes: 2 additions & 1 deletion ...date_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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: StHv+qpx858FKDjhOvBiUb8qwTOAWTfMhbqDAtzlres=
Expand Down
3 changes: 2 additions & 1 deletion ...e/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,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: V+T+VdELvz6dFyPqeGiSFh0E/VVSt/8bt7BwiOho7uQ=
Expand Down
3 changes: 2 additions & 1 deletion ...n/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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: 8Qw7UOUVg9x5snrAQb/kgYryIF3wYDM8hh5AI/LIfq4=
Expand Down
3 changes: 2 additions & 1 deletion .../update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,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: +WIb7SuQ+SPolK3izf2eIefJd6xe5D6UA43uG/VRxZ4=
Expand Down
Loading

0 comments on commit 5fda685

Please sign in to comment.