test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: failed to create component from yaml file (#1266)

Browse Source
This commit is contained in:
张启航 2022-08-03 20:11:07 +08:00 committed by GitHub
parent 9eae69eb00
commit f204ac5ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 112 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/handler/get_namespace_resource_name.go
View File

@ -285,6 +285,11 @@ func (c *clusterAction) getResourceName(ctx context.Context, namespace string, c
return nil, cmMap, secretMap
}
for _, dm := range resources.Items {
if dm.OwnerReferences != nil {
if dm.OwnerReferences[0].Kind == model.CronJob {
continue
}
}
tempResources = append(tempResources, &Resource{ObjectMeta: dm.ObjectMeta, Template: dm.Spec.Template})
}
isWorkloads = true

180
api/handler/resource_import.go
View File

@ -42,7 +42,7 @@ func (c *clusterAction) ResourceImport(namespace string, as map[string]model.App
}
var componentAttributes []model.ComponentAttributes
for _, componentResource := range components.ConvertResource {
component, err := c.CreateComponent(app, tenant.UUID, componentResource, namespace)
component, err := c.CreateComponent(app, tenant.UUID, componentResource, namespace, false)
if err != nil {
logrus.Errorf("%v", err)
return &util.APIHandleError{Code: 400, Err: fmt.Errorf("create app error:%v", err)}
@ -152,7 +152,7 @@ func (c *clusterAction) CreateK8sResource(tx *gorm.DB, k8sResources []dbmodel.K8
return k8sResources, err
}
func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID string, component model.ConvertResource, namespace string) (*dbmodel.TenantServices, error) {
func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID string, component model.ConvertResource, namespace string, isYaml bool) (*dbmodel.TenantServices, error) {
var extendMethod string
switch component.BasicManagement.ResourceType {
case model.Deployment:
@ -202,95 +202,95 @@ func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID strin
logrus.Errorf("add service error, %v", err)
return nil, err
}
changeLabel := func(label map[string]string) map[string]string {
label[constants.ResourceManagedByLabel] = constants.Rainbond
label["service_id"] = serviceID
label["version"] = ts.DeployVersion
label["creater_id"] = string(rainbondutil.NewTimeVersion())
label["migrator"] = "rainbond"
label["creator"] = "Rainbond"
return label
}
switch component.BasicManagement.ResourceType {
case model.Deployment:
dm, err := c.clientset.AppsV1().Deployments(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v Deployments %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get Deployments %v:%v", namespace, err)}
if !isYaml {
changeLabel := func(label map[string]string) map[string]string {
label[constants.ResourceManagedByLabel] = constants.Rainbond
label["service_id"] = serviceID
label["version"] = ts.DeployVersion
label["creater_id"] = string(rainbondutil.NewTimeVersion())
label["migrator"] = "rainbond"
label["creator"] = "Rainbond"
return label
}
if dm.Labels == nil {
dm.Labels = make(map[string]string)
}
if dm.Spec.Template.Labels == nil {
dm.Spec.Template.Labels = make(map[string]string)
}
dm.Labels = changeLabel(dm.Labels)
dm.Spec.Template.Labels = changeLabel(dm.Spec.Template.Labels)
_, err = c.clientset.AppsV1().Deployments(namespace).Update(context.Background(), dm, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update Deployments %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update Deployments %v:%v", namespace, err)}
}
case model.Job:
job, err := c.clientset.BatchV1().Jobs(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v Jobs %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get Jobs %v:%v", namespace, err)}
}
if job.Labels == nil {
job.Labels = make(map[string]string)
}
job.Labels = changeLabel(job.Labels)
if job.Spec.Template.Labels == nil {
job.Spec.Template.Labels = make(map[string]string)
}
job.Spec.Template.Labels = changeLabel(job.Spec.Template.Labels)
_, err = c.clientset.BatchV1().Jobs(namespace).Update(context.Background(), job, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update StatefulSets %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update StatefulSets %v:%v", namespace, err)}
}
case model.CronJob:
cr, err := c.clientset.BatchV1beta1().CronJobs(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v CronJob %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get CronJob %v:%v", namespace, err)}
}
if cr.Labels == nil {
cr.Labels = make(map[string]string)
}
cr.Labels = changeLabel(cr.Labels)
if cr.Spec.JobTemplate.Labels == nil {
cr.Spec.JobTemplate.Labels = make(map[string]string)
}
cr.Spec.JobTemplate.Labels = changeLabel(cr.Spec.JobTemplate.Labels)
if cr.Spec.JobTemplate.Spec.Template.Labels == nil {
cr.Spec.JobTemplate.Spec.Template.Labels = make(map[string]string)
}
cr.Spec.JobTemplate.Spec.Template.Labels = changeLabel(cr.Spec.JobTemplate.Spec.Template.Labels)
_, err = c.clientset.BatchV1beta1().CronJobs(namespace).Update(context.Background(), cr, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update CronJobs %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update CronJobs %v:%v", namespace, err)}
}
case model.StateFulSet:
sfs, err := c.clientset.AppsV1().StatefulSets(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v StatefulSets %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get StatefulSets %v:%v", namespace, err)}
}
if sfs.Labels == nil {
sfs.Labels = make(map[string]string)
}
sfs.Labels = changeLabel(sfs.Labels)
if sfs.Spec.Template.Labels == nil {
sfs.Spec.Template.Labels = make(map[string]string)
}
sfs.Spec.Template.Labels = changeLabel(sfs.Spec.Template.Labels)
_, err = c.clientset.AppsV1().StatefulSets(namespace).Update(context.Background(), sfs, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update StatefulSets %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update StatefulSets %v:%v", namespace, err)}
switch component.BasicManagement.ResourceType {
case model.Deployment:
dm, err := c.clientset.AppsV1().Deployments(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v Deployments %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get Deployments %v:%v", namespace, err)}
}
if dm.Labels == nil {
dm.Labels = make(map[string]string)
}
if dm.Spec.Template.Labels == nil {
dm.Spec.Template.Labels = make(map[string]string)
}
dm.Labels = changeLabel(dm.Labels)
dm.Spec.Template.Labels = changeLabel(dm.Spec.Template.Labels)
_, err = c.clientset.AppsV1().Deployments(namespace).Update(context.Background(), dm, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update Deployments %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update Deployments %v:%v", namespace, err)}
}
case model.Job:
job, err := c.clientset.BatchV1().Jobs(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v Jobs %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get Jobs %v:%v", namespace, err)}
}
if job.Labels == nil {
job.Labels = make(map[string]string)
}
job.Labels = changeLabel(job.Labels)
if job.Spec.Template.Labels == nil {
job.Spec.Template.Labels = make(map[string]string)
}
_, err = c.clientset.BatchV1().Jobs(namespace).Update(context.Background(), job, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update StatefulSets %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update StatefulSets %v:%v", namespace, err)}
}
case model.CronJob:
cr, err := c.clientset.BatchV1beta1().CronJobs(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v CronJob %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get CronJob %v:%v", namespace, err)}
}
if cr.Labels == nil {
cr.Labels = make(map[string]string)
}
cr.Labels = changeLabel(cr.Labels)
if cr.Spec.JobTemplate.Labels == nil {
cr.Spec.JobTemplate.Labels = make(map[string]string)
}
cr.Spec.JobTemplate.Labels = changeLabel(cr.Spec.JobTemplate.Labels)
if cr.Spec.JobTemplate.Spec.Template.Labels == nil {
cr.Spec.JobTemplate.Spec.Template.Labels = make(map[string]string)
}
_, err = c.clientset.BatchV1beta1().CronJobs(namespace).Update(context.Background(), cr, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update CronJobs %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update CronJobs %v:%v", namespace, err)}
}
case model.StateFulSet:
sfs, err := c.clientset.AppsV1().StatefulSets(namespace).Get(context.Background(), component.ComponentsName, metav1.GetOptions{})
if err != nil {
logrus.Errorf("failed to get %v StatefulSets %v:%v", namespace, component.ComponentsName, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to get StatefulSets %v:%v", namespace, err)}
}
if sfs.Labels == nil {
sfs.Labels = make(map[string]string)
}
sfs.Labels = changeLabel(sfs.Labels)
if sfs.Spec.Template.Labels == nil {
sfs.Spec.Template.Labels = make(map[string]string)
}
sfs.Spec.Template.Labels = changeLabel(sfs.Spec.Template.Labels)
_, err = c.clientset.AppsV1().StatefulSets(namespace).Update(context.Background(), sfs, metav1.UpdateOptions{})
if err != nil {
logrus.Errorf("failed to update StatefulSets %v:%v", namespace, err)
return nil, &util.APIHandleError{Code: 404, Err: fmt.Errorf("failed to update StatefulSets %v:%v", namespace, err)}
}
}
}
return &ts, nil

28
api/handler/yaml_resource.go
View File

@ -32,6 +32,7 @@ import (
//AppYamlResourceName -
func (c *clusterAction) AppYamlResourceName(yamlResource api_model.YamlResource) (map[string]api_model.LabelResource, *util.APIHandleError) {
logrus.Infof("AppYamlResourceName begin")
fileResource := make(map[string]api_model.LabelResource)
k8sResourceObjects := c.YamlToResource(yamlResource)
var DeployNames, JobNames, CJNames, SFSNames, RoleNames, HPANames, RBNames, SANames, SecretNames, ServiceNames, CMNames, NetworkPolicyNames, IngressNames, PVCNames []string
@ -105,11 +106,13 @@ func (c *clusterAction) AppYamlResourceName(yamlResource api_model.YamlResource)
},
Status: "",
}
logrus.Infof("AppYamlResourceName end")
return fileResource, nil
}
//AppYamlResourceDetailed -
func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResource, yamlImport bool) (api_model.ApplicationResource, *util.APIHandleError) {
logrus.Infof("AppYamlResourceDetailed begin")
k8sResourceObjects := c.YamlToResource(yamlResource)
var K8SResource []dbmodel.K8sResource
var ConvertResource []api_model.ConvertResource
@ -236,7 +239,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -257,7 +260,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -278,7 +281,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -299,7 +302,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -320,7 +323,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -341,7 +344,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -362,7 +365,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -383,7 +386,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -404,7 +407,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -425,7 +428,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
resource, err := c.ResourceCreate(buildResource, yamlResource.Namespace)
if err != nil {
errorOverview = err.Error()
state = 3
state = api_model.CreateError
} else {
buildResource.Resource = resource
}
@ -445,6 +448,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
}
}
logrus.Infof("AppYamlResourceDetailed end")
return api_model.ApplicationResource{
K8SResource,
ConvertResource,
@ -453,6 +457,7 @@ func (c *clusterAction) AppYamlResourceDetailed(yamlResource api_model.YamlResou
//AppYamlResourceImport -
func (c *clusterAction) AppYamlResourceImport(yamlResource api_model.YamlResource, components api_model.ApplicationResource) (api_model.AppComponent, *util.APIHandleError) {
logrus.Infof("AppYamlResourceImport begin")
app, err := db.GetManager().ApplicationDao().GetAppByID(yamlResource.AppID)
if err != nil {
return api_model.AppComponent{}, &util.APIHandleError{Code: 400, Err: fmt.Errorf("GetAppByID error %v", err)}
@ -466,7 +471,7 @@ func (c *clusterAction) AppYamlResourceImport(yamlResource api_model.YamlResourc
}
var componentAttributes []api_model.ComponentAttributes
for _, componentResource := range components.ConvertResource {
component, err := c.CreateComponent(app, yamlResource.TenantID, componentResource, yamlResource.Namespace)
component, err := c.CreateComponent(app, yamlResource.TenantID, componentResource, yamlResource.Namespace, true)
if err != nil {
logrus.Errorf("%v", err)
return &util.APIHandleError{Code: 400, Err: fmt.Errorf("create app error:%v", err)}
@ -499,6 +504,7 @@ func (c *clusterAction) AppYamlResourceImport(yamlResource api_model.YamlResourc
if err != nil {
return api_model.AppComponent{}, &util.APIHandleError{Code: 400, Err: fmt.Errorf("app yaml resource import error:%v", err)}
}
logrus.Infof("AppYamlResourceImport end")
return ar, nil
}