Build images from tarballs

.gitignore

@@ -1,3 +1,6 @@
+# ignore the kind binary at the root of the project
+/kind
+
 # build outputs
 /_output
 /_artifacts

cmd/kind/build/nodeimage/nodeimage.go

@@ -46,7 +46,7 @@ func NewCommand() *cobra.Command {
 	}
 	cmd.Flags().StringVar(
 		&flags.BuildType, "type",
-		"docker", "build type, one of [bazel, docker, apt]",
+		"docker", "build type, one of [bazel, docker, apt, tar]",
 	)
 	cmd.Flags().StringVar(
 		&flags.Image, "image",

pkg/build/kube/aptbits.go

@@ -45,6 +45,9 @@ func (b *AptBits) Build() error {
 	return nil
 }
 
+// Clean implements the Bits.Clean interface.
+func (b *AptBits) Clean() {}
+
 // Paths implements Bits.Paths
 func (b *AptBits) Paths() map[string]string {
 	return map[string]string{}

pkg/build/kube/bazelbuildbits.go

@@ -85,6 +85,9 @@ func (b *BazelBuildBits) Build() error {
 	return buildVersionFile(b.kubeRoot)
 }
 
+// Clean implements the Bits.Clean interface.
+func (b *BazelBuildBits) Clean() {}
+
 func (b *BazelBuildBits) findPaths(bazelGoosGoarch string) map[string]string {
 	// https://docs.bazel.build/versions/master/output_directories.html
 	binDir := filepath.Join(b.kubeRoot, "bazel-bin")

pkg/build/kube/bits.go

@@ -41,6 +41,9 @@ type Bits interface {
 	// TODO(bentheelder): eliminate install, make install file-copies only,
 	// support cross-building
 	Install(InstallContext) error
+	// Clean is called after the image has been built and gives a Bits
+	// implementation an opportunity to clean up after itself.
+	Clean()
 }
 
 // InstallContext should be implemented by users of Bits
@@ -59,6 +62,7 @@ type InstallContext interface {
 // "apt" -> NewAptBits(kubeRoot)
 // "bazel" -> NewBazelBuildBits(kubeRoot)
 // "docker" or "make" -> NewDockerBuildBits(kubeRoot)
+// "tar" -> NewTarBits(kubeRoot)
 func NewNamedBits(name string, kubeRoot string) (bits Bits, err error) {
 	bitsImpls.Lock()
 	fn, ok := bitsImpls.impls[name]

pkg/build/kube/dockerbuildbits.go

@@ -21,9 +21,10 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"sigs.k8s.io/kind/pkg/util"
 	"strings"
 
+	"sigs.k8s.io/kind/pkg/util"
+
 	"github.com/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/exec"
@@ -86,6 +87,9 @@ func (b *DockerBuildBits) Build() error {
 	return buildVersionFile(b.kubeRoot)
 }
 
+// Clean implements the Bits.Clean interface.
+func (b *DockerBuildBits) Clean() {}
+
 // binary and image build when we have `make quick-release-images` support
 func (b *DockerBuildBits) build() error {
 	// build binaries

pkg/build/kube/files.go

@@ -0,0 +1,84 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kube
+
+import (
+	"io/ioutil"
+	"net/http"
+
+	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
+)
+
+const kubeletServiceURI = `https://raw.githubusercontent.com/kubernetes/release/master/debian/xenial/kubelet/lib/systemd/system/kubelet.service`
+
+const kubeletService = `[Unit]
+Description=kubelet: The Kubernetes Node Agent
+Documentation=http://kubernetes.io/docs/
+
+[Service]
+ExecStart=/usr/bin/kubelet
+Restart=always
+StartLimitInterval=0
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+`
+
+const tenKubeadmConfURI = `https://raw.githubusercontent.com/kubernetes/release/master/debian/xenial/kubeadm/channel/stable/etc/systemd/system/kubelet.service.d/post-1.10/10-kubeadm.conf`
+
+const tenKubeadmConf = `# Note: This dropin only works with kubeadm and kubelet v1.11+
+[Service]
+Environment="KUBELET_KUBECONFIG_ARGS=--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf"
+Environment="KUBELET_CONFIG_ARGS=--config=/var/lib/kubelet/config.yaml"
+# This is a file that "kubeadm init" and "kubeadm join" generates at runtime, populating the KUBELET_KUBEADM_ARGS variable dynamically
+EnvironmentFile=-/var/lib/kubelet/kubeadm-flags.env
+# This is a file that the user can use for overrides of the kubelet args as a last resort. Preferably, the user should use
+# the .NodeRegistration.KubeletExtraArgs object in the configuration files instead. KUBELET_EXTRA_ARGS should be sourced from this file.
+EnvironmentFile=-/etc/default/kubelet
+ExecStart=
+ExecStart=/usr/bin/kubelet $KUBELET_KUBECONFIG_ARGS $KUBELET_CONFIG_ARGS $KUBELET_KUBEADM_ARGS $KUBELET_EXTRA_ARGS
+`
+
+func getKubeletServiceBytes() []byte {
+	return getRemoteOrDefaultBytes(kubeletServiceURI, kubeletService)
+}
+
+func getTenKubeadmConfBytes() []byte {
+	return getRemoteOrDefaultBytes(tenKubeadmConfURI, tenKubeadmConf)
+}
+
+func getRemoteOrDefaultBytes(uri, defaultContent string) []byte {
+	resp, err := http.Get(uri)
+	if err == nil && resp.StatusCode != 200 {
+		err = errors.Errorf("%s", resp.Status)
+	}
+	if err != nil {
+		log.WithError(err).Debugf(
+			"error reading %s; using default content", uri)
+		return []byte(defaultContent)
+	}
+	defer resp.Body.Close()
+	buf, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		log.WithError(err).Debugf(
+			"error reading %s; using default content", uri)
+		return []byte(defaultContent)
+	}
+	return buf
+}