Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

【ADD】Uniform use processCreateErr func to create resource #828

Merged
merged 14 commits into from
May 16, 2022
Merged

【ADD】Uniform use processCreateErr func to create resource #828

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ba28364
add yurt-app-manager yurtappdaemon/yurtingress deploy and revert
JameKeal Apr 12, 2022
3ce2582
Revert "add yurt-app-manager yurtappdaemon/yurtingress deploy and rev…
JameKeal Apr 15, 2022
9cab046
fix git safe dir error (#807)
Congrool Apr 18, 2022
30d45fe
【Optimize】unified image pull policy (#805)
JameKeal Apr 18, 2022
f9a5ca8
【Optimize】optimize kubernetes util function (#808)
JameKeal Apr 18, 2022
2eb5478
【FIX】fix cloud node was heterogeneous (#806)
JameKeal Apr 18, 2022
4e3a9b7
cleanup: io/ioutil (#813)
cndoit18 Apr 26, 2022
b5e1002
use constants instead the string (#814)
pengbinbin1 May 5, 2022
36b34d0
ingress: update edge ingress proposal to add enhancement (#816)
May 10, 2022
79505a4
finish ut of sa token replacement (#787)
MrGirl May 10, 2022
5d95aaa
add enable-node-pool parameter for yurthub in order to disable nodepo…
rambohe-ch May 10, 2022
83c8d13
Remove convert and revert command (#826)
lonelyCZ May 13, 2022
e9f60c2
uniform processCreateErr func to deal the resource create
JameKeal May 13, 2022
e0867e0
Merge branch 'master' into 20220513-pr1
JameKeal May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pkg/yurtctl/util/kubernetes/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,8 @@ func CreateDeployFromYaml(cliSet *kubernetes.Clientset, ns, dplyTmpl string, ctx
if !ok {
return errors.New("fail to assert Deployment")
}
if _, err = cliSet.AppsV1().Deployments(ns).Create(context.Background(), dply, metav1.CreateOptions{}); err != nil {
return err
}
klog.V(4).Infof("the deployment/%s is deployed", dply.Name)
return nil
_, err = cliSet.AppsV1().Deployments(ns).Create(context.Background(), dply, metav1.CreateOptions{})
return processCreateErr("deployment", dply.Name, err)
}

// CreateDaemonSetFromYaml creates the DaemonSet from the yaml template.
Expand All @@ -214,11 +211,7 @@ func CreateDaemonSetFromYaml(cliSet *kubernetes.Clientset, ns, dsTmpl string, ct
return fmt.Errorf("fail to assert daemonset: %v", err)
}
_, err = cliSet.AppsV1().DaemonSets(ns).Create(context.Background(), ds, metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("fail to create the daemonset/%s: %v", ds.Name, err)
}
klog.V(4).Infof("daemonset/%s is created", ds.Name)
return nil
return processCreateErr("daemonset", ds.Name, err)
}

// CreateServiceFromYaml creates the Service from the yaml template.
Expand Down