Merge pull request kubernetes-sigs#635 from andyzhangx/CVE-2021-33574

fix: CVE issues in image build
vinli-cn · Mar 27, 2022 · cee5012 · cee5012
2 parents 5b9df4e + 19a10f8
commit cee5012
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile
@@ -21,7 +21,7 @@ COPY ${binary} /blobplugin
 RUN apt update && apt-mark unhold libcap2
 RUN clean-install ca-certificates uuid-dev util-linux mount udev wget e2fsprogs nfs-common netbase
 # install updated packages to fix CVE issues
-RUN clean-install libgmp10 bsdutils libssl1.1 openssl
+RUN clean-install libgmp10 bsdutils libssl1.1 openssl libc-bin libsystemd0
 RUN mkdir /blobfuse-proxy/
 COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/
 ARG ARCH=amd64

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -139,19 +139,13 @@ var _ = ginkgo.AfterSuite(func() {
 		startLog: "===================blob log===================",
 		endLog:   "==================================================",
 	}
-	deleteMetricsSVC := testCmd{
-		command:  "make",
-		args:     []string{"delete-metrics-svc"},
-		startLog: "delete metrics service...",
-		endLog:   "metrics service deleted",
-	}
 	e2eTeardown := testCmd{
 		command:  "make",
 		args:     []string{"e2e-teardown"},
 		startLog: "Uninstalling Azure Blob Storage CSI driver...",
 		endLog:   "Azure Blob Storage CSI driver uninstalled",
 	}
-	execTestCmd([]testCmd{blobLog, deleteMetricsSVC, e2eTeardown})
+	execTestCmd([]testCmd{blobLog, e2eTeardown})
 
 	// install/uninstall CSI Driver deployment scripts test
 	installDriver := testCmd{