zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-05 13:46:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Codacy: Fixing variable names.

Browse Source
This commit is contained in:
Aleksandr Melnikov
2020-11-06 16:38:38 -08:00
parent af47ffbd2f
commit 70007d6d23
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/workflow_execution.go
View File

@@ -435,13 +435,13 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
return nil, util.NewUserError(codes.InvalidArgument, msg) return nil, util.NewUserError(codes.InvalidArgument, msg)
} }
serviceNameUid := "s" + uuid.New().String() + "-" + namespace serviceNameUID := "s" + uuid.New().String() + "-" + namespace
serviceNameUidDNSCompliant, err := uid2.GenerateUID(serviceNameUid, 63) serviceNameUIDDNSCompliant, err := uid2.GenerateUID(serviceNameUID, 63)
if err != nil { if err != nil {
return nil, util.NewUserError(codes.InvalidArgument, err.Error()) return nil, util.NewUserError(codes.InvalidArgument, err.Error())
} }
serviceName := serviceNameUidDNSCompliant + "." + *c.systemConfig.Domain() serviceName := serviceNameUIDDNSCompliant + "." + *c.systemConfig.Domain()
serviceTemplateName := "k8s-service-template-" + uuid.New().String() serviceTemplateName := "k8s-service-template-" + uuid.New().String()
serviceTaskName := "add-service-" + uuid.New().String() serviceTaskName := "add-service-" + uuid.New().String()
@@ -469,7 +469,7 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
Route: []*networking.HTTPRouteDestination{ Route: []*networking.HTTPRouteDestination{
{ {
Destination: &networking.Destination{ Destination: &networking.Destination{
Host: serviceNameUidDNSCompliant, Host: serviceNameUIDDNSCompliant,
Port: &networking.PortSelector{ Port: &networking.PortSelector{
Number: uint32(port.ContainerPort), Number: uint32(port.ContainerPort),
}, },
@@ -485,12 +485,12 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
Kind: "Service", Kind: "Service",
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: serviceNameUidDNSCompliant, Name: serviceNameUIDDNSCompliant,
}, },
Spec: corev1.ServiceSpec{ Spec: corev1.ServiceSpec{
Ports: servicePorts, Ports: servicePorts,
Selector: map[string]string{ Selector: map[string]string{
"app": serviceNameUidDNSCompliant, "app": serviceNameUIDDNSCompliant,
}, },
}, },
} }
@@ -498,7 +498,7 @@ func (c *Client) createWorkflow(namespace string, workflowTemplateID uint64, wor
if wf.Spec.Templates[tIdx].Metadata.Labels == nil { if wf.Spec.Templates[tIdx].Metadata.Labels == nil {
wf.Spec.Templates[tIdx].Metadata.Labels = make(map[string]string) wf.Spec.Templates[tIdx].Metadata.Labels = make(map[string]string)
} }
wf.Spec.Templates[tIdx].Metadata.Labels["app"] = serviceNameUidDNSCompliant wf.Spec.Templates[tIdx].Metadata.Labels["app"] = serviceNameUIDDNSCompliant
serviceManifestBytes, err := yaml2.Marshal(service) serviceManifestBytes, err := yaml2.Marshal(service)
if err != nil { if err != nil {
return nil, err return nil, err