Skip to content

Commit 0d9f796

Browse files
Merge pull request openshift#18456 from cgwalters/socat
Automatic merge from submit-queue. bootstrap: Remove unused ErrSocatNotFound For RHELAH 7.5 we're dropping the `kubernetes` RPM which actually indirectly dragged in `socat`. There was some discussion about this on atomic-devel@ a while ago: https://lists.projectatomic.io/projectatomic-archives/atomic-devel/2015-March/msg00066.html From some investigation, it looks like the kubelet now carries the code for this. And it turns out that this reference to socat was introduced by 2d58450 for something different (related to Docker on OS X), but wasn't even used there. Since I noticed it's unused, let's delete it. This patch reduces the number of lines of Go code in this git repo by `0.000027%`.
2 parents bb140ad + c39436e commit 0d9f796

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

pkg/oc/bootstrap/docker/openshift/errors.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ func ErrTimedOutWaitingForStart(container string) errors.Error {
1717
return errors.NewError("timed out waiting for OpenShift container %q", container)
1818
}
1919

20-
func ErrSocatNotFound() errors.Error {
21-
return errors.NewError("socat not found locally").
22-
WithDetails("socat is required to enable port forwarding\n").
23-
WithSolution("Install socat using your package manager first\n")
24-
}
25-
2620
type errPortsNotAvailable struct {
2721
ports []int
2822
}

0 commit comments

Comments
 (0)