Merge pull request #971 from ericchiang/rm-kubernetes-import

pkg/checkpoint: remove k8s.io/kubernetes import

Author: ericchiang

Gopkg.lock

@@ -19,10 +19,6 @@ revision = "kubernetes-1.9.3"
 [[constraint]]
 name = "k8s.io/client-go"
 revision = "kubernetes-1.9.3"
-[[constraint]]
-# Required for CRI integration
-name = "k8s.io/kubernetes"
-version = "v1.9.3"
 
 [[constraint]]
 name = "github.com/coreos/etcd"

Gopkg.toml

@@ -393,14 +393,5 @@
 				"confidence": 1
 			}
 		]
-	},
-	{
-		"project": "k8s.io/kubernetes/pkg",
-		"licenses": [
-			{
-				"type": "Apache License 2.0",
-				"confidence": 1
-			}
-		]
 	}
 ]

bill-of-materials.json

@@ -0,0 +1,6 @@
+Copied from pkg/kubelet/util to prevent importing kubernetes
+
+```
+wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.2/pkg/kubelet/util/util_unix.go
+wget https://raw.githubusercontent.com/kubernetes/kubernetes/v1.10.2/pkg/kubelet/util/util.go
+```

pkg/checkpoint/internal/README.md

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package internal
 
 import (
 	"fmt"

…s.io/kubernetes/pkg/kubelet/util/util.go pkg/checkpoint/internal/util.govendor/k8s.io/kubernetes/pkg/kubelet/util/util.go renamed to pkg/checkpoint/internal/util.go vendor/k8s.io/kubernetes/pkg/kubelet/util/util.go renamed to pkg/checkpoint/internal/util.go

@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package internal
 
 import (
 	"fmt"

…kubernetes/pkg/kubelet/util/util_unix.go pkg/checkpoint/internal/util_unix.govendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go renamed to pkg/checkpoint/internal/util_unix.go vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unix.go renamed to pkg/checkpoint/internal/util_unix.go

@@ -8,11 +8,19 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	kubelettypes "k8s.io/kubernetes/pkg/kubelet/types"
-	"k8s.io/kubernetes/pkg/kubelet/util"
 
 	"github.com/kubernetes-incubator/bootkube/pkg/checkpoint/cri/v1alpha1"
 	"github.com/kubernetes-incubator/bootkube/pkg/checkpoint/cri/v1alpha2"
+	"github.com/kubernetes-incubator/bootkube/pkg/checkpoint/internal"
+)
+
+// Copied from "k8s.io/kubernetes/pkg/kubelet/types"
+const (
+	kubernetesPodNameLabel       = "io.kubernetes.pod.name"
+	kubernetesPodNamespaceLabel  = "io.kubernetes.pod.namespace"
+	kubernetesPodUIDLabel        = "io.kubernetes.pod.uid"
+	kubernetesContainerNameLabel = "io.kubernetes.container.name"
+	kubernetesContainerTypeLabel = "io.kubernetes.container.type"
 )
 
 type remoteRuntimeService struct {
@@ -23,7 +31,7 @@ type remoteRuntimeService struct {
 
 func newRemoteRuntimeService(endpoint string, connectionTimeout time.Duration) (*remoteRuntimeService, error) {
 	glog.Infof("Connecting to runtime service %s", endpoint)
-	addr, dialer, err := util.GetAddressAndDialer(endpoint)
+	addr, dialer, err := internal.GetAddressAndDialer(endpoint)
 	if err != nil {
 		return nil, err
 	}
@@ -74,12 +82,12 @@ func (r *remoteRuntimeService) localRunningPods() map[string]*v1.Pod {
 	// Add all pods that containers are apart of
 	for _, c := range containers {
 
-		podName := c.Labels[kubelettypes.KubernetesPodNamespaceLabel] + "/" + c.Labels[kubelettypes.KubernetesPodNameLabel]
+		podName := c.Labels[kubernetesPodNamespaceLabel] + "/" + c.Labels[kubernetesPodNameLabel]
 		if _, ok := pods[podName]; !ok {
 			p := &v1.Pod{}
-			p.UID = types.UID(c.Labels[kubelettypes.KubernetesPodUIDLabel])
-			p.Name = c.Labels[kubelettypes.KubernetesPodNameLabel]
-			p.Namespace = c.Labels[kubelettypes.KubernetesPodNamespaceLabel]
+			p.UID = types.UID(c.Labels[kubernetesPodUIDLabel])
+			p.Name = c.Labels[kubernetesPodNameLabel]
+			p.Namespace = c.Labels[kubernetesPodNamespaceLabel]
 
 			pods[podName] = p
 		}