misc backports to v0.6.x #165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit 2cf0cc1)
- bump gnostic-models because of
google/gnostic#397
- bump controller-tools v0.15.0
(for controller-gen command)
- bump longhorn v1.5.5
- regenerate manifest/generated code
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit ec4d7da)
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit 4e6e62f)
- Also make build and integration test in the same job.
That will ensure the image can be used in time.
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit 94e0591)
- should use `steps.<step id>.conclusion == 'success'` Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit 5a30aa3)
Signed-off-by: PoAn Yang <poan.yang@suse.com> (cherry picked from commit 61fafb2)
- We might need LH v1.7.0 for v2 engine, so move to
wrangler v3 first.
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit 507e3d2)
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit b3d80cc)
Signed-off-by: Tim Serong <tserong@suse.com> (cherry picked from commit 9e0fb40)
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit b6e7af2)
- we could drop rancher in this case Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit cf3d0b4)
- We should also consider the wwn of the added blockdevice in
the same round.
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit a1bc2b5)
Prior to this, if `mkfs.ext4` failed, all we saw was "failed to format /dev/sda. err: exit status 1". With this change, we'll see the command output, which is a bit more useful, for exmaple: "failed to format /dev/sda. exit status 1: mke2fs 1.46.4 (18-Aug-2021) /dev/sda is apparently in use by the system; will not make a filesystem here!" Signed-off-by: Tim Serong <tserong@suse.com> (cherry picked from commit 81e8774)
If multipathd is running and has taken over a device, ResolvePersistentDevPath() will end up returning a "/dev/dm-*" device path, which we don't want. We want the real underyling device (e.g. "/dev/sda"). If we take a "/dev/dm-*" path and later update the blockdevice CR with it, we lose all the interesting DeviceStatus information, like the WWN. Happily, in this case, we can figure out the right path to use by checking "/dev/disk/by-path/" + the device's bus path. This has the added advantage of also working for block devices that have no WWN. Related issue: harvester/harvester#6531 Signed-off-by: Tim Serong <tserong@suse.com> (cherry picked from commit cefcc3d) Conflicts: pkg/controller/blockdevice/controller.go - move the corresponding logic back to blockdevice/controller pkg/provisioner/common.go - remove provisioner because we did not introduce it on v0.6.x
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit 78e0d91) Conflicts: .github/workflows/basic-ci.yaml - update with minor conflict
- Also, we make two jobs can run parallel Signed-off-by: Vicente Cheng <vicente.cheng@suse.com> (cherry picked from commit e35cbb3)
- new version introduce some new fields and components that will
cause the CI failure
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
Vicente-Cheng
force-pushed
the
backport-misc-v0.6.x
branch
from
0076dba to
698ad64
Compare
bk201
approved these changes
Dec 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem:
We need to update the v0.6.x for v1.3.3
Solution:
Manually backport the needed commits
Related Issue:
None
Test plan:
None