From af77619859e401749d19668ac3e5c7c6593edefa Mon Sep 17 00:00:00 2001
From: Sebastiaan van Steenis <mail@superseb.nl>
Date: Thu, 12 Jul 2018 14:26:04 +0200
Subject: [PATCH] GetAddonsExcuteJob and ApplySystemAddonExcuteJob typos
---
addons/addons.go | 2 +-
addons/addons_test.go | 2 +-
cluster/addons.go | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/addons.go b/addons/addons.go
index eeddc49c..b6719408 100644
--- a/addons/addons.go
+++ b/addons/addons.go
@@ -2,7 +2,7 @@ package addons
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{
"AddonName": addonName,
"NodeName": nodeName,
diff --git a/addons/addons_test.go b/addons/addons_test.go
index 895972c5..2620f714 100644
--- a/addons/addons_test.go
+++ b/addons/addons_test.go
@@ -17,7 +17,7 @@ const (
)
func TestJobManifest(t *testing.T) {
- jobYaml, err := GetAddonsExcuteJob(FakeAddonName, FakeNodeName, FakeAddonImage)
+ jobYaml, err := GetAddonsExecuteJob(FakeAddonName, FakeNodeName, FakeAddonImage)
if err != nil {
t.Fatalf("Failed to get addon execute job: %v", err)
}
diff --git a/cluster/addons.go b/cluster/addons.go
index 4e20618b..b5f19246 100644
--- a/cluster/addons.go
+++ b/cluster/addons.go
@@ -214,13 +214,13 @@ func (c *Cluster) doAddonDeploy(ctx context.Context, addonYaml, resourceName str
if err != nil {
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 {
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 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 {
logrus.Error(err)
return err
--
GitLab