diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-07-11 19:18:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 19:18:54 +0800 |
| commit | 3edd234b9477edd3e251609f2e0bcfe68ecdb719 (patch) | |
| tree | 599e699d6f47f71ac4898baddf9509e65c68fe30 | |
| parent | Merge pull request #5715 from WillardHu/automated-cherry-pick-of-#5643-upstre... (diff) | |
| parent | fix keadm init profile in v1.17.0 for keadm_e2e test. (diff) | |
| download | kubeedge-3edd234b9477edd3e251609f2e0bcfe68ecdb719.tar.gz | |
Merge pull request #5719 from Shelley-BaoYue/automated-cherry-pick-of-#5632-upstream-release-1.17
Automated cherry pick of #5632: fix keadm init profile in v1.17.0 for keadm_e2e test.
| -rwxr-xr-x | tests/scripts/keadm_compatibility_e2e.sh | 2 | ||||
| -rwxr-xr-x | tests/scripts/keadm_e2e.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/scripts/keadm_compatibility_e2e.sh b/tests/scripts/keadm_compatibility_e2e.sh index 71b69bd72..ca1f77ee7 100755 --- a/tests/scripts/keadm_compatibility_e2e.sh +++ b/tests/scripts/keadm_compatibility_e2e.sh @@ -77,7 +77,7 @@ function start_kubeedge() { export MASTER_IP=`kubectl get node test-control-plane -o jsonpath={.status.addresses[0].address}` export KUBECONFIG=$HOME/.kube/config docker run --rm kubeedge/installation-package:$IMAGE_TAG cat /usr/local/bin/keadm > /usr/local/bin/keadm && chmod +x /usr/local/bin/keadm - /usr/local/bin/keadm init --advertise-address=$MASTER_IP --profile version --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force + /usr/local/bin/keadm init --advertise-address=$MASTER_IP --kubeedge-version $CLOUD_EDGE_VERSION --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force # ensure tokensecret is generated while true; do diff --git a/tests/scripts/keadm_e2e.sh b/tests/scripts/keadm_e2e.sh index a34ff890b..c491020b9 100755 --- a/tests/scripts/keadm_e2e.sh +++ b/tests/scripts/keadm_e2e.sh @@ -75,7 +75,7 @@ function start_kubeedge() { export MASTER_IP=`kubectl get node test-control-plane -o jsonpath={.status.addresses[0].address}` export KUBECONFIG=$HOME/.kube/config docker run --rm kubeedge/installation-package:$IMAGE_TAG cat /usr/local/bin/keadm > /usr/local/bin/keadm && chmod +x /usr/local/bin/keadm - /usr/local/bin/keadm init --advertise-address=$MASTER_IP --profile version --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force + /usr/local/bin/keadm init --advertise-address=$MASTER_IP --kubeedge-version $KUBEEDGE_VERSION --set cloudCore.service.enable=false --kube-config=$KUBECONFIG --force # ensure tokensecret is generated while true; do |