summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4900 from Shelley-BaoYue/cherrypick-4870-1.11v1.11.3origin/release-1.11KubeEdge Bot2023-07-277-9/+106
|\ | | | | Cherry pick of #4814: fix start mqtt container failed
| * fix start mqtt container failedShelley-BaoYue2023-07-277-9/+106
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #4901 from ↵KubeEdge Bot2023-07-273-11/+11
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#4888-upstream-release-1.11 Automated cherry pick of #4888: update the ubuntu to 22.04
| * update the ubuntu to 22.04fisherxu2023-07-273-11/+11
|/ | | | Signed-off-by: fisherxu <fisherxu1@gmail.com>
* Merge pull request #4325 from ↵KubeEdge Bot2022-10-211-4/+22
|\ | | | | | | | | gy95/automated-cherry-pick-of-#4308-upstream-release-1.11 Automated cherry pick of #4308: fix binary edgecore incomplete during keadm join using
| * fix binary edgecore incomplete during keadm join using remote-runtimegy952022-10-211-4/+22
| | | | | | | | Signed-off-by: gy95 <guoyao17@huawei.com>
* | Merge pull request #4323 from ↵KubeEdge Bot2022-10-213-30/+68
|\ \ | |/ |/| | | | | gy95/automated-cherry-pick-of-#4299-upstream-release-1.11 Automated cherry pick of #4299: keadm reset supports remote runtime remove mqtt container
| * keadm reset supports remote runtime remove mqtt containergy952022-10-213-30/+68
|/ | | | Signed-off-by: gy95 <guoyao17@huawei.com>
* Merge pull request #4214 from wackxu/cherrycreateanddeletesamenamepodv1.11.2KubeEdge Bot2022-09-223-86/+45
|\ | | | | [cherry-pick]fix delete and create same name pod failed occasionally
| * fix delete and create same name pod failed occasionallywackxu2022-09-223-86/+45
| | | | | | | | Signed-off-by: wackxu <xushiwei5@huawei.com>
* | Merge pull request #4215 from ↵KubeEdge Bot2022-09-227-51/+116
|\ \ | | | | | | | | | | | | wackxu/automated-cherry-pick-of-#4125-upstream-release-1.11 Automated cherry pick of #4125: fix delete pod terminating stuck when pod is create and
| * | fix Pod's conditions remain Ready false when cloudcore node or edgenode were ↵wackxu2022-09-224-38/+41
| | | | | | | | | | | | | | | | | | reboot Signed-off-by: wackxu <xushiwei5@huawei.com>
| * | fix update pod status timeoutwackxu2022-09-224-10/+59
| | | | | | | | | | | | Signed-off-by: wackxu <xushiwei5@huawei.com>
| * | fix delete pod terminating stuck when pod is create and quick deletewackxu2022-09-221-4/+17
| |/ | | | | | | Signed-off-by: wackxu <xushiwei5@huawei.com>
* | Merge pull request #4217 from ↵KubeEdge Bot2022-09-221-6/+10
|\ \ | |/ |/| | | | | wackxu/automated-cherry-pick-of-#3885-upstream-release-1.11 Automated cherry pick of #3885: fix failed to rotate log for container for docker runtime
| * fix failed to rotate log for container for docker runtimex004255952022-09-221-6/+10
|/ | | | Signed-off-by: x00425595 <xushiwei5@huawei.com>
* Merge pull request #4204 from ↵KubeEdge Bot2022-09-213-3/+137
|\ | | | | | | | | vincentgoat/automated-cherry-pick-of-#3807-upstream-release-1.11 Automated cherry pick of #3807: Pod running on edge node has invalid serviceaccount token
| * Pod running on edge node has invalid serviceaccount tokenvincentgoat2022-09-203-3/+137
| | | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* | Merge pull request #4207 from ↵KubeEdge Bot2022-09-216-77/+59
|\ \ | | | | | | | | | | | | gy95/automated-cherry-pick-of-#4187-upstream-release-1.11 Automated cherry pick of #4187: fix keadm_deprecated_e2e error
| * | fix e2e failure not reportgy952022-09-216-81/+40
| | | | | | | | | | | | Signed-off-by: gy95 <guoyao17@huawei.com>
| * | fix statefulset e2e error: need namespace and labelgy952022-09-210-0/+0
| | | | | | | | | | | | Signed-off-by: gy95 <guoyao17@huawei.com>
| * | fix keadm_deprecated_e2e errorgy952022-09-211-1/+24
|/ / | | | | | | Signed-off-by: gy95 <guoyao17@huawei.com>
* | Merge pull request #4199 from ↵KubeEdge Bot2022-09-201-1/+6
|\ \ | |/ |/| | | | | wackxu/automated-cherry-pick-of-#3917-upstream-release-1.11 Automated cherry pick of #3917: fix sendresp stuck occasionally when sendsync receive select
| * fix sendresp stuck occasionally when sendsync receive select exitedwackxu2022-09-201-1/+6
|/ | | | Signed-off-by: wackxu <xushiwei5@huawei.com>
* Merge pull request #4194 from ↵KubeEdge Bot2022-09-191-4/+1
|\ | | | | | | | | vincentgoat/automated-cherry-pick-of-#4192-upstream-release-1.11 Automated cherry pick of #4192: fix residual terminating pods problem after edge node
| * fix residual terminating pods problem after edge node reconnectedvincentgoat2022-09-191-4/+1
|/ | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* Merge pull request #4178 from tonyzaizai/release-1.11KubeEdge Bot2022-09-141-0/+11
|\ | | | | fix: Ignore the cache timestamp of the MachineInfo Metrics
| * fix: Ignore the cache timestamp of the MachineInfo Metricstl2022-09-131-0/+11
|/ | | | Signed-off-by: tl <tonyzaizai@kubesphere.io>
* Merge pull request #4117 from ↵KubeEdge Bot2022-08-163-5/+5
|\ | | | | | | | | wackxu/automated-cherry-pick-of-#4002-upstream-release-1.11 Automated cherry pick of #4002: fix release 1.11 k8s compatibility
| * fix release 1.11 k8s compatibilitywackxu2022-08-163-5/+5
|/ | | | Signed-off-by: wackxu <xushiwei5@huawei.com>
* Merge pull request #4038 from ↵v1.11.1KubeEdge Bot2022-07-1111-14/+24
|\ | | | | | | | | kevin-wangzefeng/cherry-pick-GHSA-vwm6-qc77-v2rh-v1.11 Cherry-pick GHSA-vwm6-qc77-v2rh: fix invalid request
| * Merge pull request from GHSA-vwm6-qc77-v2rhVincent Lin2022-07-1111-14/+24
|/ | | | | | | * fix invalid request Authored-by: vincentgoat <linguohui1@huawei.com> Signed-off-by: Kevin Wang <kevinwzf0126@gmail.com>
* Merge pull request #4027 from ↵KubeEdge Bot2022-07-1117-163/+153
|\ | | | | | | | | vincentgoat/automated-cherry-pick-of-#3994-upstream-release-1.11 Automated cherry pick of #3994: fix complex parameters
| * fix complex parametersvincentgoat2022-07-1117-163/+153
| | | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* | Merge pull request #4026 from ↵KubeEdge Bot2022-07-114-3/+28
|\ \ | | | | | | | | | | | | vincentgoat/automated-cherry-pick-of-#4000-upstream-release-1.11 Automated cherry pick of #4000: fix possible nil pointer of message
| * | fix possible nil pointer of messagevincentgoat2022-07-114-3/+28
| |/ | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* | Merge pull request #4024 from ↵KubeEdge Bot2022-07-113-7/+39
|\ \ | | | | | | | | | | | | vincentgoat/automated-cherry-pick-of-#3975-upstream-release-1.11 Automated cherry pick of #3975: Missing error check for unsafe method
| * | Missing error check for unsafe methodvincentgoat2022-07-113-7/+39
| |/ | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* | Merge pull request #4025 from ↵KubeEdge Bot2022-07-115-8/+38
|\ \ | | | | | | | | | | | | vincentgoat/automated-cherry-pick-of-#3976-upstream-release-1.11 Automated cherry pick of #3976: Possible type confusions
| * | Possible type confusionsvincentgoat2022-07-115-8/+38
| |/ | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* | Merge pull request #4023 from ↵KubeEdge Bot2022-07-115-26/+23
|\ \ | |/ |/| | | | | vincentgoat/automated-cherry-pick-of-#3972-upstream-release-1.11 Automated cherry pick of #3972: update deprecate dependency
| * verify vendor and vendor licensesvincentgoat2022-07-111-1/+0
| | | | | | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
| * update deprecate dependencyvincentgoat2022-07-114-25/+23
|/ | | | Signed-off-by: vincentgoat <linguohui1@huawei.com>
* Merge pull request #4007 from ↵KubeEdge Bot2022-07-043-8/+13
|\ | | | | | | | | gy95/automated-cherry-pick-of-#3956-upstream-release-1.11 Automated cherry pick of #3956: add controllermanager release
| * add controller-manager image to cloud image setgy952022-07-041-6/+8
| | | | | | | | Signed-off-by: gy95 <guoyao17@huawei.com>
| * add controllermanager releasegy952022-07-042-2/+5
|/ | | | Signed-off-by: gy95 <guoyao17@huawei.com>
* Merge pull request #3965 from ↵KubeEdge Bot2022-06-232-1/+85
|\ | | | | | | | | gy95/automated-cherry-pick-of-#3943-upstream-release-1.11 Automated cherry pick of #3943: add release ci
| * add release cigy952022-06-232-1/+85
|/ | | | Signed-off-by: gy95 <guoyao17@huawei.com>
* Merge pull request #3930 from ↵v1.11.0KubeEdge Bot2022-06-162-19/+21
|\ | | | | | | | | gy95/automated-cherry-pick-of-#3871-upstream-release-1.11 Automated cherry pick of #3871: fix keadm beta reset failed on edge node
| * fix keadm beta reset failed on edge nodegy952022-06-162-19/+21
|/ | | | Signed-off-by: gy95 <guoyao17@huawei.com>