Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STOR-1167: Rebase to v1.18.0 for OCP 4.14 #222

Merged
merged 89 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
91c80ef
Migrate Trivy workflow to grab images from values.yaml
ConnorJC3 Jan 13, 2023
6a52738
Release v1.15.0
torredil Jan 13, 2023
c18afad
Merge pull request #1480 from torredil/release-1.15
k8s-ci-robot Jan 13, 2023
d045e30
Merge pull request #1481 from kubernetes-sigs/release-1.15
k8s-ci-robot Jan 13, 2023
3bb54e4
Merge pull request #1479 from ConnorJC3/trivy-values-yaml
k8s-ci-robot Jan 13, 2023
c4058b9
Fix YAML validity for Trivy job
ConnorJC3 Jan 13, 2023
f7971ad
Unrestrict Trivy scan path
ConnorJC3 Jan 13, 2023
3ce83e5
Fix Trivy driver container tag
ConnorJC3 Jan 13, 2023
89403bc
Remove compatibility matrix reference
torredil Jan 17, 2023
caf11d9
Use test driver image when testing upgrades with CT
torredil Jan 18, 2023
9121124
Merge pull request #1484 from torredil/update-docs
k8s-ci-robot Jan 18, 2023
78c845b
Merge pull request #1486 from torredil/ct-test-image
k8s-ci-robot Jan 18, 2023
ad25982
Add support for JSON logging
torredil Jan 18, 2023
32ee76d
k8s.gcr.io -> registry.k8s.io
ConnorJC3 Jan 18, 2023
20da870
Bump CI k8s version to 1.26.1 (and other CI tools upgrades)
ConnorJC3 Jan 18, 2023
087d042
Merge pull request #1488 from ConnorJC3/registry-k8s-io
k8s-ci-robot Jan 18, 2023
d1bd99e
Merge pull request #1487 from ConnorJC3/test-k8s-1-26
k8s-ci-robot Jan 19, 2023
edc41c3
Disable buildx provenance
ConnorJC3 Jan 23, 2023
a363f8a
Bump GitHub Actions workflows
ConnorJC3 Jan 23, 2023
27e2601
Merge pull request #1467 from torredil/log-format-json
k8s-ci-robot Jan 23, 2023
cc74485
Remove migration tests
ConnorJC3 Jan 23, 2023
c98a149
Merge pull request #1493 from ConnorJC3/remove-migration-tests
k8s-ci-robot Jan 23, 2023
e82d3e2
Merge pull request #1491 from ConnorJC3/fix-ci
k8s-ci-robot Jan 24, 2023
668ff48
Update speculative execution of docker buildx to check buildkit daemo…
ConnorJC3 Jan 24, 2023
b926e1e
Merge pull request #1496 from ConnorJC3/update-speculative-execution
k8s-ci-robot Jan 25, 2023
6e1742f
Pin k8s.io/dynamic-resource-allocation to v0.26.0
bertinatto Feb 7, 2023
6d38a50
Merge pull request #1504 from bertinatto/pin-dynamic-resource-allocat…
k8s-ci-robot Feb 7, 2023
c58fe2b
Update installation docs
torredil Feb 7, 2023
190d2c5
Upgrade golangci-lint
torredil Feb 8, 2023
b4f67bd
Merge pull request #1505 from torredil/fix-ci
k8s-ci-robot Feb 8, 2023
c4baaa7
Merge pull request #1503 from torredil/update-docs
k8s-ci-robot Feb 8, 2023
e821bcf
Release v1.16.0
torredil Feb 13, 2023
46d00ca
Fix --version output
ConnorJC3 Feb 13, 2023
531d6bb
Merge pull request #1510 from ConnorJC3/fix-version
k8s-ci-robot Feb 13, 2023
007fcfd
Merge pull request #1509 from torredil/release-1.16
k8s-ci-robot Feb 14, 2023
4725b30
Merge pull request #1511 from kubernetes-sigs/release-1.16
k8s-ci-robot Feb 14, 2023
d410d2d
Release v1.16.1
ConnorJC3 Feb 22, 2023
71cd026
Post-Release 1.16.1
ConnorJC3 Feb 22, 2023
96b23f3
Merge pull request #1515 from kubernetes-sigs/release-1.16
k8s-ci-robot Feb 23, 2023
ed528b2
Add tests for manually mounted volumes (and other weird paths)
ConnorJC3 Mar 2, 2023
58fc07e
Stop treating prefixes as magic in DeviceManager
ConnorJC3 Mar 2, 2023
60c20e3
Add warning to README about k8s.gcr.io deprecation
ConnorJC3 Mar 2, 2023
fff2a17
Merge pull request #1519 from ConnorJC3/readme-warning
k8s-ci-robot Mar 3, 2023
caf56a2
Add support for XFS custom block sizes
ConnorJC3 Mar 6, 2023
29a19d2
Merge pull request #1523 from ConnorJC3/xfs-fix
k8s-ci-robot Mar 9, 2023
14f68a2
Always log driver information
torredil Mar 9, 2023
b184b42
Merge pull request #1525 from torredil/update-log
k8s-ci-robot Mar 9, 2023
882acf6
Prevent allocation of devices after /dev/xvddx
ConnorJC3 Mar 10, 2023
9be8418
Change README warning to new redirect announcement
ConnorJC3 Mar 10, 2023
0c11778
Merge pull request #1528 from ConnorJC3/readme-warning-2.0
k8s-ci-robot Mar 10, 2023
05df833
Upgrade dependencies
torredil Mar 10, 2023
b9e51af
Merge pull request #1529 from torredil/upgrade-deps
k8s-ci-robot Mar 13, 2023
fd8b1e1
Merge pull request #1518 from ConnorJC3/manually-attached
k8s-ci-robot Mar 14, 2023
519028d
Release v1.17.0
ConnorJC3 Mar 14, 2023
f273258
Reduce scope of testing for test-helm-chart
torredil Mar 14, 2023
0485cc8
Merge pull request #1532 from ConnorJC3/release-1.17
k8s-ci-robot Mar 14, 2023
097e48a
Merge pull request #1534 from kubernetes-sigs/release-1.17
k8s-ci-robot Mar 14, 2023
2637aca
Kustomize: use 'resources' instead of deprecated 'bases'
torredil Mar 16, 2023
2735228
Merge pull request #1539 from torredil/update-kustomize
k8s-ci-robot Mar 20, 2023
6a09c59
Merge pull request #1533 from torredil/chart-tester
k8s-ci-robot Mar 20, 2023
cc35256
Support VolumeSnapshotClass in Helm Chart
hanyuel Mar 16, 2023
e538f66
Fix staging / unmounting volume operations on Windows
torredil Mar 21, 2023
d889329
Merge pull request #1540 from hanyuel/helm-vsclass
k8s-ci-robot Mar 21, 2023
f66f30a
Add non-Negative check on getVolumeLimit()
gtxu Mar 22, 2023
5d75bf4
Merge pull request #1542 from gtxu/volme_attach_count
k8s-ci-robot Mar 23, 2023
6f93a56
Grab snow device path via last character rather than trimming
ConnorJC3 Mar 27, 2023
810ef39
Clarify volume resizing in README; Remove Chrome(ium)-specific links
ConnorJC3 Mar 28, 2023
0734390
Merge pull request #1550 from ConnorJC3/readme-resize
k8s-ci-robot Mar 28, 2023
ba2fb4a
Fix VolumeSnapshotClass tagging
hanyuel Mar 27, 2023
67c0374
Merge pull request #1548 from hanyuel/snapshot-tag
k8s-ci-robot Mar 28, 2023
ed42e16
Merge pull request #1546 from ConnorJC3/snow-mount
k8s-ci-robot Mar 29, 2023
7db7d1a
Merge pull request #1526 from torredil/fix-windows-bugs
k8s-ci-robot Mar 31, 2023
ad21c24
Set image repository/tag via --helm-extra-set-args param in CT
torredil Apr 6, 2023
2001925
Fix volume attachment limit calculation
torredil Apr 6, 2023
6a4934e
Support interpolated snapshot tags
hanyuel Apr 4, 2023
cbd4697
Merge pull request #1560 from torredil/ct
k8s-ci-robot Apr 7, 2023
89b1594
Merge pull request #1558 from hanyuel/snapshot-tag-interpolate
k8s-ci-robot Apr 10, 2023
4e96fd3
Merge pull request #1561 from torredil/windows-csinode
k8s-ci-robot Apr 11, 2023
9d311ed
Remove SSH from CI
ConnorJC3 Apr 11, 2023
e5ccff6
Merge pull request #1566 from ConnorJC3/goodbye-ssh
k8s-ci-robot Apr 11, 2023
1250b7d
Add support for Fast Snapshot Restores
torredil Apr 3, 2023
5d4d310
Merge pull request #1554 from torredil/fast-snapshot-restores
k8s-ci-robot Apr 14, 2023
40b11ad
Add target to run External Storage tests on Windows nodes
torredil Apr 14, 2023
5a59297
configure lievness probe check for node-driver-registrar
gtxu Apr 13, 2023
47645fa
Merge pull request #1521 from torredil/e2e-windows
k8s-ci-robot Apr 17, 2023
cfe3673
Merge pull request #1570 from gtxu/add-liveness-probe-sidecar
k8s-ci-robot Apr 17, 2023
c11094b
Merge remote-tracking branch 'openshift/master' into rebase-v1.18.0
jsafrane Apr 26, 2023
3908ac9
UPSTREAM: <carry>: Add OpenShift files
jsafrane Apr 26, 2023
e3fea31
UPSTREAM: <carry>: Add vendor/ directory
RomanBednar Apr 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Grab snow device path via last character rather than trimming
Due to kubernetes-sigs#1518, volumes now start with /dev/xvda rather than /dev/xvdb.
Because of this, the hardcoded path in the snow code stopped working,
breaking mounting on snow devices. This change instead creates the
snow device path based on the last character of the generated path,
rather than trying to do it via trimming, which is unreliable.

Snow devices are currently limited to 10 volumes attached which makes
this 100% safe, but this will need to be revisited if snow ever adds
suport for >26 volumes.

Signed-off-by: Connor Catlett <conncatl@amazon.com>
  • Loading branch information
ConnorJC3 committed Mar 28, 2023
commit 6f93a56a75451bfac12a59c2ad08fe65dc43a68d
6 changes: 5 additions & 1 deletion pkg/driver/node_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ func (d *nodeService) findDevicePath(devicePath, volumeID, partition string) (st

if util.IsSBE(d.metadata.GetRegion()) {
klog.V(5).InfoS("[Debug] Falling back to snow volume lookup", "devicePath", devicePath)
canonicalDevicePath = "/dev/vd" + strings.TrimPrefix(devicePath, "/dev/xvdb")
// Snow completely ignores the requested device path and mounts volumes starting at /dev/vda .. /dev/vdb .. etc
// Morph the device path to the snow form by chopping off the last letter and prefixing with /dev/vd
// VMs on snow devices are currently limited to 10 block devices each - if that ever exceeds 26 this will need
// to be adapted
canonicalDevicePath = "/dev/vd" + devicePath[len(devicePath)-1:]
}

if canonicalDevicePath == "" {
Expand Down
16 changes: 15 additions & 1 deletion pkg/driver/node_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
)

func TestFindDevicePath(t *testing.T) {
devicePath := "/dev/xvdba"
devicePath := "/dev/xvdaa"
nvmeDevicePath := "/dev/nvme1n1"
snowDevicePath := "/dev/vda"
volumeID := "vol-test"
Expand Down Expand Up @@ -120,6 +120,20 @@ func TestFindDevicePath(t *testing.T) {
},
expectDevicePath: snowDevicePath,
},
{
name: "success: non-standard snow device path",
devicePath: "/dev/sda",
volumeID: volumeID,
partition: "",
expectMock: func(mockMounter MockMounter, mockDeviceIdentifier MockDeviceIdentifier) {
gomock.InOrder(
mockMounter.EXPECT().PathExists(gomock.Eq("/dev/sda")).Return(false, nil),

mockDeviceIdentifier.EXPECT().Lstat(gomock.Eq(nvmeName)).Return(nil, os.ErrNotExist),
)
},
expectDevicePath: snowDevicePath,
},
}
// The partition variant of each case should be the same except the partition
// is expected to be appended to devicePath
Expand Down