summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5735 from ↵origin/release-1.15KubeEdge Bot2024-07-181-1/+1
|\ | | | | | | | | luomengY/automated-cherry-pick-of-#5721-upstream-release-1.15 Automated cherry pick of #5721: fix func NewErrorMessage
| * fix func NewErrorMessage2938893385@qq.com2024-07-171-1/+1
|/ | | | Signed-off-by: 2938893385@qq.com <2938893385@qq.com>
* Merge pull request #5717 from ↵v1.15.3KubeEdge Bot2024-07-111-20/+19
|\ | | | | | | | | WillardHu/automated-cherry-pick-of-#5643-upstream-release-1.15 Automated cherry pick of #5643: Fixed edgecore will not restart when the edge node cannot
| * Fixed edgecore will not restart when the edge node cannot obtain the IP addressWillardHu2024-07-111-20/+19
|/ | | | Signed-off-by: WillardHu <wei.hu@daocloud.io>
* Merge pull request #5706 from Shelley-BaoYue/bump-k8s-v1.26.15KubeEdge Bot2024-07-10398-30831/+160284
|\ | | | | Bump k8s from v1.26.10 to v1.26.15
| * update k8s version 1.26.15 in CIShelley-BaoYue2024-07-042-4/+4
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * update vendor for k8s v1.26.15Shelley-BaoYue2024-07-04395-30774/+160227
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * Licensing: skip modules with fewer subdirs than modsShelley-BaoYue2024-07-041-2/+2
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
| * update go.mod for k8s v1.26.15Shelley-BaoYue2024-07-041-51/+51
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5568 from ↵KubeEdge Bot2024-04-281-2/+2
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5493-upstream-release-1.15 Automated cherry pick of #5493: upgrade slsa-framework version to v1.10.0
| * upgrade slsa-framework version to v1.10.0Shelley-BaoYue2024-04-261-2/+2
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5538 from ↵KubeEdge Bot2024-04-191-2/+8
|\ | | | | | | | | wbc6080/automated-cherry-pick-of-#5519-upstream-release-1.15 Automated cherry pick of #5519: fix device mapper generate script error
| * fix device mapper generate script error侯玲玉2024-04-161-2/+8
| | | | | | | | Signed-off-by: 侯玲玉 <houlingyu@MacBook-Pro-3.local>
* | Merge pull request #5549 from ↵KubeEdge Bot2024-04-191-1/+1
|\ \ | |/ |/| | | | | Shelley-BaoYue/automated-cherry-pick-of-#5530-upstream-release-1.15 Automated cherry pick of #5530: update codecov to v4
| * update codecov to v4Shelley-BaoYue2024-04-191-1/+1
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5488 from ↵KubeEdge Bot2024-03-261-1/+1
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5485-upstream-release-1.15 Automated cherry pick of #5485: update setup-envtest version
| * update setup-envtest versionShelley-BaoYue2024-03-261-1/+1
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5367 from ↵v1.15.2KubeEdge Bot2024-01-191-1/+1
|\ | | | | | | | | luomengY/automated-cherry-pick-of-#5196-upstream-release-1.15 Automated cherry pick of #5196 upstream release 1.15
| * Supports installing edgecore without installing the CNI pluginluomengY2024-01-181-1/+1
|/ | | | Signed-off-by: luomengY <2938893385@qq.com>
* Merge pull request #5336 from ↵KubeEdge Bot2024-01-041-5/+5
|\ | | | | | | | | wbc6080/automated-cherry-pick-of-#5328-upstream-release-1.15 Automated cherry pick of #5328: fix device status problem
| * fix device status problemwbc60802023-12-291-5/+5
|/ | | | Signed-off-by: wbc6080 <wangbincheng4@huawei.com>
* Merge pull request #5295 from ↵KubeEdge Bot2023-12-111-0/+7
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5270-upstream-release-1.15 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 #5271 from ↵KubeEdge Bot2023-12-063-3/+6
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5254-upstream-release-1.15 Automated cherry pick of #5254: fix default staticPodPath in windows
| * fix default staticPodPath in windowsShelley-BaoYue2023-12-063-3/+6
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5240 from ↵KubeEdge Bot2023-12-011-2/+2
|\ | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5239-upstream-release-1.15 Automated cherry pick of #5239: bump slsaframworker to v1.9.0
| * bump slsaframworker to v1.9.0Shelley-BaoYue2023-11-301-2/+2
|/ | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* Merge pull request #5221 from ↵v1.15.1KubeEdge Bot2023-11-281-2/+33
|\ | | | | | | | | wbc6080/automated-cherry-pick-of-#5065-upstream-release-1.15 Automated cherry pick of #5065: bugfix: device model sync
| * bugfix: device model synccl20172023-11-281-2/+33
|/ | | | Signed-off-by: cl2017 <chenlin.liu@daocloud.io>
* Merge pull request #5217 from ↵KubeEdge Bot2023-11-282-19/+33
|\ | | | | | | | | wbc6080/automated-cherry-pick-of-#5140-upstream-release-1.15 Automated cherry pick of #5140: Define Twin based on properties in mapper.
| * Define Twin based on properties in mapper.luomengY2023-11-282-19/+33
|/ | | | Signed-off-by: luomengY <2938893385@qq.com>
* Merge pull request #5213 from ↵KubeEdge Bot2023-11-271-1/+1
|\ | | | | | | | | Onion-of-dreamed/automated-cherry-pick-of-#5107-upstream-release-1.15 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 #5208 from ↵KubeEdge Bot2023-11-277-11/+8
|\ \ | |/ |/| | | | | wbc6080/automated-cherry-pick-of-#5070-upstream-release-1.15 Automated cherry pick of #5070: mapper framework fix
| * mapper framework fixcl20172023-11-277-11/+8
| | | | | | | | Signed-off-by: cl2017 <chenlin.liu@daocloud.io>
* | Merge pull request #5199 from Shelley-BaoYue/delete-serviceaccount-panicKubeEdge Bot2023-11-271-1/+1
|\ \ | |/ |/| [release-1.15] fix panic when TokenRequest.Spec.BoundObjectRef is null pointer
| * fix panic when get serviceaccount uidShelley-BaoYue2023-11-241-1/+1
| | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | Merge pull request #5204 from ↵KubeEdge Bot2023-11-241-39/+41
|\ \ | | | | | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5112-upstream-release-1.15 Automated cherry pick of #5112: Fixed a null pointer error when PushMethod is not defined for device properties
| * | pptv.PushMethod != nilluomengY2023-11-241-39/+41
| | | | | | | | | | | | Signed-off-by: luomengY <2938893385@qq.com>
* | | Merge pull request #5201 from Shelley-BaoYue/bump-kubernetes-1.26.10KubeEdge Bot2023-11-242-4/+4
|\ \ \ | |/ / |/| | [release-1.15] update version for kubernetes 1.26.10
| * | update version for kubernetes 1.26.10Shelley-BaoYue2023-11-232-4/+4
| | | | | | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | | Merge pull request #5187 from ↵KubeEdge Bot2023-11-224-57/+115
|\ \ \ | | | | | | | | | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5049-upstream-release-1.15 Automated cherry pick of #5049: feat: update to support release windows/amd64
| * | | fix: remove uselesswujunyi2023-11-212-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: wujunyi <wu65830600@163.com>
| * | | chore: updatewujunyi2023-11-212-8/+13
| | | | | | | | | | | | | | | | Signed-off-by: wujunyi <wu65830600@163.com>
| * | | feat: update to support release windows/amd64wujunyi2023-11-214-58/+113
| | |/ | |/| | | | | | | Signed-off-by: wujunyi <wu65830600@163.com>
* | | Merge pull request #5191 from ↵KubeEdge Bot2023-11-221-2/+0
|\ \ \ | | | | | | | | | | | | | | | | Shelley-BaoYue/automated-cherry-pick-of-#5144-upstream-release-1.15 Automated cherry pick of #5144: remove pid config in copy resource
| * | | remove pid config in copy resourceShelley-BaoYue2023-11-221-2/+0
|/ / / | | | | | | | | | Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
* | | Merge pull request #5183 from ↵KubeEdge Bot2023-11-211-0/+1
|\ \ \ | |/ / |/| | | | | | | | ZhengXinwei-F/automated-cherry-pick-of-#5141-upstream-release-1.15 Automated cherry pick of #5141: Fix edgecore's metaserver panic when handling create, update,
| * | Fix edgecore's metaserver panic when handling create, update, and patch ↵Windrow2023-11-211-0/+1
|/ / | | | | | | | | | | request issue. Signed-off-by: Windrow <565101079@qq.com>
* | Merge pull request #5154 from Shelley-BaoYue/bump-kubernetes-1.26.10KubeEdge Bot2023-11-15123-4841/+22727
|\| | | | | Bump kubernetes 1.26.10 in release-1.15