fixes according review

kubernetes · Jan 16, 2023 · 1e9304b · 1e9304b
1 parent 9cc9bef
commit 1e9304b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go
@@ -131,7 +131,7 @@ type BootConfig struct {
 }
 
 type ConfigServerOptions struct {
-	// Servers is the addresses of the configuration servers to use (kops-controller)
+	// 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/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -133,11 +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
 
-<<<<<<< HEAD
-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/6yUSY+yWBiF9/4K9qZKREUwqcXLKCjITFE7REYZLpNXTf/4jlQnXzr9pdPpFAsW5+Q+izdPDl8248Xomlt+ibsdEeJ+xjd1kqd23N3ibjcjCB74uBvyJI/CIe53xB8zgiCIt9fHibKiE7xoOYqk8OCIUzr1mqJw54LnwcpTwAoHqaJJCPSWExjdFhgKXFsDUubtVraV80owRY7HLmhcepcKcCcIl+oeB5oj+MMyqLzHufLIr09tCCgR77NI1woR609YaUKETwJg/5U9f2UTZCoKCDQrwBIEgmeagoiX3cVXy6jalBfZex59PdMkjAUzUA/Nl5LdIh1MkeNMECaIjQHboHKgS8rq2ZHOlbl2vc/ccJFo6KmeSt9k6CV9k1eBEVItpMrWWzcHnHjkQ0mXE6QY5ns6WRsLfDXAcAwnsRCrPJhmL4oSJnnAIkCo85oIWEgDwbNIA8z9ggNTgFSUvw8LjAxL9yJikVtgU9JA4yBh8N6cHpw4LhAlXV49vcKJjqWKhV5dLw6s4G0PTebCX5B/Xh5IETjmQq6SgMJb/4CSE8W2CsVu0Ejx6yhkIffkE0rtiJkgQ2X2Ld1F92HlzLvzhmENb3iSFV5EB+d+utLpnuJ5fv7YJw8Kf3z88kbUhd9b83+tulV2SJ6gDKrPw89a5WjU7616FT9mlSbR0jr8uqCYtFz0eFxDDvn4i6/xOUmyQD7hedLT1uU4uu3W5PVKrRZiu50gvn965log5Aprn6MSCXPazFVSX4ktQp77g1YdlQrRYBWGAHu6zpR5H/nesDLZc/2vVnmmd99o7jCCEsfGaLDNZnkfkEPZtHRLckZdK/y9Lr/VZLmtK1Bjn0WeZAxh3BxZORmZMFgfVC5u23TTFOW6razayYr/YlU/LVn/mrI3IhsG1O8Wi2uD+reoqYeuKcu4e8/rIe7qsHyPmgp1cd+/x/ewQmX8CnYrlmEWM6Xuh7COYrlrRqSHVbwj6uYS938vrKaMd4TeXOLZ6zei7z3dh322I750dB7TlaW5j4Xde8fsoDKyJQ3MmDyaKKfCXL19Fp53GNyP2Z8AAAD//wEAAP//4Id3npwFAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
->>>>>>> 0b124a1067 (hack/update-expected.sh)
+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/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go
@@ -113,7 +113,7 @@ 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 len(bootConfig.ConfigServer.Servers) > 0 {
+	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)
@@ -164,9 +164,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
 			return fmt.Errorf("error parsing BootConfig config response: %v", err)
 		}
 		nodeupConfigHash = sha256.Sum256([]byte(nodeConfig.NodeupConfig))
-		if len(bootConfig.ConfigServer.Servers) > 0 {
-			nodeupConfig.CAs[fi.CertificateIDCA] = bootConfig.ConfigServer.CACertificates
-		}
+		nodeupConfig.CAs[fi.CertificateIDCA] = bootConfig.ConfigServer.CACertificates
 	} else if bootConfig.InstanceGroupName != "" {
 		nodeupConfigLocation := configBase.Join("igconfig", bootConfig.InstanceGroupRole.ToLowerString(), bootConfig.InstanceGroupName, "nodeupconfig.yaml")
 
@@ -768,28 +766,29 @@ func getNodeConfigFromServers(ctx context.Context, bootConfig *nodeup.BootConfig
 	client := &kopscontrollerclient.Client{
 		Authenticator: authenticator,
 		Resolver:      resolver,
+		CAs:           []byte(bootConfig.ConfigServer.CACertificates),
 	}
 
 	var merr error
 	for _, server := range bootConfig.ConfigServer.Servers {
-		u, loopErr := url.Parse(server)
-		if loopErr != nil {
-			merr = multierr.Append(merr, fmt.Errorf("unable to parse configuration server url %q: %w", server, loopErr))
+		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
-		client.CAs = []byte(bootConfig.ConfigServer.CACertificates)
 
 		request := nodeup.BootstrapRequest{
 			APIVersion:        nodeup.BootstrapAPIVersion,
 			IncludeNodeConfig: true,
 		}
 		var resp nodeup.BootstrapResponse
-		err := client.Query(ctx, &request, &resp)
-		if err == nil {
-			return &resp, nil
-		} else {
+		err = client.Query(ctx, &request, &resp)
+		if err != nil {
 			merr = multierr.Append(merr, err)
+			continue
 		}
+		return &resp, nil
 	}
 	return nil, merr
 }