Merge pull request #39 from hakman/bin-dir-image-volumes

k8s-ci-robot · web-flow · commit dcefeb193c2d · 2025-08-03T07:11:37.000-07:00
Use etcd binaries from image volumes
diff --git a/pkg/etcd/etcdprocess.go b/pkg/etcd/etcdprocess.go
@@ -138,6 +138,9 @@ func BindirForEtcdVersion(etcdVersion string, cmd string) (string, error) {
 	for _, baseDir := range baseDirs {
 		binDir := filepath.Join(baseDir, "etcd-"+etcdVersion)
 		binDirs = append(binDirs, binDir)
+		// Mount etcd images as volumes: https://kubernetes.io/docs/tasks/configure-pod-container/image-volumes/
+		binDirImageVolume := filepath.Join(baseDir, "etcd-"+etcdVersion, "usr", "local", "bin")
+		binDirs = append(binDirs, binDirImageVolume)
 	}
 
 	for _, binDir := range binDirs {

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ func BindirForEtcdVersion(etcdVersion string, cmd string) (string, error) {`
`138`	`138`	`for _, baseDir := range baseDirs {`
`139`	`139`	`binDir := filepath.Join(baseDir, "etcd-"+etcdVersion)`
`140`	`140`	`binDirs = append(binDirs, binDir)`
	`141`	`+ // Mount etcd images as volumes: https://kubernetes.io/docs/tasks/configure-pod-container/image-volumes/`
	`142`	`+ binDirImageVolume := filepath.Join(baseDir, "etcd-"+etcdVersion, "usr", "local", "bin")`
	`143`	`+ binDirs = append(binDirs, binDirImageVolume)`
`141`	`144`	`}`
`142`	`145`
`143`	`146`	`for _, binDir := range binDirs {`