summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5365 from ↵v1.12.7origin/release-1.12KubeEdge Bot2024-01-191-1/+1
|\ | | | | | | | | luomengY/automated-cherry-pick-of-#5196-upstream-release-1.12 Automated cherry pick of #5196 upstream release 1.12
| * Supports installing edgecore without installing the CNI pluginluomengY2024-01-181-1/+1
|/ | | | Signed-off-by: luomengY <2938893385@qq.com>
* Merge pull request #5298 from ↵KubeEdge Bot2023-12-111-0/+7
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5270-upstream-release-1.12 Automated cherry pick of #5270: fix featuregates didn't take effect in edged config
| * fix featuregatesShelley-BaoYue2023-12-091-0/+7
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5214 from Shelley-BaoYue/bump-k8s-1.22.17v1.12.6KubeEdge Bot2023-11-2890-752/+1340
|\ | | | | [release-1.12] Bump k8s to 1.22.17
| * update version for k8s v1.22.17Shelley-BaoYue2023-11-274-6/+5
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * delete serviceaccount token in edgedbShelley-BaoYue2023-11-272-1/+8
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * update vendor for k8s v1.22.17Shelley-BaoYue2023-11-2785-699/+1281
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * update go.mod for kubernetes v1.22.17Shelley-BaoYue2023-11-271-47/+47
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #5210 from ↵KubeEdge Bot2023-11-271-1/+1
|\ \ | |/ |/| | | | | Onion-of-dreamed/automated-cherry-pick-of-#5107-upstream-release-1.12 Automated cherry pick of #5107: Fix error logs for nodegroupx
| * Fix error logs for nodegroupxlishaokai19952023-11-271-1/+1
|/ | | | Signed-off-by: lishaokai1995 <lishaokai1995@126.com>
* Merge pull request #5179 from WillardHu/fix-copyresourceKubeEdge Bot2023-11-211-1/+12
|\ | | | | [release-1.12]Fix copy resources from the image throws nil runtimg error
| * Fix copy resources from the image throws nil runtimg errorWillardHu2023-11-211-1/+12
|/ | | | Signed-off-by: WillardHu <wei.hu@daocloud.io>
* Merge pull request #5150 from ↵KubeEdge Bot2023-11-101-12/+12
|\ | | | | | | | | luomengY/automated-cherry-pick-of-#5036-upstream-release-1.12 Automated cherry pick of #5036: Solving the deployment order dependency of mapper and device
| * Solving the deployment order dependency of mapper and deviceluomengY2023-11-071-12/+12
|/ | | | Signed-off-by: luomengY <2938893385@qq.com>
* Merge pull request #5108 from ↵v1.12.5KubeEdge Bot2023-10-242-2/+3
|\ | | | | | | | | wlq1212/automated-cherry-pick-of-#5085-upstream-release-1.12 Automated cherry pick of #5085: fix keadm upgrade If edgecore is stopped, the keadm process
| * fix keadm upgrade If edgecore is stopped, the keadm process will stopliqing.wu2023-10-242-2/+3
|/ | | | Signed-off-by: liqing.wu <liqing.wu@daoclod.io>
* Merge pull request #5106 from ↵KubeEdge Bot2023-10-241-5/+6
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5045-upstream-release-1.12 Automated cherry pick of #5045: fix remove pod failed
| * fix remove pod failedShelley-BaoYue2023-10-241-5/+6
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #5101 from WillardHu/mqtt-pod-112KubeEdge Bot2023-10-237-32/+80
|\ \ | |/ |/| [release-1.12]fixed mqtt would not start when using custom registry
| * fixed mqtt would not start when using custom registryWillardHu2023-10-207-32/+80
| | | | | | | | Signed-off-by: WillardHu <wei.hu@daocloud.io>
* | Merge pull request #5103 from ↵KubeEdge Bot2023-10-206-10/+19
|\ \ | |/ |/| | | | | Shelley-BaoYue/automated-cherry-pick-of-#5063-upstream-release-1.12 Automated cherry pick of #5063: fix start edgecore failed when using systemd cgroupdriver
| * fix cgroupdriver systemdShelley-BaoYue2023-10-206-10/+19
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5072 from ↵KubeEdge Bot2023-10-193-8/+19
|\ | | | | | | | | WillardHu/automated-cherry-pick-of-#5047-upstream-release-1.12 Automated cherry pick of #5047: Fix upgrade time layout and lost time value issue
| * Fix upgrade time layout and lost time value issueWillardHu2023-10-193-8/+19
|/ | | | Signed-off-by: WillardHu <wei.hu@daocloud.io>
* Merge pull request #5096 from ↵KubeEdge Bot2023-10-191-0/+12
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5091-upstream-release-1.12 Automated cherry pick of #5091: cleanup unused images
| * cleanup unused images and packagesShelley-BaoYue2023-10-182-47/+12
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * update integration test tool versionShelley-BaoYue2023-10-181-0/+47
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #4979 from ↵v1.12.4KubeEdge Bot2023-09-012-0/+10
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#4702-upstream-release-1.12 Automated cherry pick of #4702: edgehub process send twin msg to twingroup directly to avoid
| * edgehub process send twin msg to twingroup directly to avoid the response of ↵Ryan2023-09-012-0/+10
|/ | | | | | device report be handled by beehiveContext.SendResp() Signed-off-by: Ryan <zhaoran11@huawei.com>
* Merge pull request #4975 from ↵KubeEdge Bot2023-09-011-0/+16
|\ | | | | | | | | fisherxu/automated-cherry-pick-of-#4960-upstream-release-1.12 Automated cherry pick of #4960: enable cri config in containerd
| * enable cri config in containerdShelley-BaoYue2023-08-311-0/+16
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #4970 from ↵KubeEdge Bot2023-09-013-2/+77
|\ \ | |/ |/| | | | | WillardHu/automated-cherry-pick-of-#4963-upstream-release-1.12 Automated cherry pick of #4963: Fix throws nil runtime error when decode AdmissionReview
| * Fix throws nil runtime error when decode AdmissionReview failedWillardHu2023-08-313-2/+77
|/ | | | Signed-off-by: WillardHu <wei.hu@daocloud.io>
* Merge pull request #4935 from ↵KubeEdge Bot2023-08-166-55/+66
|\ | | | | | | | | WillardHu/automated-cherry-pick-of-#4834-upstream-release-1.12 Automated cherry pick of #4834: Fixed the kubeedge-version flag does not take effect in the
| * Fixed the kubeedge-version flag does not take effect in the init & manifest ↵WillardHu2023-08-156-55/+66
|/ | | | | | generate command Signed-off-by: WillardHu <wei.hu@daocloud.io>
* Merge pull request #4893 from ↵v1.12.3KubeEdge Bot2023-07-273-21/+20
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#4641-upstream-release-1.12 Automated cherry pick of #4641: replace nodeIP initialization in edged
| * bugfix nodeip in edgestreamShelley-BaoYue2023-07-261-3/+20
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * replace nodeIP initialization in edgedShelley-BaoYue2023-07-262-18/+0
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #4892 from ↵KubeEdge Bot2023-07-271-2/+27
|\ \ | |/ |/| | | | | Shelley-BaoYue/automated-cherry-pick-of-#4696-upstream-release-1.12 Automated cherry pick of #4696: update pod db when patch successfully
| * update pod db when patch successfullyShelley-BaoYue2023-07-261-2/+27
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #4879 from ↵KubeEdge Bot2023-07-262-5/+14
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#4612-upstream-release-1.12 Automated cherry pick of #4612: fix error in delete pod
| * fix error in delete podShelley-BaoYue2023-07-252-5/+14
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #4876 from ↵KubeEdge Bot2023-07-268-13/+124
|\ \ | | | | | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#4814-upstream-release-1.12 Automated cherry pick of #4814: fix mqtt: start mqtt container
| * | fix reviewer opinionShelley-BaoYue2023-07-2611-38/+47
| | | | | | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * | fix mqtt: start mqtt containerShelley-BaoYue2023-07-2410-17/+119
| |/ | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #4887 from ↵KubeEdge Bot2023-07-261-1/+5
|\ \ | | | | | | | | | | | | fisherxu/automated-cherry-pick-of-#4884-upstream-release-1.12 Automated cherry pick of #4884: fix keadm ci failed issue
| * | fix for failed keadm testfisherxu2023-07-261-1/+5
|/ / | | | | | | Signed-off-by: fisherxu <xufei40@huawei.com>
* | Merge pull request #4888 from fisherxu/release-1.12KubeEdge Bot2023-07-263-11/+11
|\ \ | |/ |/| Update the ubuntu to 22.04 in release-1.12
| * update the ubuntu to 22.04fisherxu2023-07-253-11/+11
|/ | | | Signed-off-by: fisherxu <fisherxu1@gmail.com>