vee1e/kubeedge
1
0
Fork 0
mirror of https://github.com/vee1e/kubeedge.git synced 2026-09-01 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6658 from Shelley-BaoYue/fix-integration

Browse source 
update controller-runtime setup-envtest version to fix integration test
This commit is contained in:
KubeEdge Bot 2026-03-11 14:27:41 +08:00 • committed by GitHub
commit 4b7ab9791a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cloud/test/integration/scripts/execute.sh
View file

@ -22,14 +22,14 @@ ENVTEST_BIN_DIR=""
function do_preparation() {
which setup-envtest &> /dev/null || {
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.16
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
sudo cp $GOPATH/bin/setup-envtest /usr/bin/
}
ENVTEST_BIN_DIR=$(setup-envtest use 1.22.1 --bin-dir=${ENVTEST_DOWNLOAD_DIR} -p path)
ENVTEST_BIN_DIR=$(setup-envtest use 1.29.0 --bin-dir=${ENVTEST_DOWNLOAD_DIR} -p path)
which ginkgo &>/dev/null || {
go install github.com/onsi/ginkgo/ginkgo@latest
go install github.com/onsi/ginkgo/v2/ginkgo@latest
sudo cp $GOPATH/bin/ginkgo /usr/bin/
}
}

2
keadm/cmd/keadm/app/cmd/helm/cloudcore.go
View file

@ -302,7 +302,7 @@ func (c *CloudCoreHelmTool) Uninstall(opts *types.ResetOptions) error {
func (c *CloudCoreHelmTool) verifyCloudCoreProcessRunning() error {
cloudcoreRunning, err := c.Common.OSTypeInstaller.IsKubeEdgeProcessRunning(util.KubeCloudBinaryName)
if err != nil {
return fmt.Errorf("failed to verify the cloudcore binnary already running, err: %v", err)
return fmt.Errorf("failed to verify the cloudcore binary already running, err: %v", err)
}
if cloudcoreRunning {
return fmt.Errorf("the cloudcore is already running on this node, please run reset to clean up first")