rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-16 22:06:59 +00:00
Code Issues Releases Wiki Activity

GetAddonsExcuteJob and ApplySystemAddonExcuteJob typos

Browse Source
This commit is contained in:
Sebastiaan van Steenis 2018-07-12 14:26:04 +02:00 committed by Alena Prokharchyk
parent 2e82c18d4b
commit af77619859
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/addons.go
View File

@ -2,7 +2,7 @@ package addons
import "github.com/rancher/rke/templates" import "github.com/rancher/rke/templates"
func GetAddonsExcuteJob(addonName, nodeName, image string) (string, error) { func GetAddonsExecuteJob(addonName, nodeName, image string) (string, error) {
jobConfig := map[string]string{ jobConfig := map[string]string{
"AddonName": addonName, "AddonName": addonName,
"NodeName": nodeName, "NodeName": nodeName,

2
addons/addons_test.go
View File

@ -17,7 +17,7 @@ const (
) )
func TestJobManifest(t *testing.T) { func TestJobManifest(t *testing.T) {
jobYaml, err := GetAddonsExcuteJob(FakeAddonName, FakeNodeName, FakeAddonImage) jobYaml, err := GetAddonsExecuteJob(FakeAddonName, FakeNodeName, FakeAddonImage)
if err != nil { if err != nil {
t.Fatalf("Failed to get addon execute job: %v", err) t.Fatalf("Failed to get addon execute job: %v", err)
} }

6
cluster/addons.go
View File

@ -214,13 +214,13 @@ func (c *Cluster) doAddonDeploy(ctx context.Context, addonYaml, resourceName str
if err != nil { if err != nil {
return &addonError{fmt.Sprintf("Failed to get Node [%s]: %v", c.ControlPlaneHosts[0].HostnameOverride, err), isCritical} return &addonError{fmt.Sprintf("Failed to get Node [%s]: %v", c.ControlPlaneHosts[0].HostnameOverride, err), isCritical}
} }
addonJob, err := addons.GetAddonsExcuteJob(resourceName, node.Name, c.Services.KubeAPI.Image) addonJob, err := addons.GetAddonsExecuteJob(resourceName, node.Name, c.Services.KubeAPI.Image)
if err != nil { if err != nil {
return &addonError{fmt.Sprintf("Failed to generate addon execute job: %v", err), isCritical} return &addonError{fmt.Sprintf("Failed to generate addon execute job: %v", err), isCritical}
} }
if err = c.ApplySystemAddonExcuteJob(addonJob, addonUpdated); err != nil { if err = c.ApplySystemAddonExecuteJob(addonJob, addonUpdated); err != nil {
return &addonError{fmt.Sprintf("%v", err), isCritical} return &addonError{fmt.Sprintf("%v", err), isCritical}
} }
return nil return nil
@ -256,7 +256,7 @@ func (c *Cluster) StoreAddonConfigMap(ctx context.Context, addonYaml string, add
} }
} }
func (c *Cluster) ApplySystemAddonExcuteJob(addonJob string, addonUpdated bool) error { func (c *Cluster) ApplySystemAddonExecuteJob(addonJob string, addonUpdated bool) error {
if err := k8s.ApplyK8sSystemJob(addonJob, c.LocalKubeConfigPath, c.K8sWrapTransport, c.AddonJobTimeout, addonUpdated); err != nil { if err := k8s.ApplyK8sSystemJob(addonJob, c.LocalKubeConfigPath, c.K8sWrapTransport, c.AddonJobTimeout, addonUpdated); err != nil {
logrus.Error(err) logrus.Error(err)
return err return err