test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 11:47:36 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

drop this else statement

Browse Source
This commit is contained in:
lijinhui 2021-09-14 17:40:13 +08:00
parent 8a21439be0
commit 1e7171667a
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
worker/appm/conversion/gateway.go
View File

@ -79,7 +79,7 @@ func TenantServiceRegist(as *v1.AppService, dbmanager db.Manager) error {
as.SetSecret(sec)
}
logrus.Infof("TenantServiceRegist --------------------%v",as)
logrus.Infof("TenantServiceRegist --------------------%v", as)
return nil
}
@ -289,19 +289,20 @@ func (a *AppServiceBuild) applyHTTPRule(rule *model.HTTPRule, containerPort, plu
ntwIngress.SetAnnotations(annotations)
logrus.Infof("applyHTTPRule ntwIngress: %v", ntwIngress)
return ntwIngress, sec, nil
} else {
beatIngress := createBetaIngress(domain, path, name, namespace, serviceName, labels, pluginContainerPort)
if sec != nil {
beatIngress.Spec.TLS = []betav1.IngressTLS{
{
Hosts: []string{domain},
SecretName: sec.Name,
},
}
}
beatIngress.SetAnnotations(annotations)
return beatIngress, sec, nil
}
beatIngress := createBetaIngress(domain, path, name, namespace, serviceName, labels, pluginContainerPort)
if sec != nil {
beatIngress.Spec.TLS = []betav1.IngressTLS{
{
Hosts: []string{domain},
SecretName: sec.Name,
},
}
}
beatIngress.SetAnnotations(annotations)
return beatIngress, sec, nil
}
// applyTCPRule applies stream rule into ingress
@ -330,19 +331,19 @@ func (a *AppServiceBuild) applyTCPRule(rule *model.TCPRule, service *corev1.Serv
}
nwkIngress.SetAnnotations(annos)
return nwkIngress, nil
} else {
betaIngress := &betav1.Ingress{
ObjectMeta: objectMeta,
Spec: betav1.IngressSpec{
Backend: &betav1.IngressBackend{
ServiceName: service.Name,
ServicePort: intstr.FromInt(int(service.Spec.Ports[0].Port)),
},
},
}
betaIngress.SetAnnotations(annos)
return betaIngress, nil
}
betaIngress := &betav1.Ingress{
ObjectMeta: objectMeta,
Spec: betav1.IngressSpec{
Backend: &betav1.IngressBackend{
ServiceName: service.Name,
ServicePort: intstr.FromInt(int(service.Spec.Ports[0].Port)),
},
},
}
betaIngress.SetAnnotations(annos)
return betaIngress, nil
}
//CreateUpstreamPluginMappingPort 检查是否存在upstream插件，接管入口网络