diff --git a/pkg/azurediskplugin/Dockerfile b/pkg/azurediskplugin/Dockerfile index 370eb3776f..9442dbebff 100644 --- a/pkg/azurediskplugin/Dockerfile +++ b/pkg/azurediskplugin/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.15.1 +FROM alpine:3.18.4 RUN apk upgrade --available --no-cache && \ apk add --no-cache util-linux e2fsprogs e2fsprogs-extra ca-certificates udev xfsprogs xfsprogs-extra btrfs-progs btrfs-progs-extra diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go index 8ce73bd5a7..e7c6d51b62 100644 --- a/test/e2e/dynamic_provisioning_test.go +++ b/test/e2e/dynamic_provisioning_test.go @@ -547,7 +547,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { Cmd: convertToPowershellorCmdCommandIfNecessary("echo 'hello world' > /mnt/test-1/data"), Volumes: t.normalizeVolumes([]testsuites.VolumeDetails{ { - FSType: "ext4", + FSType: "xfs", ClaimSize: "10Gi", VolumeMount: testsuites.VolumeMountDetails{ NameGenerate: "test-volume-", @@ -585,7 +585,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { pod := testsuites.PodDetails{ Volumes: t.normalizeVolumes([]testsuites.VolumeDetails{ { - FSType: "ext4", + FSType: "xfs", ClaimSize: "10Gi", VolumeMount: testsuites.VolumeMountDetails{ NameGenerate: "test-volume-", @@ -600,7 +600,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool) { clonedVolumeSize := "20Gi" podWithClonedVolume := testsuites.PodDetails{ - Cmd: convertToPowershellorCmdCommandIfNecessary("df -h | grep /mnt/test- | awk '{print $2}' | grep 20.0G"), + Cmd: convertToPowershellorCmdCommandIfNecessary("df -h | grep /mnt/test- | awk '{print $2}' | grep -E '19|20'"), IsWindows: isWindowsCluster, WinServerVer: winServerVer, }