Merge pull request #50211 from NuxiNL/util-freebsd

Automatic merge from submit-queue (batch tested with PRs 49869, 47987, 50211, 50804, 50583) Make socket address parsing work on FreeBSD. **What this PR does / why we need it**: I am currently in the process of porting Kubernetes to work on FreeBSD. What is interesting is that I am not interested in using Kubernetes to run Docker containers in this case. I happen to be the author of CloudABI, a sandboxing framework that is available on FreeBSD (and other systems). I want to have a cluster management tool for scheduling these sandboxed processes. Anyway, right now `kubelet` crashes on startup when passing in CRI command line flags, for the reason that it's not able to parse `unix:...` socket addresses. This change fixes this by making the respective Linux-only source file work on FreeBSD as well.

Merge pull request #50211 from NuxiNL/util-freebsd
c8cfc5f7 · Kubernetes Submit Queue · GitHub · 9c8f74e4 · 77dee9bb · c8cfc5f7
Commit c8cfc5f7 authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

BUILD pkg/kubelet/util/BUILD +1 -1

util_unix.go pkg/kubelet/util/util_unix.go +1 -1

util_unsupported.go pkg/kubelet/util/util_unsupported.go +1 -1

No files found.
--- a/pkg/kubelet/util/BUILD
+++ b/pkg/kubelet/util/BUILD
@@ -21,7 +21,7 @@ go_library(
        "util_unsupported.go",
    ] + select({
        "@io_bazel_rules_go//go/platform:linux_amd64": [
-            "util_linux.go",
+            "util_unix.go",
        ],
        "@io_bazel_rules_go//go/platform:windows_amd64": [
            "util_windows.go",

--- a/pkg/kubelet/util/util_linux.go
+++ b/pkg/kubelet/util/util_linux.go
-// +build linux
+// +build freebsd linux
 /*
 Copyright 2017 The Kubernetes Authors.

--- a/pkg/kubelet/util/util_unsupported.go
+++ b/pkg/kubelet/util/util_unsupported.go
-// +build !linux,!windows
+// +build !freebsd,!linux,!windows
 /*
 Copyright 2017 The Kubernetes Authors.