Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rke
Commits
af776198
Commit
af776198
authored
6 years ago
by
Sebastiaan van Steenis
Committed by
Alena Prokharchyk
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
GetAddonsExcuteJob and ApplySystemAddonExcuteJob typos
parent
2e82c18d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
addons/addons.go
+1
-1
addons/addons.go
addons/addons_test.go
+1
-1
addons/addons_test.go
cluster/addons.go
+3
-3
cluster/addons.go
with
5 additions
and
5 deletions
+5
-5
addons/addons.go
+
1
-
1
View file @
af776198
...
...
@@ -2,7 +2,7 @@ package addons
import
"github.com/rancher/rke/templates"
func
GetAddonsExcuteJob
(
addonName
,
nodeName
,
image
string
)
(
string
,
error
)
{
func
GetAddonsEx
e
cuteJob
(
addonName
,
nodeName
,
image
string
)
(
string
,
error
)
{
jobConfig
:=
map
[
string
]
string
{
"AddonName"
:
addonName
,
"NodeName"
:
nodeName
,
...
...
This diff is collapsed.
Click to expand it.
addons/addons_test.go
+
1
-
1
View file @
af776198
...
...
@@ -17,7 +17,7 @@ const (
)
func
TestJobManifest
(
t
*
testing
.
T
)
{
jobYaml
,
err
:=
GetAddonsExcuteJob
(
FakeAddonName
,
FakeNodeName
,
FakeAddonImage
)
jobYaml
,
err
:=
GetAddonsEx
e
cuteJob
(
FakeAddonName
,
FakeNodeName
,
FakeAddonImage
)
if
err
!=
nil
{
t
.
Fatalf
(
"Failed to get addon execute job: %v"
,
err
)
}
...
...
This diff is collapsed.
Click to expand it.
cluster/addons.go
+
3
-
3
View file @
af776198
...
...
@@ -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
.
GetAddonsEx
e
cuteJob
(
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
.
ApplySystemAddonEx
e
cuteJob
(
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
)
ApplySystemAddonEx
e
cuteJob
(
addonJob
string
,
addonUpdated
bool
)
error
{
if
err
:=
k8s
.
ApplyK8sSystemJob
(
addonJob
,
c
.
LocalKubeConfigPath
,
c
.
K8sWrapTransport
,
c
.
AddonJobTimeout
,
addonUpdated
);
err
!=
nil
{
logrus
.
Error
(
err
)
return
err
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help