Skip to content

Commit

Permalink
chore: upgrade base image to alpine 3.18.4
Browse files Browse the repository at this point in the history
test: set identical xfs file system in e2e test

fix

use ext4 in clone test

fix

test: fix expand volume test failure

workaround fix

use alpine:3.17.5

chore: upgrade base image to v3.16.7

fix
  • Loading branch information
andyzhangx authored and k8s-infra-cherrypick-robot committed Nov 30, 2023
1 parent ae91164 commit 2aad1cf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/azurediskplugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions test/e2e/dynamic_provisioning_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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-",
Expand Down Expand Up @@ -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-",
Expand All @@ -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,
}
Expand Down

0 comments on commit 2aad1cf

Please sign in to comment.