diff options
| author | liqing.wu <liqing.wu@daoclod.io> | 2023-12-14 16:13:09 +0800 |
|---|---|---|
| committer | liqing.wu <liqing.wu@daoclod.io> | 2023-12-14 16:13:09 +0800 |
| commit | f55302814ff80f9a53334351cb6bcc4327d672e1 (patch) | |
| tree | ec28815cc7fc90b5e812902101f99b9f8d3375c6 /pkg | |
| parent | Merge pull request #5305 from wbc6080/remove-protocol (diff) | |
| download | kubeedge-f55302814ff80f9a53334351cb6bcc4327d672e1.tar.gz | |
join node cancels pause images
Signed-off-by: liqing.wu <liqing.wu@daoclod.io>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/image/image.go | 8 | ||||
| -rw-r--r-- | pkg/image/image_test.go | 23 |
2 files changed, 12 insertions, 19 deletions
diff --git a/pkg/image/image.go b/pkg/image/image.go index cd7142994..e96bb9ea7 100644 --- a/pkg/image/image.go +++ b/pkg/image/image.go @@ -31,9 +31,8 @@ const ( ) const ( - EdgePause = "pause" - EdgeCore = "edgecore" - EdgeMQTT = "mqtt" + EdgeCore = "edgecore" + EdgeMQTT = "mqtt" ) type Set map[string]string @@ -52,8 +51,7 @@ var edgeComponentSet = Set{ } var edgeThirdPartySet = Set{ - EdgeMQTT: constants.DefaultMosquittoImage, - EdgePause: constants.DefaultPodSandboxImage, + EdgeMQTT: constants.DefaultMosquittoImage, } func EdgeSet(opt *common.JoinOptions) Set { diff --git a/pkg/image/image_test.go b/pkg/image/image_test.go index 3f2e5f847..c495d4b8c 100644 --- a/pkg/image/image_test.go +++ b/pkg/image/image_test.go @@ -24,9 +24,8 @@ func TestEdgeSet(t *testing.T) { }, }, want: Set{ - EdgeCore: "kubeedge/installation-package:v1.9.1", - EdgeMQTT: constants.DefaultMosquittoImage, - EdgePause: constants.DefaultPodSandboxImage, + EdgeCore: "kubeedge/installation-package:v1.9.1", + EdgeMQTT: constants.DefaultMosquittoImage, }, }, { @@ -39,9 +38,8 @@ func TestEdgeSet(t *testing.T) { }, }, want: Set{ - EdgeCore: "kubeedge/installation-package", - EdgeMQTT: constants.DefaultMosquittoImage, - EdgePause: constants.DefaultPodSandboxImage, + EdgeCore: "kubeedge/installation-package", + EdgeMQTT: constants.DefaultMosquittoImage, }, }, { @@ -54,9 +52,8 @@ func TestEdgeSet(t *testing.T) { }, }, want: Set{ - EdgeCore: "kubeedge-test/installation-package:v1.9.1", - EdgeMQTT: "kubeedge-test/" + constants.DefaultMosquittoImage, - EdgePause: "kubeedge-test/pause:3.6", + EdgeCore: "kubeedge-test/installation-package:v1.9.1", + EdgeMQTT: "kubeedge-test/" + constants.DefaultMosquittoImage, }, }, { @@ -69,8 +66,7 @@ func TestEdgeSet(t *testing.T) { }, }, want: Set{ - EdgeCore: "kubeedge-test/installation-package:v1.9.1", - EdgePause: "kubeedge-test/pause:3.6", + EdgeCore: "kubeedge-test/installation-package:v1.9.1", }, }, { @@ -83,9 +79,8 @@ func TestEdgeSet(t *testing.T) { }, }, want: Set{ - EdgeCore: "kubeedge-test/installation-package", - EdgeMQTT: "kubeedge-test/" + constants.DefaultMosquittoImage, - EdgePause: "kubeedge-test/pause:3.6", + EdgeCore: "kubeedge-test/installation-package", + EdgeMQTT: "kubeedge-test/" + constants.DefaultMosquittoImage, }, }, } |