Skip to content

Commit b73bf17

Browse files
committed
Update LVM configuration step to run in read only fs
1 parent 787e817 commit b73bf17

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

Dockerfile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ COPY --from=debian /sbin/fsck /sbin/fsck
5555
COPY --from=debian /sbin/fsck* /sbin/
5656
COPY --from=debian /sbin/fsck.xfs /sbin/fsck.xfs
5757
# Add dependencies for LVM
58-
COPY --from=debian /etc/lvm /etc/lvm
59-
COPY --from=debian /etc/lvm* /etc/
58+
COPY --from=debian /etc/lvm /lvm-tmp/lvm
6059
COPY --from=debian /lib/systemd/system/blk-availability.service /lib/systemd/system/blk-availability.service
6160
COPY --from=debian /lib/systemd/system/lvm2-lvmpolld.service /lib/systemd/system/lvm2-lvmpolld.service
6261
COPY --from=debian /lib/systemd/system/lvm2-lvmpolld.socket /lib/systemd/system/lvm2-lvmpolld.socket
@@ -98,6 +97,7 @@ COPY --from=debian /bin/date /bin/date
9897
COPY --from=debian /bin/grep /bin/grep
9998
COPY --from=debian /bin/sed /bin/sed
10099
COPY --from=debian /bin/ln /bin/ln
100+
COPY --from=debian /bin/cp /bin/cp
101101
COPY --from=debian /bin/udevadm /bin/udevadm
102102

103103
# Copy shared libraries into distroless base.
@@ -144,12 +144,6 @@ COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
144144
# Copy NVME support required script and rules into distroless base.
145145
COPY deploy/kubernetes/udev/google_nvme_id /lib/udev_containerized/google_nvme_id
146146

147-
SHELL ["/bin/bash", "-c"]
148-
RUN /bin/sed -i -e "s/.*allow_mixed_block_sizes = 0.*/ allow_mixed_block_sizes = 1/" /etc/lvm/lvm.conf
149-
RUN /bin/sed -i -e "s/.*udev_sync = 1.*/ udev_sync = 0/" /etc/lvm/lvm.conf
150-
RUN /bin/sed -i -e "s/.*udev_rules = 1.*/ udev_rules = 0/" /etc/lvm/lvm.conf
151-
RUN /bin/sed -i -e "s/.*locking_dir = .*/ locking_dir = \"\/tmp\"/" /etc/lvm/lvm.conf
152-
153147

154148
# Build stage used for validation of the output-image
155149
# See validate-container-linux-* targets in Makefile
@@ -162,5 +156,5 @@ RUN /print-missing-deps.sh
162156

163157
# Final build stage, create the real Docker image with ENTRYPOINT
164158
FROM output-image
165-
166-
ENTRYPOINT ["/gce-pd-csi-driver"]
159+
COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/initialize-driver.sh /initialize-driver.sh
160+
ENTRYPOINT ["/initialize-driver.sh"]

initialize-driver.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
/bin/cp -r /lvm-tmp/lvm /etc/
4+
/bin/sed -i -e "s/.*allow_mixed_block_sizes = 0.*/ allow_mixed_block_sizes = 1/" /etc/lvm/lvm.conf
5+
/bin/sed -i -e "s/.*udev_sync = 1.*/ udev_sync = 0/" /etc/lvm/lvm.conf
6+
/bin/sed -i -e "s/.*udev_rules = 1.*/ udev_rules = 0/" /etc/lvm/lvm.conf
7+
/bin/sed -i -e "s/.*locking_dir = .*/ locking_dir = \"\/tmp\"/" /etc/lvm/lvm.conf
8+
9+
/gce-pd-csi-driver "$@"

0 commit comments

Comments
 (0)