admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change error message when there is no proxy address (#2372)

Browse Source
This commit is contained in:
zryfish
2020-07-09 18:06:37 +08:00
committed by GitHub
parent f187f97c76
commit 97b619452b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kapis/cluster/v1alpha1/handler.go
View File

@@ -120,7 +120,7 @@ func (h *handler) populateProxyAddress() error {
} }
if len(service.Spec.Ports) == 0 { if len(service.Spec.Ports) == 0 {
return fmt.Errorf("there are no ports in proxy service spec") return fmt.Errorf("there are no ports in proxy service %s spec", h.proxyService)
} }
port := service.Spec.Ports[0].Port port := service.Spec.Ports[0].Port
@@ -137,7 +137,9 @@ func (h *handler) populateProxyAddress() error {
} }
if len(serviceAddress) == 0 { if len(serviceAddress) == 0 {
return fmt.Errorf("service ingress is empty") return fmt.Errorf("cannot generate agent deployment yaml for member cluster "+
" because %s service has no public address, please check %s status, or set address "+
" mannually in ClusterConfiguration", h.proxyService, h.proxyService)
} }
h.proxyAddress = serviceAddress h.proxyAddress = serviceAddress
@@ -150,6 +152,11 @@ func (h *handler) populateProxyAddress() error {
// TODO(jeff): load template from configmap // TODO(jeff): load template from configmap
func (h *handler) generateDefaultDeployment(cluster *v1alpha1.Cluster, w io.Writer) error { func (h *handler) generateDefaultDeployment(cluster *v1alpha1.Cluster, w io.Writer) error {
_, err := url.Parse(h.proxyAddress)
if err != nil {
return fmt.Errorf("invalid proxy address %s, should format like http[s]://1.2.3.4:123", h.proxyAddress)
}
if cluster.Spec.Connection.Type == v1alpha1.ConnectionTypeDirect { if cluster.Spec.Connection.Type == v1alpha1.ConnectionTypeDirect {
return errClusterConnectionIsNotProxy return errClusterConnectionIsNotProxy
} }