Skip to content

Commit 80fff17

Browse files
committed
apply url workload
1 parent 5befee3 commit 80fff17

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

pkg/testcase/upgradesuc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func applySucYamls() {
6464
sucCRDUrl := "https://github.com/rancher/system-upgrade-controller/releases/latest/download/crd.yaml"
6565

6666
shared.LogLevel("debug", "Applying system-upgrade-controller manifest from url: %s", sucUrl)
67-
applyErr := shared.ManageWorkload("apply", sucUrl)
67+
applyErr := shared.ApplyWorkloadURL(sucUrl)
6868
if applyErr != nil {
6969
shared.LogLevel(
7070
"warn", "error applying system-upgrade-controller manifest from url: %s error: %v", sucUrl, applyErr)
@@ -76,7 +76,7 @@ func applySucYamls() {
7676
"system-upgrade-controller manifest did not deploy successfully")
7777

7878
shared.LogLevel("debug", "Applying SUC CRD manifest from url: %s", sucCRDUrl)
79-
applyErr = shared.ManageWorkload("apply", sucCRDUrl)
79+
applyErr = shared.ApplyWorkloadURL(sucCRDUrl)
8080
if applyErr != nil {
8181
shared.LogLevel("warn", "error applying SUC CRD manifest from url: %s error: %v", sucCRDUrl, applyErr)
8282
shared.LogLevel("debug", "applying SUC CRD manifest from local file")

shared/cluster.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ func ManageWorkload(action string, workloads ...string) error {
4242
return nil
4343
}
4444

45+
// ApplyWorkloadURL applies a workload from a URL.
46+
func ApplyWorkloadURL(url string) error {
47+
applyWorkloadErr := applyWorkload("apply", url)
48+
if applyWorkloadErr != nil {
49+
return ReturnLogError("failed to apply workload: %s\n", applyWorkloadErr)
50+
}
51+
52+
return nil
53+
}
54+
4555
func handleWorkload(action, resourceDir, workload string) error {
4656
filename := filepath.Join(resourceDir, workload)
4757

0 commit comments

Comments
 (0)