fix(installer): add console ip to api server certSANs(#1307) (#1479)

TomatoAres · Cui Shuaijie · web-flow · commit e60e3f17739c · 2021-08-13T15:52:50.000+08:00
Co-authored-by: Cui Shuaijie &lt;arescui@tencent.com&gt;
diff --git a/cmd/tke-installer/app/installer/installer.go b/cmd/tke-installer/app/installer/installer.go
@@ -1128,14 +1128,18 @@ func (t *TKE) runAfterClusterReady() bool {
 
 func (t *TKE) generateCertificates(ctx context.Context) error {
 	var dnsNames []string
+	ips := []net.IP{net.ParseIP("127.0.0.1")}
 	if t.Para.Config.Gateway != nil && t.Para.Config.Gateway.Domain != "" {
-		dnsNames = append(dnsNames, t.Para.Config.Gateway.Domain)
+		if ip := net.ParseIP(t.Para.Config.Gateway.Domain); ip != nil {
+			ips = append(ips, ip)
+		} else {
+			dnsNames = append(dnsNames, t.Para.Config.Gateway.Domain)
+		}
 	}
 	if t.Para.Config.Registry.TKERegistry != nil {
 		dnsNames = append(dnsNames, t.Para.Config.Registry.TKERegistry.Domain, "*."+t.Para.Config.Registry.TKERegistry.Domain)
 	}
 
-	ips := []net.IP{net.ParseIP("127.0.0.1")}
 	for _, one := range t.Cluster.Spec.Machines {
 		ips = append(ips, net.ParseIP(one.IP))
 	}

Original file line number	Diff line number	Diff line change
`@@ -1128,14 +1128,18 @@ func (t *TKE) runAfterClusterReady() bool {`
`1128`	`1128`
`1129`	`1129`	`func (t *TKE) generateCertificates(ctx context.Context) error {`
`1130`	`1130`	`var dnsNames []string`
	`1131`	`+ ips := []net.IP{net.ParseIP("127.0.0.1")}`
`1131`	`1132`	`if t.Para.Config.Gateway != nil && t.Para.Config.Gateway.Domain != "" {`
`1132`		`- dnsNames = append(dnsNames, t.Para.Config.Gateway.Domain)`
	`1133`	`+ if ip := net.ParseIP(t.Para.Config.Gateway.Domain); ip != nil {`
	`1134`	`+ ips = append(ips, ip)`
	`1135`	`+ } else {`
	`1136`	`+ dnsNames = append(dnsNames, t.Para.Config.Gateway.Domain)`
	`1137`	`+ }`
`1133`	`1138`	`}`
`1134`	`1139`	`if t.Para.Config.Registry.TKERegistry != nil {`
`1135`	`1140`	`dnsNames = append(dnsNames, t.Para.Config.Registry.TKERegistry.Domain, "*."+t.Para.Config.Registry.TKERegistry.Domain)`
`1136`	`1141`	`}`
`1137`	`1142`
`1138`		`- ips := []net.IP{net.ParseIP("127.0.0.1")}`
`1139`	`1143`	`for _, one := range t.Cluster.Spec.Machines {`
`1140`	`1144`	`ips = append(ips, net.ParseIP(one.IP))`
`1141`	`1145`	`}`