From 273dcae2acb97f038f7c3eaabdfd51b8d7544aa3 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 8 Apr 2019 14:57:14 -0700 Subject: [PATCH 01/18] remove manpages in clean-install --- images/base/clean-install | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/base/clean-install b/images/base/clean-install index 74b7d21ca0..33b3238b75 100755 --- a/images/base/clean-install +++ b/images/base/clean-install @@ -26,11 +26,14 @@ if [ $# = 0 ]; then fi apt-get update -apt-get install -y --no-install-recommends $@ +apt-get install -y --no-install-recommends "$@" apt-get clean -y rm -rf \ /var/cache/debconf/* \ /var/lib/apt/lists/* \ /var/log/* \ /tmp/* \ - /var/tmp/* + /var/tmp/* \ + /usr/share/doc/* \ + /usr/share/man/* \ + /usr/share/local/* From 37fc6bfd57f273df53280aabf06f0ef21afc9f7e Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 9 Apr 2019 11:49:23 -0700 Subject: [PATCH 02/18] containerd --- images/base/Dockerfile | 59 +++++++------------ pkg/build/node/node.go | 46 ++++++++++++--- pkg/cluster/internal/create/nodes.go | 10 ---- pkg/cluster/internal/kubeadm/config.go | 26 +++++++-- pkg/cluster/nodes/node.go | 79 +------------------------- pkg/cluster/nodes/nodes.go | 11 ++++ pkg/exec/exec.go | 3 +- 7 files changed, 92 insertions(+), 142 deletions(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 9179de1625..fe0a80b368 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -12,16 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -# kind cluster base image, built on ubuntu:18.04 -# -# To this we add systemd, CNI, and other tools needed to run Kubeadm +# kind cluster base image # # For systemd + docker configuration used below, see the following references: # https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/ # https://developers.redhat.com/blog/2014/05/05/running-systemd-within-docker-container/ # https://developers.redhat.com/blog/2016/09/13/running-systemd-in-a-non-privileged-container/ -ARG BASE_IMAGE="ubuntu:18.04" +ARG BASE_IMAGE="ubuntu:19.04" FROM ${BASE_IMAGE} # setting DEBIAN_FRONTEND=noninteractive stops some apt warnings, this is not @@ -34,18 +32,18 @@ RUN chmod +x /usr/local/bin/clean-install # Get dependencies # The base image already has: ssh, apt, snapd # This is broken down into (each on a line): -# - packages necessary for installing docker # - packages needed to run services (systemd) -# - packages needed for docker / hyperkube / kubernetes components -# - misc packages (utilities we use in our own tooling) +# - CRI (containerd) +# - packages needed for kubernetes components +# - misc packages kind uses itself # Then we cleanup (removing unwanted systemd services) # Finally we disable kmsg in journald # https://developers.redhat.com/blog/2014/05/05/running-systemd-within-docker-container/ RUN clean-install \ - apt-transport-https ca-certificates curl software-properties-common gnupg2 lsb-release \ systemd systemd-sysv libsystemd0 \ - conntrack iptables iproute2 ethtool socat util-linux mount ebtables udev kmod aufs-tools \ - bash rsync \ + containerd \ + conntrack iptables iproute2 ethtool socat util-linux mount ebtables udev kmod \ + bash ca-certificates curl rsync \ && find /lib/systemd/system/sysinit.target.wants/ -name "systemd-tmpfiles-setup.service" -delete \ && rm -f /lib/systemd/system/multi-user.target.wants/* \ && rm -f /etc/systemd/system/*.wants/* \ @@ -53,31 +51,13 @@ RUN clean-install \ && rm -f /lib/systemd/system/sockets.target.wants/*udev* \ && rm -f /lib/systemd/system/sockets.target.wants/*initctl* \ && rm -f /lib/systemd/system/basic.target.wants/* \ - && echo "ReadKMsg=no" >> /etc/systemd/journald.conf - -# Install docker, which needs to happen after we install some of the packages above -# based on https://docs.docker.com/install/linux/docker-ce/ubuntu/#set-up-the-repository -# and https://kubernetes.io/docs/setup/independent/install-kubeadm/#installing-docker -# - get docker's GPG key -# - add the fingerprint -# - add the repository -# - update apt, install docker, cleanup -# NOTE: 18.09 is officially supported by Kubernetes currently, so we pin to that. -# https://kubernetes.io/docs/tasks/tools/install-kubeadm/ -ARG DOCKER_VERSION="5:18.09.*" -# another temporary env, not a real argument. setting this to a non-zero value -# silences this warning from apt-key: -# "Warning: apt-key output should not be parsed (stdout is not a terminal)" -ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE="false" -RUN curl -fsSL "https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg" | apt-key add - \ - && apt-key fingerprint 0EBFCD88 \ - && add-apt-repository \ - "deb https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable" \ - && clean-install "docker-ce=${DOCKER_VERSION}" + && echo "ReadKMsg=no" >> /etc/systemd/journald.conf \ + && systemctl enable containerd \ + && echo "done installing packages" -# Enable CRI for containerd -RUN mkdir -p /etc/docker && echo '{"cri-containerd": true}' > /etc/docker/daemon.json -RUN mkdir -p /etc/containerd && containerd config default > /etc/containerd/config.toml +# debug containerd version and create default config +RUN containerd --version \ + && mkdir -p /etc/containerd && containerd config default > /etc/containerd/config.toml # Install CNI binaries to /opt/cni/bin # TODO(bentheelder): doc why / what here @@ -92,6 +72,11 @@ RUN export ARCH=$(dpkg --print-architecture) \ && tar -C /opt/cni/bin -xzf /tmp/cni.tgz \ && rm -rf /tmp/cni.tgz +# Install crictl to /usr/local/bin +ARG CRICTL_VERSION="v1.14.0" +RUN export ARCH=$(dpkg --print-architecture) \ + && curl -fSL "https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${ARCH}.tar.gz" | tar xzC /usr/local/bin + # tell systemd that it is in docker (it will check for the container env) # https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/ ENV container docker @@ -108,12 +93,6 @@ COPY [ "entrypoint/entrypoint", "/usr/local/bin/" ] # NOTE: this is *only* for documentation, the entrypoint is overridden at runtime ENTRYPOINT [ "/usr/local/bin/entrypoint", "/sbin/init" ] -# the docker graph must be a volume to avoid overlay on overlay -# NOTE: we do this last because changing a volume with a Dockerfile must -# occur before defining it. -# See: https://docs.docker.com/engine/reference/builder/#volume -VOLUME [ "/var/lib/docker" ] - # TODO(bentheelder): deal with systemd MAC address assignment # https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 # https://github.com/systemd/systemd/issues/3374#issuecomment-339258483 diff --git a/pkg/build/node/node.go b/pkg/build/node/node.go index c7fc3ed260..3611049ed8 100644 --- a/pkg/build/node/node.go +++ b/pkg/build/node/node.go @@ -255,7 +255,7 @@ func (c *BuildContext) buildImage(dir string) error { }() } if err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to create build container: %v", err) return err } @@ -273,13 +273,13 @@ func (c *BuildContext) buildImage(dir string) error { // make artifacts directory if err = execInBuild("mkdir", "/kind/"); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to make directory %v", err) return err } // copy artifacts in if err = execInBuild("rsync", "-r", "/build/bits/", "/kind/"); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to sync bits: %v", err) return err } @@ -289,7 +289,7 @@ func (c *BuildContext) buildImage(dir string) error { containerID: containerID, } if err = c.bits.Install(ic); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to install Kubernetes: %v", err) return err } @@ -297,21 +297,33 @@ func (c *BuildContext) buildImage(dir string) error { if err = execInBuild("/bin/sh", "-c", `echo "KUBELET_EXTRA_ARGS=--fail-swap-on=false" >> /etc/default/kubelet`, ); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to add kubelet extra args: %v", err) return err } // pre-pull images that were not part of the build if err = c.prePullImages(dir, containerID); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to pull Images: %v", err) return err } // Save the image changes to a new image - cmd := exec.Command("docker", "commit", containerID, c.image) + cmd := exec.Command( + "docker", "commit", + /* + The snapshot storage must be a volume to avoid overlay on overlay + + NOTE: we do this last because changing a volume with a docker image + must occur before defining it. + + See: https://docs.docker.com/engine/reference/builder/#volume + */ + "--change", `VOLUME [ "/var/lib/containerd" ]`, + containerID, c.image, + ) exec.InheritOutput(cmd) if err = cmd.Run(); err != nil { - log.Errorf("Image build Failed! %v", err) + log.Errorf("Image build Failed! Failed to save image: %v", err) return err } @@ -436,6 +448,24 @@ func (c *BuildContext) prePullImages(dir, containerID string) error { log.Errorf("Image build Failed! Failed chown images dir %v", err) return err } + + // preload images into containerd + // TODO(bentheelder): we can skip the move and chown steps if we go directly to this + // NOTE: we _expect_ errors on import, because containerd will try to unpack into + // the snapshotter, but we're actually just trying to get the images into the content + // store. + // see https://github.com/containerd/containerd/blob/master/design/architecture.md + // TODO(bentheelder): the API is actually Import(); Unpack(), we should be able + // to skip unpackaging and avoid the errors + if err = inheritOutputAndRun(cmder.Command( + "bash", "-c", + // TODO(bentheelder): error handling? (this will always return the rm) + `containerd & find /kind/images -name *.tar -print0 | xargs -0 -n 1 -P $(nproc) ctr --namespace=k8s.io images import; kill %1; rm -rf /kind/images/*`, + )); err != nil { + log.Errorf("Image build Failed! Failed to load images into containerd %v", err) + return err + } + return nil } diff --git a/pkg/cluster/internal/create/nodes.go b/pkg/cluster/internal/create/nodes.go index 41fa578287..58e5ea0a18 100644 --- a/pkg/cluster/internal/create/nodes.go +++ b/pkg/cluster/internal/create/nodes.go @@ -21,7 +21,6 @@ import ( "sort" "strings" "sync" - "time" "github.com/pkg/errors" @@ -159,15 +158,6 @@ func fixupNode(node *nodes.Node) error { return err } - // wait for docker to be ready - if !node.WaitForDocker(time.Now().Add(time.Second * 60)) { - // TODO(bentheelder): logging here - return errors.Errorf("timed out waiting for docker to be ready on node %s", node.Name()) - } - - // load the docker image artifacts into the docker daemon - node.LoadImages() - return nil } diff --git a/pkg/cluster/internal/kubeadm/config.go b/pkg/cluster/internal/kubeadm/config.go index a4eb357f78..ed135e2335 100644 --- a/pkg/cluster/internal/kubeadm/config.go +++ b/pkg/cluster/internal/kubeadm/config.go @@ -61,9 +61,8 @@ func (c *ConfigData) Derive() { // EG: // https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 -// ConfigTemplateAlphaV1orV2 is the kubadm config template for API versions -// v1alpha1 and v1alpha2 -const ConfigTemplateAlphaV1orV2 = `# config generated by kind +// ConfigTemplateAlphaV2 is the kubadm config template for v1alpha2 +const ConfigTemplateAlphaV2 = `# config generated by kind apiVersion: kubeadm.k8s.io/v1alpha2 kind: MasterConfiguration metadata: @@ -105,6 +104,15 @@ kubeletConfiguration: imagefs.available: "0%" controllerManagerExtraArgs: enable-hostpath-provisioner: "true" +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" +--- +apiVersion: kubeadm.k8s.io/v1alpha2 +kind: NodeConfiguration +metadata: + name: config +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" ` // ConfigTemplateAlphaV3 is the kubadm config template for API version v1alpha3 @@ -144,12 +152,16 @@ bootstrapTokens: # from the host machine such port will be accessible via a random local port instead. apiEndpoint: bindPort: {{.APIBindPort}} +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" --- # no-op entry that exists solely so it can be patched apiVersion: kubeadm.k8s.io/v1alpha3 kind: JoinConfiguration metadata: name: config +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration @@ -202,12 +214,16 @@ bootstrapTokens: # from the host machine such port will be accessible via a random local port instead. localAPIEndpoint: bindPort: {{.APIBindPort}} +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" --- # no-op entry that exists solely so it can be patched apiVersion: kubeadm.k8s.io/v1beta1 kind: JoinConfiguration metadata: name: config +nodeRegistration: + criSocket: "/run/containerd/containerd.sock" --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration @@ -240,9 +256,7 @@ func Config(data ConfigData) (config string, err error) { // assume the latest API version, then fallback if the k8s version is too low templateSource := ConfigTemplateBetaV1 if ver.LessThan(version.MustParseSemantic("v1.12.0")) { - // NOTE: The complexity of the config does not require special handling - // between v1alpha1 and v1alpha2 yet. - templateSource = ConfigTemplateAlphaV1orV2 + templateSource = ConfigTemplateAlphaV2 } else if ver.LessThan(version.MustParseSemantic("v1.13.0")) { templateSource = ConfigTemplateAlphaV3 } diff --git a/pkg/cluster/nodes/node.go b/pkg/cluster/nodes/node.go index 87c38d48c4..b41c1cf570 100644 --- a/pkg/cluster/nodes/node.go +++ b/pkg/cluster/nodes/node.go @@ -26,17 +26,13 @@ import ( "strconv" "strings" "sync" - "time" "github.com/pkg/errors" - log "github.com/sirupsen/logrus" - "k8s.io/apimachinery/pkg/util/version" "sigs.k8s.io/kind/pkg/cluster/constants" "sigs.k8s.io/kind/pkg/container/docker" "sigs.k8s.io/kind/pkg/exec" - "sigs.k8s.io/kind/pkg/util" ) // Node represents a handle to a kind node @@ -135,69 +131,6 @@ func (n *Node) CopyFrom(source, dest string) error { return docker.CopyFrom(n.name, source, dest) } -// WaitForDocker waits for Docker to be ready on the node -// it returns true on success, and false on a timeout -func (n *Node) WaitForDocker(until time.Time) bool { - return tryUntil(until, func() bool { - cmd := n.Command("systemctl", "is-active", "docker") - out, err := exec.CombinedOutputLines(cmd) - if err != nil { - return false - } - return len(out) == 1 && out[0] == "active" - }) -} - -// helper that calls `try()`` in a loop until the deadline `until` -// has passed or `try()`returns true, returns wether try ever returned true -func tryUntil(until time.Time, try func() bool) bool { - for until.After(time.Now()) { - if try() { - return true - } - } - return false -} - -// LoadImages loads image tarballs stored on the node into docker on the node -func (n *Node) LoadImages() { - // load images cached on the node into docker - if err := n.Command( - "/bin/bash", "-c", - // use xargs to load images in parallel - `find /kind/images -name *.tar -print0 | xargs -0 -n 1 -P $(nproc) docker load -i`, - ).Run(); err != nil { - log.Warningf("Failed to preload docker images: %v", err) - return - } - - // if this fails, we don't care yet, but try to get the kubernetes version - // and see if we can skip retagging for amd64 - // if this fails, we can just assume some unknown version and re-tag - // in a future release of kind, we can probably drop v1.11 support - // and remove the logic below this comment entirely - if rawVersion, err := n.KubeVersion(); err == nil { - if ver, err := version.ParseGeneric(rawVersion); err == nil { - if !ver.LessThan(version.MustParseSemantic("v1.12.0")) { - return - } - } - } - - // for older releases, we need the images to have the arch in their name - // bazel built images were missing these, newer releases do not use them - // for any builds ... - // retag images that are missing -amd64 as image:tag -> image-amd64:tag - // TODO(bentheelder): this is a bit gross, move this logic out of bash - if err := n.Command( - "/bin/bash", "-c", - fmt.Sprintf(`docker images --format='{{.Repository}}:{{.Tag}}' | grep -v %s | xargs -L 1 -I '{}' /bin/bash -c 'docker tag "{}" "$(echo "{}" | sed s/:/-%s:/)"'`, - util.GetArch(), util.GetArch()), - ).Run(); err != nil { - log.Warningf("Failed to re-tag docker images: %v", err) - } -} - // FixMounts will correct mounts in the node container to meet the right // sharing and permissions for systemd and Docker / Kubernetes func (n *Node) FixMounts() error { @@ -221,16 +154,6 @@ func (n *Node) FixMounts() error { if err := n.Command("mount", "-o", "remount,ro", "/sys").Run(); err != nil { return err } - // kubernetes needs shared mount propagation - if err := n.Command("mount", "--make-shared", "/").Run(); err != nil { - return err - } - if err := n.Command("mount", "--make-shared", "/run").Run(); err != nil { - return err - } - if err := n.Command("mount", "--make-shared", "/var/lib/docker").Run(); err != nil { - return err - } return nil } @@ -404,6 +327,8 @@ func (n *Node) SetProxy() error { proxies += fmt.Sprintf("\"%s=%s\" ", key, val) } + // TODO(bentheelder): containerd + err := n.WriteFile("/etc/systemd/system/docker.service.d/http-proxy.conf", "[Service]\nEnvironment="+proxies) if err != nil { diff --git a/pkg/cluster/nodes/nodes.go b/pkg/cluster/nodes/nodes.go index 0069febc85..2f641640bf 100644 --- a/pkg/cluster/nodes/nodes.go +++ b/pkg/cluster/nodes/nodes.go @@ -134,3 +134,14 @@ func WaitForReady(node *Node, until time.Time) bool { return true }) } + +// helper that calls `try()`` in a loop until the deadline `until` +// has passed or `try()`returns true, returns wether try ever returned true +func tryUntil(until time.Time, try func() bool) bool { + for until.After(time.Now()) { + if try() { + return true + } + } + return false +} diff --git a/pkg/exec/exec.go b/pkg/exec/exec.go index 91bf021418..673ebaa2f6 100644 --- a/pkg/exec/exec.go +++ b/pkg/exec/exec.go @@ -72,9 +72,10 @@ func CombinedOutputLines(cmd Cmd) (lines []string, err error) { } // InheritOutput sets cmd's output to write to the current process's stdout and stderr -func InheritOutput(cmd Cmd) { +func InheritOutput(cmd Cmd) Cmd { cmd.SetStderr(os.Stderr) cmd.SetStdout(os.Stdout) + return cmd } // RunLoggingOutputOnFail runs the cmd, logging error output if Run returns an error From 614480e6e7be5218b32aa689b9f988a52fb656a2 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 12:41:34 -0700 Subject: [PATCH 03/18] hack/update-generated.sh --- pkg/build/base/sources/images_sources.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/build/base/sources/images_sources.go b/pkg/build/base/sources/images_sources.go index 1774210f76..f934ac3d7c 100644 --- a/pkg/build/base/sources/images_sources.go +++ b/pkg/build/base/sources/images_sources.go @@ -70,7 +70,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _imagesBaseDockerfile = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x58\xfb\x6f\xdb\x46\x12\xfe\x5d\x7f\xc5\x80\x32\x1a\x3b\x15\x49\xc7\x8e\x5b\xc7\x85\x7b\x50\x6c\xc5\x15\xe2\x48\x81\xa4\x24\x08\xee\x0e\xc6\x92\x1c\x91\x5b\x2d\x77\x79\xfb\x90\xac\xe4\xfc\xbf\x1f\x66\x49\xea\xe1\x38\xbd\x02\xbd\x2b\x0a\xc4\x22\x77\xe7\xb5\xdf\x7c\xf3\x2d\xbb\x70\xa5\xaa\xb5\xe6\x79\x61\xe1\xe4\xf8\xc5\x39\xcc\x0a\x84\xb7\x2e\x41\x2d\xd1\xa2\x81\xbe\xb3\x85\xd2\x26\xea\x74\x3b\x5d\xb8\xe5\x29\x4a\x83\x19\x38\x99\xa1\x06\x5b\x20\xf4\x2b\x96\x16\xd8\xbe\xe9\xc1\x47\xd4\x86\x2b\x09\x27\xd1\x31\x1c\xd2\x82\xa0\x79\x15\x1c\xfd\xd2\xe9\xc2\x5a\x39\x28\xd9\x1a\xa4\xb2\xe0\x0c\x82\x2d\xb8\x81\x39\x17\x08\x78\x9f\x62\x65\x81\x4b\x48\x55\x59\x09\xce\x64\x8a\xb0\xe2\xb6\xf0\x6e\x1a\x23\x51\xa7\x0b\x9f\x1b\x13\x2a\xb1\x8c\x4b\x60\x90\xaa\x6a\x0d\x6a\xbe\xbb\x0e\x98\xf5\x01\xd3\x7f\x85\xb5\xd5\x45\x1c\xaf\x56\xab\x88\xf9\x60\x23\xa5\xf3\x58\xd4\x0b\x4d\x7c\x3b\xbc\x1a\x8c\xa6\x83\xf0\x24\x3a\xf6\x5b\x3e\x48\x81\xc6\x80\xc6\x7f\x39\xae\x31\x83\x64\x0d\xac\xaa\x04\x4f\x59\x22\x10\x04\x5b\x81\xd2\xc0\x72\x8d\x98\x81\x55\x14\xef\x4a\x73\xcb\x65\xde\x03\xa3\xe6\x76\xc5\x34\x76\xba\x90\x71\x63\x35\x4f\x9c\xdd\x2b\x56\x1b\x1d\x37\x7b\x0b\x94\x04\x26\x21\xe8\x4f\x61\x38\x0d\xe0\x75\x7f\x3a\x9c\xf6\x3a\x5d\xf8\x34\x9c\xfd\x36\xfe\x30\x83\x4f\xfd\xc9\xa4\x3f\x9a\x0d\x07\x53\x18\x4f\xe0\x6a\x3c\xba\x1e\xce\x86\xe3\xd1\x14\xc6\x6f\xa0\x3f\xfa\x0c\x6f\x87\xa3\xeb\x1e\x20\xb7\x05\x6a\xc0\xfb\x4a\x53\xfc\x4a\x03\xa7\x32\x62\x46\x35\x9b\x22\xee\x05\x30\x57\x75\x40\xa6\xc2\x94\xcf\x79\x0a\x82\xc9\xdc\xb1\x1c\x21\x57\x4b\xd4\x92\xcb\x1c\x2a\xd4\x25\x37\x74\x98\x06\x98\xcc\x3a\x5d\x10\xbc\xe4\x96\x59\xff\xe4\x9b\xa4\xa2\x4e\xa7\x0b\x0b\x2e\x33\x48\x85\x33\x16\x35\x24\x8c\x52\x2d\x59\x8e\x3d\x48\x1c\x17\x96\x12\x75\x89\x93\xd6\x5d\xbc\x38\x8f\x8e\x5f\xfa\x7a\xcf\x54\x0d\x82\x15\x02\xcb\x32\x30\x6b\x63\xb1\xcc\x7a\x70\x35\x1a\xf6\xc8\x2f\x28\x9f\x97\x55\x4a\x18\x90\x88\x59\x5d\x77\xed\xa4\x87\x29\xcb\x4a\x6f\xe6\x8d\xd2\xed\x5e\xf8\x11\x32\x95\x2e\x50\x43\xaa\xe4\x9c\xe7\x4e\xfb\x98\x09\x6f\x19\x24\x28\xd4\xaa\x07\xa6\x29\xc8\x5c\x09\xa1\x56\x94\xae\xc6\x39\x6a\x94\x29\x9a\x8b\x4e\xd7\x83\xc6\x34\xa8\x99\xd3\x59\xa3\x59\x58\x55\x79\xe8\xac\xf8\x82\xc7\xd3\xe6\xac\xe3\xc6\x69\x7c\xa5\x24\xe1\x11\xf5\x50\x5a\xd4\x73\x96\x62\xbc\x63\x27\xc3\x25\x0a\x55\xa1\x36\x91\xc6\xac\x60\x36\x4a\x55\x19\x27\x42\xe5\xf1\xc9\xf1\x8b\x97\xf1\xf1\x19\xfd\xaf\x9d\xa4\xd2\x87\x8d\xcd\x90\xe0\xcf\x65\x58\x67\x13\xa6\xad\x87\x3f\x6f\xf8\xa7\xf8\xf8\x55\xfc\xe2\xf4\x1b\xc3\x5c\x86\x2c\x94\x4a\x86\x95\xe6\x4b\x2e\x30\xc7\x6c\xd7\x7c\xa7\x3f\xb9\x21\x1c\x0e\xee\x86\xef\xfa\x37\x83\xcb\x60\xf7\xd4\x82\xce\x9b\xc9\xf8\x1d\x1c\x7c\xdd\x2e\x78\xa0\xb3\x37\x68\xa9\x0d\xe0\x7a\xf0\x7a\xd8\x1f\xdd\xbd\x99\x8c\x47\xb3\xc1\xe8\xfa\x52\x2a\xc9\xa9\x24\x2c\xb5\x7c\x89\x60\xac\xaa\x0c\x18\x55\x22\xb0\xca\xc2\x8a\x79\xb4\x99\x5e\x8d\x02\x6e\x3c\x35\x74\xba\xc0\x40\x23\x13\xc0\x74\xee\x4a\x94\xb6\x07\x2b\x7c\xa6\x11\x0e\x59\x72\xe4\x0c\xf9\xa1\x18\xad\x82\x1c\x2d\x30\xb0\x58\x56\x4a\x33\xbd\x86\xc1\xe8\x23\xb0\x9c\x71\x19\xf9\x2c\xfe\x38\x9a\x4e\xe7\x6a\xfc\xfe\x33\xa4\x02\x99\x0c\xb9\x34\x96\x09\x01\xb1\x33\x3a\x16\x2a\x65\x22\x4e\xb8\x8c\xf7\x5e\x76\x26\x1f\x46\x90\x16\xa5\xca\xe0\xc7\xfb\x3f\x5e\xd9\xe9\xc2\x0d\x5a\xc8\xb0\x42\x99\xa1\x4c\x39\x1a\x82\x7b\x81\x3b\x8d\x01\x4c\x68\x64\xd9\x1a\x0a\x66\x2e\xc0\x98\xa2\x47\x45\xe9\x81\x91\xac\xca\xfc\xea\xba\x26\x89\x56\x0b\x94\x90\xa9\x95\x04\x2e\xad\x82\x43\x64\x69\xe1\x89\x03\x04\x97\x78\x44\x98\x0d\xa1\x62\xe9\x82\xe5\x48\x7d\x92\xa2\x31\x54\x0e\xea\xf4\x26\x22\x2a\x5a\x0d\xa5\xc7\x8b\x77\x9b\xca\xa0\x5e\xf2\x14\x0d\x1c\x36\x60\x39\x7a\x72\x35\xd9\x6d\xba\x2c\x86\x62\x5d\xa1\x5e\xb8\x04\x21\x86\xc5\x76\x76\x10\x91\x2b\x89\xd2\x1a\x6f\xa2\xe4\x26\xdd\xda\x39\x74\x96\x0b\x6e\x39\xfa\xd6\xa7\x59\xc0\x25\x28\xa7\x81\x72\xa4\x6e\xe7\x32\x3f\xaa\x0b\x26\x69\x85\x2f\xae\xab\xe0\x50\x63\xa9\x96\x94\x8b\x93\x2b\x26\x89\x3f\xdb\xbe\x6f\x43\xa7\x6d\x6f\xb8\x64\x42\xac\x69\x67\xc6\x8d\xe7\xee\x45\x69\x72\x72\xf2\xbb\x72\x5a\x32\x91\xfd\xff\xda\xd3\x83\x64\x0f\x53\xff\xe8\xf8\x59\x44\xa7\x1b\x5a\xcd\xa4\xa9\x94\xb6\xa1\x77\x0f\x29\x0b\x53\xd4\x96\x78\x98\xf9\xb2\x39\x2d\x36\xb3\x24\xac\x34\xc5\x45\x75\x0a\x53\x55\x96\x4a\x42\x2e\x5d\x95\x9f\x80\x30\x49\xa8\x51\x20\x81\xa9\x35\xbf\xa9\x44\x13\xa1\x59\x9b\x25\x08\x9e\x34\xbf\x8f\x37\x0b\x53\x25\xa5\xd5\x2c\x5d\x00\xaf\x2c\x55\xc7\x00\xaf\xb4\x72\x16\x4f\x00\x6d\x41\xf5\x07\xa3\x52\x66\x81\x8e\x29\x14\x5c\xba\x7b\x28\x95\x93\x16\x30\x69\x36\xb8\x0c\x97\xb0\xa0\x56\x60\x6e\x6e\xc2\x9a\xa1\x5b\x07\x09\x33\x05\x68\xb3\x96\x69\xf3\xe8\x87\x1f\x60\x4e\xd3\x21\x16\x3c\xd9\x90\x66\xfd\x2f\xfd\xc3\x25\xb7\x91\x65\x3a\x47\x1b\xd1\xb1\x9a\x18\x42\xc9\x4a\x84\xa0\xcd\xc5\x96\x15\x09\x05\x13\x1a\xb4\xae\x8a\x9a\xc3\x0e\x20\xcc\x50\xa0\xc5\xad\x1b\x5d\x42\x38\x7f\xd2\x4f\xe9\x84\xe5\xa1\x33\xa8\xf7\x5d\x3d\xff\x66\x33\xda\xf4\xf1\xe6\xe7\xdf\x5d\xfc\x84\x27\x4f\x0a\xe1\xdc\xfc\x37\x3f\x4f\x15\x83\xe0\x64\x1f\xef\xa4\x62\xff\x85\xed\x54\xde\xd4\x8a\x3f\x65\x21\x61\x86\xa7\xdf\x0d\x1c\xd3\x42\x41\x30\x41\x96\xbd\x7d\x67\xf2\x4b\xa9\x02\xf8\xf5\xd7\xfd\x82\xb5\x0d\x16\xd1\xfc\x25\x1e\x1c\x36\x5d\x50\x77\x4a\x0f\x56\x05\x4f\x0b\xcf\x24\x86\x68\xa7\x60\x55\x85\x12\xd8\x9c\x54\xc3\x0a\x5b\xbe\xaa\x87\x44\x23\xec\x36\xbc\xc1\x12\xb5\x24\x85\x45\x24\xea\xa5\xd3\xa6\x87\x55\x6a\xa2\xda\x83\xef\xde\xc6\x4a\xec\xb1\x1b\xb7\x4d\x8a\x71\x3d\xcb\xe2\xae\x41\x1b\xba\x2a\xb4\x05\x86\x1a\x2b\x65\xb8\x55\x7a\x4d\x83\x47\x66\x1b\x9b\x5b\x32\x8b\xb8\xf2\x1e\x62\x8f\xbe\x98\xcb\x96\xd7\x6d\xeb\x28\x5c\xd4\x72\x24\xee\x6e\xf9\x36\xdc\xe1\x5b\x1a\x54\xf5\xcf\x67\x06\x6e\xde\xdf\xc0\x02\xd7\xfe\x05\xc9\x1e\xaf\x45\xb8\xcc\x51\x57\x9a\x4b\xbb\xf7\x7c\x2f\xba\x10\x5c\x95\x31\x8b\xf5\x9c\xe0\x8f\x0a\xdb\x90\x64\xa7\x0b\xa3\xf1\x6c\x70\x01\x34\xb0\x5f\xd1\x00\x51\xf3\x39\x4f\xb9\x67\x44\xe3\x2a\x22\x9f\x5a\xda\xee\x28\xfd\xd4\x69\x8d\xd2\x8a\x35\x09\x59\x3a\x86\x8a\x13\x11\x83\x25\x3a\xdc\xe1\xca\x27\x6a\x62\x99\x59\x98\xd8\x13\xc0\x37\xd5\xa8\xa7\xf0\xf8\xea\xed\x60\x72\xf7\x71\x30\x99\x0e\xc7\xa3\xcb\xe0\xcc\x4b\x89\x57\xd1\xf3\xc0\x17\xbc\x91\x78\x9b\x19\x8e\x72\xd9\xf3\x3a\xe0\x91\x08\x88\x36\x22\xc3\x8b\x05\xab\x80\x01\xa9\x98\x2f\xa8\x15\x2c\x99\x70\x04\x0c\xc3\x85\x97\x71\x8d\xac\xac\xf5\x05\xcc\xb5\x2a\x3d\xfb\x2e\x70\x4d\xc3\x32\xf8\x54\xbf\xb8\x68\x1f\x82\x72\xb6\x72\x16\x4c\xa1\x9c\xc8\xbc\xf7\x84\x60\xa7\x09\x66\x87\xc6\x66\xca\xd9\x56\x9e\x90\xde\xd0\x25\x4d\x98\xa3\xc0\xe7\xd7\x7f\x3f\xbb\x7b\x3b\xf8\x7c\x77\x3d\x1e\xcd\xee\x3e\xf5\x27\xa3\xbb\xf1\xe8\xee\xba\x3f\xba\x19\x4c\xc6\x1f\xa6\x77\x1f\xa6\x5e\x45\xcd\x99\x30\x18\xd4\xd3\x81\x38\x3e\x9c\x9b\xe9\x2d\x04\x5b\x00\xaf\xa4\x50\x2c\xdb\x05\x71\x0d\xde\x83\xc3\xa8\xee\x30\x65\x5a\xca\xff\xa5\x69\xc4\x83\xe1\x75\x70\x14\xe7\x55\x1e\xc0\xbf\x37\xa9\x10\x72\xc2\x6d\xcb\xb6\x8f\x77\x00\x06\xc7\x83\xd7\x6f\xae\xae\xcf\xcf\x77\x56\x65\x59\x48\x2b\xb7\x70\xdb\x90\x39\x40\x90\x61\x02\x7f\x3d\x50\x38\x38\x14\x26\xb9\x6b\xc7\x56\x98\x9a\x23\x30\x7e\x9c\x04\xdb\x40\xf6\x27\x67\xb0\xe9\xdc\xcb\x83\xaf\xfb\x38\x7a\x08\x88\x5c\x06\xd2\x4f\xf7\xab\xc9\xd0\x8b\x92\xcd\x18\xce\x7c\xa1\xcb\x45\xc6\x35\x84\x55\x1d\x56\xa3\x58\x5a\x1a\x7b\xf6\x35\x48\x35\xdf\x4e\xee\x2c\xb8\x00\xab\x1d\x3e\x3c\x83\x5f\x77\x37\xc4\x19\xc3\x52\xc9\xe8\x77\xa3\xe4\x13\x56\xb7\xfb\x7d\xf8\xdb\x5f\xf5\xfd\x03\x32\x9c\x33\x27\x6c\x6b\x73\xbb\x20\xae\x17\x44\x56\x95\x62\x97\x27\xaf\x46\x43\x48\xb8\x64\x9a\xd4\x91\x55\x10\xab\xca\xc6\xa9\xe4\xa4\x32\x49\x12\x8d\xaf\xc7\x87\x09\x4a\x5b\x20\x8a\x0c\xf5\xd1\x05\x11\x00\xac\x8a\x35\xc4\xb0\x2a\x98\x85\x02\x35\x7a\x60\x5e\x8d\x86\xdb\xae\x3b\x8e\x7e\x8e\xce\x82\xcd\x73\xaf\xdf\x3f\x4c\x6e\x2f\x37\x08\x34\x56\x69\x96\x63\x94\x2b\x95\x0b\x64\x15\x37\xfe\x6c\xb7\x1d\xdf\x1e\x6a\x2c\xd1\xae\x94\x5e\x84\x95\x70\x39\x97\x26\xae\x51\x8d\xf7\xc4\x2c\xd0\x9f\x5c\xfd\x76\x79\x70\x98\x55\x8b\x1c\xc2\xd0\xe3\x2d\x64\x3a\x2d\xb8\xc5\xd4\x3a\x8d\x47\x3b\xd3\xa4\xde\x41\xe1\xcc\xfa\x93\xd7\xfd\xdb\xdb\xcb\x20\x95\xbc\xb5\x1b\x1e\x7c\x25\x63\x0f\xe1\xf2\xe0\xeb\x4e\x2a\x0f\x91\xcd\xbf\x04\x4f\x5a\xf1\xf9\xd4\x8b\xdb\xfc\x1e\xea\x9f\x8d\xfd\x87\x5d\xa4\xf9\x2e\xa4\x26\x0c\x43\x8d\x56\xaf\xe1\x0c\xc2\xb0\x21\x82\xd8\x96\x15\x15\x9d\x7c\x41\x63\x92\xac\xed\xec\x37\x05\x3b\x39\xfb\xc9\xb8\x72\x7f\xf1\xe6\xfd\x16\x26\x3b\x07\xb8\x7d\x6d\x99\x86\xf0\x6a\xff\x65\x78\xff\x65\xfe\x1d\x6b\x34\xb1\xf5\xfe\x4b\x02\x8d\x45\x1a\x95\x8d\xf0\x23\xb2\x06\xee\x89\x8a\xcb\x56\xa0\x1f\x72\x0b\x2b\x2e\x04\xa4\x05\xa6\x8b\xcd\xe5\x7f\x83\x43\xe2\xdb\xa3\xff\xd9\xa5\x97\x2e\x60\x5b\xd3\x9b\x01\xd8\x46\x88\xf7\xdc\x1a\x9a\xdb\xd3\xe1\xcd\x64\xf6\x6e\x38\xfa\xf1\xb4\xe6\xfa\xe9\xf0\x66\x36\x98\xbc\x83\xc3\x5a\x1d\x68\x0c\xf1\x1e\x53\x47\xa3\x89\xdb\xdd\xf0\x12\x97\x7f\xe1\x42\xb0\x5d\xa9\x6e\x0a\xb5\xba\x4b\x5c\x1e\xa5\x39\xff\x1b\xcf\x2e\x5f\xd0\xe5\xf7\xec\xe7\xce\x74\x36\x7e\x3f\x1d\xde\x8c\xfa\xb7\x3b\xfe\xa8\x6a\x2b\xcd\xaa\x4d\x4c\xfe\x33\x13\xdd\x3d\xfc\xf7\x10\x26\x00\xa5\xd5\xeb\x4a\x71\xba\x77\x1a\x44\xa8\x16\x79\x9c\x38\x2e\xea\x7b\x4f\xa1\x56\x9b\xdb\xaa\xff\xb0\x51\xcb\x11\x9e\xfa\xf9\xea\xdf\xfc\xee\x8c\x05\x81\xd6\x80\x33\x34\xb4\xc0\x55\xb5\x9c\xa1\x1b\x43\x6e\x20\xc1\xb9\xd2\xf5\x11\x70\xe9\x68\x40\x29\x3f\x6c\x9b\x88\x28\xc0\x82\x0b\x84\x4a\xa3\x17\xba\x7e\xe4\x31\xbb\x89\x98\x1b\x78\x3f\xbc\x7e\xd1\xe9\x6e\x02\x5a\x21\x08\x5c\x22\xf5\xaf\x0f\x61\x1b\x78\xf3\x3d\xa6\xbe\xea\xfe\x1d\x82\x6d\x72\xf1\xf6\xcf\xa0\x07\xc1\xa3\xeb\x6c\x00\xff\xec\x74\xe1\x13\x7a\xa1\xb6\x45\x98\xa2\xb9\x48\xce\xdb\x1b\x23\x61\x69\xc9\x34\x57\x3e\xd5\xf6\xf6\xd8\x4a\x12\x22\x0f\x81\xb6\x07\x68\xd3\xe8\x68\xa3\x4c\xda\xfa\x3d\x57\x52\xac\x9f\xb7\xd7\x49\x3f\xe5\xfd\xd7\x9a\x9e\x37\xbb\x8d\xcf\x8b\x98\x25\x6a\xcd\xb3\x8c\xb4\xa2\x25\xd7\x96\x97\xd8\x19\x8c\x66\x93\xcf\xef\xc7\xc3\xd1\x8c\x92\x7b\x94\xc3\xa3\x04\x0d\x3d\x23\x2d\x4c\xb9\x51\xef\x14\xd8\x36\x49\xae\x59\x55\x40\x49\xe7\x96\x20\x30\x58\x2a\xe1\xe8\xbc\x14\xb0\xa5\xe2\x99\x77\x2e\xd8\x9a\xce\xa9\xf9\x73\x93\x0b\xdd\x31\x9b\xaf\x58\x82\xf9\xfd\x29\xa3\x0b\x6d\x5a\x30\x99\xd3\xd1\x6d\xac\x79\xa0\x31\xb8\xf6\x2e\xfd\x67\x4f\x72\xd8\xe9\x82\x4a\x53\xa7\x5b\x54\x64\x38\xe7\x5e\xb4\x70\xdb\x7c\xbc\xbb\xf8\xae\xca\x45\xf2\x80\xf1\xe6\xeb\x55\x0d\x53\xd4\x71\xb7\x76\xd9\xf9\x38\xbe\xfd\xf0\x6e\xe0\x4b\xb3\x64\xda\xeb\xfd\x7a\x7b\x53\x82\xa7\x86\x09\x69\x2e\x1f\x6a\x7b\xe8\xef\xfa\x57\xa4\x0f\xfc\x97\x45\x66\x0c\xcf\x25\x1d\xd4\x4e\x4f\xe6\xdc\x16\x2e\xa9\x5b\x71\xef\x36\x91\xc5\xdc\x18\x87\x26\x3e\x3d\xfd\xf9\x65\xd7\xff\x4d\xd7\x58\x94\x36\x3c\x39\x3f\x3f\x3f\x3f\x39\x3d\x3b\xfb\x8b\x76\x4e\x4f\x5f\x9d\x9c\x9d\xbf\x3c\x3f\xed\xfc\x27\x00\x00\xff\xff\xad\x47\x22\x9b\xcd\x16\x00\x00") +var _imagesBaseDockerfile = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x57\xfb\x6f\xdb\x46\xf2\xff\x9d\x7f\xc5\x40\x0a\xf2\xb5\x53\x91\xf4\x23\x6e\xdd\x7c\xe1\x1e\x54\xc5\x49\x85\x3a\x52\x20\x29\x2d\x82\xbb\x43\xb0\x5c\x8e\xc8\xad\x96\xbb\xbc\x7d\x88\x56\x72\xfe\xdf\x0f\xb3\xa4\x5e\x4e\xd2\x2b\xae\x77\x41\x00\xdb\xdc\x99\xd9\xcf\xcc\x7c\xe6\xb1\x7d\x18\xe9\x7a\x63\x44\x51\x3a\xb8\x38\x3b\xbf\x86\x45\x89\xf0\xb3\xcf\xd0\x28\x74\x68\x61\xe8\x5d\xa9\x8d\x4d\xa2\x7e\xd4\x87\x3b\xc1\x51\x59\xcc\xc1\xab\x1c\x0d\xb8\x12\x61\x58\x33\x5e\xe2\xf6\x64\x00\xbf\xa0\xb1\x42\x2b\xb8\x48\xce\xe0\x84\x04\x7a\xdd\x51\xef\xf4\xff\xa3\x3e\x6c\xb4\x87\x8a\x6d\x40\x69\x07\xde\x22\xb8\x52\x58\x58\x0a\x89\x80\xf7\x1c\x6b\x07\x42\x01\xd7\x55\x2d\x05\x53\x1c\xa1\x11\xae\x0c\xd7\x74\x46\x92\xa8\x0f\xef\x3b\x13\x3a\x73\x4c\x28\x60\xc0\x75\xbd\x01\xbd\x3c\x94\x03\xe6\x02\x60\xfa\x57\x3a\x57\xbf\x48\xd3\xa6\x69\x12\x16\xc0\x26\xda\x14\xa9\x6c\x05\x6d\x7a\x37\x1e\xdd\x4e\xe6\xb7\xf1\x45\x72\x16\x54\xde\x29\x89\xd6\x82\xc1\x7f\x78\x61\x30\x87\x6c\x03\xac\xae\xa5\xe0\x2c\x93\x08\x92\x35\xa0\x0d\xb0\xc2\x20\xe6\xe0\x34\xe1\x6d\x8c\x70\x42\x15\x03\xb0\x7a\xe9\x1a\x66\x30\xea\x43\x2e\xac\x33\x22\xf3\xee\x28\x58\x5b\x74\xc2\x1e\x09\x68\x05\x4c\x41\x6f\x38\x87\xf1\xbc\x07\x3f\x0e\xe7\xe3\xf9\x20\xea\xc3\xaf\xe3\xc5\x4f\xd3\x77\x0b\xf8\x75\x38\x9b\x0d\x27\x8b\xf1\xed\x1c\xa6\x33\x18\x4d\x27\x2f\xc7\x8b\xf1\x74\x32\x87\xe9\x2b\x18\x4e\xde\xc3\xcf\xe3\xc9\xcb\x01\xa0\x70\x25\x1a\xc0\xfb\xda\x10\x7e\x6d\x40\x50\x18\x31\xa7\x98\xcd\x11\x8f\x00\x2c\x75\x0b\xc8\xd6\xc8\xc5\x52\x70\x90\x4c\x15\x9e\x15\x08\x85\x5e\xa3\x51\x42\x15\x50\xa3\xa9\x84\xa5\x64\x5a\x60\x2a\x8f\xfa\x20\x45\x25\x1c\x73\xe1\xcb\x67\x4e\x25\x51\xd4\x87\x95\x50\x39\x70\xe9\xad\x43\x03\x19\x23\x57\x2b\x56\x60\x08\xec\x2b\x6d\xc0\x6e\xac\xc3\x2a\x87\x6f\x20\xd7\x7c\x85\x06\xb8\x56\x4b\x51\x78\x13\xac\x12\x23\x72\xc8\x50\xea\x66\x00\xb6\x83\xbc\xd4\x52\xea\x86\x00\x19\x5c\xa2\x41\xc5\xd1\xbe\x88\xfa\x21\xad\xb6\xcb\xeb\x92\xb2\x81\x76\xe5\x74\x1d\x92\xdb\x88\x95\x48\xe7\x5d\x36\xd2\xee\xd2\x74\xa4\x15\x31\x06\xcd\x58\x39\x34\x4b\xc6\x31\x3d\xb0\x93\xe3\x1a\xa5\xae\xd1\xd8\xc4\x60\x5e\x32\x97\x70\x5d\xa5\x99\xd4\x45\x7a\x71\x76\xfe\x3c\x3d\xbb\xa2\xff\xc6\x2b\x0a\x4e\xdc\xd9\x8c\x89\xa0\x42\xc5\xad\x37\x31\xdf\xde\xf0\xc7\x0d\x7f\x9b\x9e\x7d\x9f\x9e\x5f\x7e\x66\x58\xa8\x98\xc5\x4a\xab\xb8\x36\x62\x2d\x24\x16\x98\x1f\x9a\x8f\x86\xb3\xd7\xc4\x94\xdb\x0f\xe3\x37\xc3\xd7\xb7\x37\x3d\x9f\x79\xe5\xfc\x8b\xf3\xef\x93\xb3\xe7\xbd\xe8\xd5\x6c\xfa\x06\x9e\x7c\xda\x0b\x3c\x50\x76\x2c\x3a\x22\x2a\xbc\xbc\xfd\x71\x3c\x9c\x7c\x78\x35\x9b\x4e\x16\xb7\x93\x97\x37\x4a\x2b\x41\x21\x61\xdc\x89\x35\x82\x75\xba\xb6\x60\x75\x85\xc0\x6a\x07\x0d\x0b\x7c\xb0\x83\xb6\x58\x85\x0d\xc5\x1b\xf5\x81\x81\x41\x26\x81\x99\xc2\x57\xa8\xdc\x00\x1a\xfc\x3f\x83\x70\xc2\xb2\x53\x6f\xe9\x1e\xc2\xe8\x34\x14\xe8\x80\x81\xc3\xaa\xd6\x86\x99\x0d\xdc\x4e\x7e\x01\x56\x30\xa1\x92\xe0\xc5\xef\xa3\x89\xa2\xd1\xf4\xed\x7b\xe0\x12\x99\x8a\x85\xb2\x8e\x49\x09\xa9\xb7\x26\x95\x9a\x33\x99\x66\x42\xa5\x47\x87\xd1\xec\xdd\x04\x78\x59\xe9\x1c\xbe\xb9\xff\x7d\xc9\xa8\x0f\xaf\xd1\x41\x8e\x35\xaa\x1c\x15\x17\x68\xa3\x7e\x68\x80\x7b\xea\x02\x93\x06\x59\xbe\x81\x92\xd9\x17\x60\x6d\x39\xa0\xa0\x0c\xc0\x2a\x56\xe7\x41\xba\x8d\x49\x66\xf4\x0a\x15\xe4\xba\x51\x20\x94\xd3\x70\x82\x8c\x97\xa1\xb4\x41\x0a\x85\xa7\xc4\xd9\x18\x6a\xc6\x57\xac\x40\x0b\x8a\x18\x1b\x3a\x88\xf1\x0a\x2c\x9a\xb5\xe0\x68\xe1\xa4\xcb\xff\x69\x90\x1e\xcd\xc6\x70\xb2\xcb\x7a\xf7\xf1\xb1\x09\xaa\xe5\xd5\xbe\x61\x53\xf7\xd4\x0a\x95\xb3\x41\xba\x12\x96\xef\x55\x42\x7d\x7a\x8b\x16\x84\xb3\x28\x97\xad\xbb\x0a\x1a\x6c\x23\xec\x6b\x38\x31\x58\xe9\x35\xa5\xcf\xab\x86\x29\xea\x4f\xdb\xaa\xdd\xa2\x24\x1c\xaf\x84\x62\x52\x6e\x48\x33\x17\x36\xf4\xc6\x55\x65\x0b\xea\x87\xbf\x69\x6f\x14\x93\xf9\xff\xae\xb8\x42\x8a\x8f\x18\xf1\xb7\x28\xf4\xfa\x3d\xd4\xce\x84\xdd\xd8\x35\x48\x91\x75\x7f\x9f\xed\x04\xf7\x51\x3d\xfc\xa4\x9c\x61\x7c\x05\xa2\x76\xe4\x91\x05\x51\x1b\xed\x1d\x5e\x00\xba\xd2\x69\x2d\xc1\x6a\xce\x1c\x78\x27\x64\x2c\x85\xf2\xf7\x50\x69\xaf\x1c\x60\xd6\x29\xf8\x1c\xd7\xb0\x22\xf2\x6d\xad\x66\xcc\x96\xc0\x59\xcc\xd1\x38\x6a\xb5\x2c\x24\xc9\x1b\x09\xc6\x6e\x14\xef\xe4\x9e\x3e\x85\x25\xe5\x26\x95\x22\xdb\x35\xac\xf6\x27\xfd\x10\x4a\xb8\xc4\x31\x53\xa0\x4b\x28\x29\x36\x85\x58\xb1\x0a\xa1\xb7\x75\xd4\x55\x35\x8d\x51\x1b\x5b\x74\xbe\x4e\xba\x54\xf5\x20\xce\x51\xa2\xc3\xfd\x35\xa6\x82\x78\xf9\xc5\x7b\x2a\x2f\x9d\x88\xbd\x45\x73\x7c\xd5\xb3\xcf\x94\xd1\xf1\xc7\xca\xcf\xbe\x2a\xfc\x85\x9b\x42\x41\xc6\x4b\xfb\xef\xee\xf9\x52\x30\x88\x0c\xee\xb1\x26\x85\xfd\x4f\xa8\x53\x78\xb9\x93\x7f\xc8\x42\xc6\xac\xe0\x5f\x05\x8e\xbc\xd4\xd0\x9b\x21\xcb\x7f\x7e\x63\x8b\x1b\xa5\x7b\xf0\xc3\x0f\xc7\x01\xdb\x96\x47\x42\xb3\x6f\xaf\xd9\x1e\x73\x27\x01\x55\x28\xa7\xcf\x18\xba\x33\x9f\x6b\x85\xd0\x31\x3f\x4c\xea\xae\xbc\x7b\xd4\xd1\x72\xcc\x7c\x71\xa8\xbc\xee\x36\x32\x46\xa3\xd9\x20\x73\x08\x39\x2e\x99\x97\xae\x9b\xbe\x6d\x39\xed\x15\xe2\x78\xab\xb2\xbb\xb7\x5a\xe5\xc2\x40\x5c\xb7\x9e\x1c\xc8\x3e\x7d\x7a\xa8\xd9\xda\xdb\x99\xff\xe1\xb1\x78\xda\x0a\x24\x4e\x57\xa1\xfb\x8e\xbb\xea\x1d\x4d\xc6\x90\x09\xc5\x8c\x40\x4b\x2d\x31\xd5\xb5\x4b\xb9\x12\xd4\xb3\xa9\x45\x4d\x5f\x4e\x4f\x32\x54\xae\x44\x94\x39\x9a\xd3\x17\xb4\x3e\x40\x53\x6e\x20\x85\xa6\x64\x0e\x4a\x34\x18\x86\xc9\x68\x32\xfe\xf0\xcb\xed\x6c\x3e\x9e\x4e\x6e\x7a\x67\xc9\x77\xc9\x55\x6f\xf7\x3d\x4c\xc3\x77\xb3\xbb\x9b\xde\xb6\x2d\x59\xa7\x0d\x2b\x30\x29\xb4\x2e\x24\xb2\x5a\xd8\xd0\x97\xf6\xdd\x34\x36\x28\x91\x59\x4c\x15\xba\x46\x9b\x55\x5c\x4b\x5f\x08\x65\xd3\x5e\x08\x1a\xde\xd7\xda\x38\x18\xce\x46\x3f\xdd\x3c\x39\xc9\xeb\x55\x01\x31\x0d\x6c\xe5\x62\x66\x78\x29\x1c\x72\xe7\x0d\x9e\x1e\x24\xb0\xd5\x20\x38\x8b\xe1\xec\xc7\xe1\xdd\xdd\x4d\x8f\x2b\xb1\xb5\x1b\x3f\xf9\x44\xc6\x1e\xe2\xf5\x93\x4f\x07\xae\x3c\x24\xae\xf8\xd8\xfb\xa2\x95\xe0\x4f\x2b\xbc\xf5\xef\xa1\xfd\xb3\xb3\xff\x70\xa0\x17\xda\x4e\x6c\xe7\x77\x10\xc7\x06\x9d\xd9\xc0\x15\xc4\xb1\xf6\xae\xf6\x0e\x52\x57\xd5\x14\x74\xba\x0b\x3a\x93\x64\xed\x40\xdf\x96\xec\xe2\xea\x5b\xeb\xab\x63\xe1\x2f\xd0\xe4\x20\x81\xfb\x63\xc7\x0c\xc4\xa3\xe3\xc3\xf8\xfe\xe3\xf2\x2b\xd6\xa8\x06\xcd\xf1\xe1\x21\x69\xb8\x11\x54\x2d\x44\x97\xa3\x21\xdf\xe6\x7b\x36\x1e\x2d\xee\xf6\x54\x58\x9f\x27\xe7\xcf\x93\xb3\xff\x34\x6d\x6d\xe0\x96\xf3\x3b\xd8\x71\xa7\x10\xae\xf4\xd9\x63\xbe\x58\x51\xd8\x94\x1b\x11\xd3\xb4\xb0\x69\x47\x1f\x9b\xd2\x5e\x20\x35\xcb\xd3\x27\x9f\x8e\xa1\x3d\xa4\xad\x1f\xf1\x67\x07\xed\x80\xd9\x32\x82\x3a\x4e\x42\x24\xf8\x67\x08\xe3\xfd\xc7\xd1\x63\xb7\xa3\x3e\x38\x94\x72\x37\x02\x1d\x15\x86\x70\xb4\x9c\x08\xb5\xdd\xb7\x4f\x84\x83\x46\x50\xf4\x4a\xe4\xab\xdd\x3b\x60\x57\xa2\x80\x6a\x7d\xfa\x5f\xdb\xae\x69\xd3\xdb\x9b\x6e\x21\xd0\x1e\xda\x21\xc4\x7b\xe1\x2c\xad\x48\xf3\xf1\xeb\xd9\xe2\xcd\x78\xf2\xcd\xe5\x20\x2c\x97\xf3\xf1\xeb\xc5\xed\xec\x0d\x9c\x34\xa5\xe0\x25\x18\x8c\xf1\x1e\xb9\x77\x61\x6f\x39\x84\x97\xf9\xe2\xa3\x90\x92\x1d\x6e\x15\xb6\xd4\xcd\x87\xcc\x17\x09\x2f\xc4\x5f\x44\x7e\x73\x4e\x5b\xf6\xd5\x77\xd1\x7c\x31\x7d\x3b\x1f\xbf\x9e\x0c\xef\x0e\xee\xa3\xa8\x35\x86\xd5\x3b\x4c\xe1\xc5\xa9\xbd\x69\x9f\x46\x8c\xba\xb1\x33\x9b\x5a\x0b\x5a\x70\xe9\x4d\x52\xaf\x8a\x34\xf3\x42\xb6\x8b\x57\xa9\x9b\xdd\x5a\x4c\x5f\x5d\xd4\x87\x30\x21\xc2\x72\x14\x4e\x7e\xf3\xd6\x81\x44\x67\xc1\x5b\x5a\xc1\xc1\xd7\xed\x72\x4d\xcb\x4d\x61\x21\xc3\xa5\x36\x6d\x0a\x84\xf2\xd4\xcf\xb5\x22\x56\x77\x88\x08\x60\x49\x0f\x64\x7a\xd7\xd1\x54\x57\x45\x9b\xda\x2d\x62\x61\xe1\xed\xf8\xe5\x79\xd4\xdf\x01\x6a\x10\x24\xae\x91\x5a\x5b\x80\xb0\x07\xde\x3d\xcd\xda\x9d\xfa\xaf\xd0\xdb\x3b\x97\xee\x7f\xed\x0d\xa0\xf7\x68\x6f\xee\xc1\xdf\xe9\x41\x8a\x61\xe7\xdc\x33\x4c\x43\x86\xe1\xf2\xed\x1e\x4b\x5c\x5a\x33\x23\x74\x70\x75\xbb\xd3\xb6\x89\x1f\x84\x2d\x55\xa2\x1b\x00\x3a\x9e\x50\x1a\x27\xd3\xc5\xed\x8b\x5d\xfc\x9e\x69\x25\x37\xcf\x82\x17\xb9\xe6\xe1\x4d\x11\x9e\x85\x83\x60\x76\x8f\x8f\x64\xe9\x95\x6a\x44\x9e\xa3\x02\xe6\xe8\x6a\x27\x2a\x8c\x6e\x27\x8b\xd9\xfb\xb7\xd3\xf1\x64\x41\xce\x3d\xf2\xe1\x91\x83\x96\xbe\xd1\xe0\x27\xdf\xbe\x32\x64\xe8\x79\x13\x08\xb1\xf5\xf8\xcd\x70\x04\x2c\xcf\xc3\x0b\x9b\x59\x2b\x0a\x45\x28\x0f\x08\x79\xd0\x15\x8e\xf7\x86\x3c\x15\xd6\x7a\xb4\xe9\xe5\xe5\x77\xcf\xfb\xe1\x77\xae\x2b\xd2\x8e\x2f\xae\xaf\xaf\xaf\x2f\x2e\xaf\xae\xfe\xa4\x9d\xcb\xcb\xef\x2f\xae\xae\x9f\x5f\x5f\x46\xff\x0a\x00\x00\xff\xff\x02\x13\x00\xb1\xd5\x11\x00\x00") func imagesBaseDockerfileBytes() ([]byte, error) { return bindataRead( @@ -90,7 +90,7 @@ func imagesBaseDockerfile() (*asset, error) { return a, nil } -var _imagesBaseCleanInstall = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x92\x51\x6f\xdb\x36\x14\x85\xdf\xf9\x2b\xce\xac\x62\xd8\x86\x48\x4a\xf3\x32\x60\xc5\x86\x79\x49\x86\x19\x2d\x6c\x20\x76\x57\x14\xdb\x1e\xae\xa8\x2b\xe9\x22\x12\xc9\x91\x57\x75\xfc\xef\x07\x2a\x71\x50\x63\x7e\x32\x75\x0e\x79\x3e\x1e\xde\xe2\x9b\xba\x11\x57\xa7\xc1\x98\x02\xb7\x3e\x9c\xa2\xf4\x83\xe2\xe6\xfa\xed\x8f\x38\x0c\x8c\xf7\x73\xc3\xd1\xb1\x72\xc2\x7a\xd6\xc1\xc7\x54\x99\xc2\x14\xf8\x20\x96\x5d\xe2\x16\xb3\x6b\x39\x42\x07\xc6\x3a\x90\x1d\xf8\xac\x5c\xe1\x4f\x8e\x49\xbc\xc3\x4d\x75\x8d\xef\xb2\x61\xf5\x22\xad\xbe\x7f\x67\x0a\x9c\xfc\x8c\x89\x4e\x70\x5e\x31\x27\x86\x0e\x92\xd0\xc9\xc8\xe0\x27\xcb\x41\x21\x0e\xd6\x4f\x61\x14\x72\x96\x71\x14\x1d\x96\x98\x97\x43\x2a\x53\xe0\xf3\xcb\x11\xbe\x51\x12\x07\x82\xf5\xe1\x04\xdf\x7d\xed\x03\xe9\x02\x9c\x7f\x83\x6a\xf8\xa9\xae\x8f\xc7\x63\x45\x0b\x6c\xe5\x63\x5f\x8f\xcf\xc6\x54\x7f\xd8\xdc\xde\x6f\xf7\xf7\xe5\x4d\x75\xbd\x6c\xf9\xe8\x46\x4e\x09\x91\xff\x9d\x25\x72\x8b\xe6\x04\x0a\x61\x14\x4b\xcd\xc8\x18\xe9\x08\x1f\x41\x7d\x64\x6e\xa1\x3e\xf3\x1e\xa3\xa8\xb8\xfe\x0a\xc9\x77\x7a\xa4\xc8\xa6\x40\x2b\x49\xa3\x34\xb3\x5e\x94\x75\xa6\x93\x74\x61\xf0\x0e\xe4\xb0\x5a\xef\xb1\xd9\xaf\xf0\xdb\x7a\xbf\xd9\x5f\x99\x02\x9f\x36\x87\x3f\x76\x1f\x0f\xf8\xb4\x7e\x78\x58\x6f\x0f\x9b\xfb\x3d\x76\x0f\xb8\xdd\x6d\xef\x36\x87\xcd\x6e\xbb\xc7\xee\x77\xac\xb7\x9f\xf1\x7e\xb3\xbd\xbb\x02\x8b\x0e\x1c\xc1\x4f\x21\x66\x7e\x1f\x21\xb9\x46\x6e\x73\x67\x7b\xe6\x0b\x80\xce\x3f\x03\xa5\xc0\x56\x3a\xb1\x18\xc9\xf5\x33\xf5\x8c\xde\x7f\xe1\xe8\xc4\xf5\x08\x1c\x27\x49\xf9\x31\x13\xc8\xb5\xa6\xc0\x28\x93\x28\xe9\xf2\xe5\x7f\x97\xaa\xf2\x2c\xad\x91\x6c\x94\xa0\x60\x67\x29\xa4\x79\xa4\xdc\xcc\xf2\x46\xd3\xe4\x1d\xee\xbc\x7d\xe4\x28\x53\x4e\x0a\xa4\xca\xd1\x2d\x2c\xe2\x92\xd2\x38\x2e\xb1\x64\x1f\xa9\xe7\x64\x8a\x9c\x9a\x13\x1c\xec\xc8\xb4\x30\xcd\x61\x89\x9c\x9d\x63\xcb\x29\x51\x3c\x9d\xb7\x82\xa2\x4a\x47\x56\xf3\xa8\x82\xab\xbe\x7a\xde\x55\x9e\x75\x09\x9a\x5f\x30\x81\x9b\x97\x3f\xd6\x3b\xa7\x91\xec\xa3\x31\x89\x15\xa5\x07\xc7\xc8\x4f\xa2\xc6\x48\x87\xbf\xf0\xa6\xc0\xcf\xb8\xc6\x3f\xef\x16\x08\x03\xb0\x1d\x3c\x7e\xf9\xf6\x06\xab\xad\x7f\xe5\x3c\x77\xc8\xed\x2a\x5b\x9e\x44\xf1\xd6\x74\x62\x0c\x05\x2d\x7b\x56\xcc\xa1\x25\xe5\xd7\xe5\x99\xa7\x3c\xa1\x2c\x9d\x3f\xf3\x95\x91\x73\x47\xec\xda\x84\x37\xbf\xbe\xba\x97\x3b\xa0\x3c\x99\x38\xa1\x8c\x1d\xfe\x36\x00\xea\x2f\x14\x6b\x9b\x47\xb9\x6e\xb9\xb1\xde\x75\xf5\x0f\x5f\x29\xa3\x34\x35\x05\xad\x47\x49\x9a\x2e\x15\xdf\xbf\xae\x75\x0a\x17\xda\xb2\x36\xff\x05\x00\x00\xff\xff\xdd\xdb\xd0\x5d\x1a\x04\x00\x00") +var _imagesBaseCleanInstall = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x92\x51\x6f\xdb\x36\x14\x85\xdf\xf9\x2b\xce\xac\x62\xd8\x8a\xc8\x4a\xf3\x32\x60\xc5\x86\x79\x49\x86\x19\x2d\x6c\x20\x76\x57\x14\xdb\x1e\xae\xa8\x2b\xe9\x22\x12\xc9\x91\x57\x75\xfc\xef\x07\x2a\x71\x10\xa3\xd1\x93\xc8\x73\xc8\xf3\xf1\x90\xc5\x77\x55\x2d\xae\x4a\xbd\x31\x05\xae\x7d\x38\x46\xe9\x7a\xc5\xd5\xe5\xbb\x9f\xb0\xef\x19\x1f\xa6\x9a\xa3\x63\xe5\x84\xd5\xa4\xbd\x8f\x69\x69\x0a\x53\xe0\xa3\x58\x76\x89\x1b\x4c\xae\xe1\x08\xed\x19\xab\x40\xb6\xe7\x93\x72\x81\xbf\x38\x26\xf1\x0e\x57\xcb\x4b\xfc\x90\x0d\x8b\x27\x69\xf1\xe3\x7b\x53\xe0\xe8\x27\x8c\x74\x84\xf3\x8a\x29\x31\xb4\x97\x84\x56\x06\x06\x3f\x58\x0e\x0a\x71\xb0\x7e\x0c\x83\x90\xb3\x8c\x83\x68\x3f\xc7\x3c\x6d\xb2\x34\x05\xbe\x3c\x6d\xe1\x6b\x25\x71\x20\x58\x1f\x8e\xf0\xed\x4b\x1f\x48\x67\xe0\xfc\xf5\xaa\xe1\xe7\xaa\x3a\x1c\x0e\x4b\x9a\x61\x97\x3e\x76\xd5\xf0\x68\x4c\xd5\xc7\xf5\xf5\xed\x66\x77\x5b\x5e\x2d\x2f\xe7\x25\x9f\xdc\xc0\x29\x21\xf2\x7f\x93\x44\x6e\x50\x1f\x41\x21\x0c\x62\xa9\x1e\x18\x03\x1d\xe0\x23\xa8\x8b\xcc\x0d\xd4\x67\xde\x43\x14\x15\xd7\x5d\x20\xf9\x56\x0f\x14\xd9\x14\x68\x24\x69\x94\x7a\xd2\xb3\xb2\x4e\x74\x92\xce\x0c\xde\x81\x1c\x16\xab\x1d\xd6\xbb\x05\x7e\x5f\xed\xd6\xbb\x0b\x53\xe0\xf3\x7a\xff\xe7\xf6\xd3\x1e\x9f\x57\x77\x77\xab\xcd\x7e\x7d\xbb\xc3\xf6\x0e\xd7\xdb\xcd\xcd\x7a\xbf\xde\x6e\x76\xd8\xfe\x81\xd5\xe6\x0b\x3e\xac\x37\x37\x17\x60\xd1\x9e\x23\xf8\x21\xc4\xcc\xef\x23\x24\xd7\xc8\x4d\xee\x6c\xc7\x7c\x06\xd0\xfa\x47\xa0\x14\xd8\x4a\x2b\x16\x03\xb9\x6e\xa2\x8e\xd1\xf9\xaf\x1c\x9d\xb8\x0e\x81\xe3\x28\x29\x5f\x66\x02\xb9\xc6\x14\x18\x64\x14\x25\x9d\x67\xbe\x39\xd4\x32\xbf\xa5\x15\x92\x8d\x12\x14\xec\x2c\x85\x34\x0d\x94\x9b\x99\xef\x68\x1c\xbd\xc3\x8d\xb7\xf7\x1c\x65\xcc\x49\x81\x54\x39\xba\x99\x45\x5c\x52\x1a\x86\x39\x96\xec\x3d\x75\x9c\x4c\x91\x53\x73\x82\x83\x1d\x98\x66\xa6\x29\xcc\x91\x93\x73\x6c\x39\x25\x8a\xc7\xd3\x52\x50\x54\x69\xc9\x6a\x7e\xaa\xe0\x65\xb7\x7c\x5c\x55\x9e\x74\x09\x9a\x6f\x30\x81\xeb\xa7\x1f\xeb\x9d\xd3\x48\xf6\xde\x98\xc4\x8a\xd2\x83\x63\xe4\x07\x51\x63\xa4\xc5\xdf\x78\x53\xe0\x17\x5c\xe2\xdf\xf7\x33\x84\x01\xd8\xf6\x1e\xbf\x7e\x7f\x85\xc5\xc6\x3f\x73\x9e\x3a\xe4\x66\x91\x2d\x0f\xa2\x78\x67\x5a\x31\x86\x82\x96\x1d\x2b\xa6\xd0\x90\xf2\xf3\xf0\xc4\x53\x1e\x51\x96\xce\x9f\xf8\xca\xc8\xb9\x23\x76\x4d\xc2\xe2\xcd\x6f\x8b\x67\xff\x7c\x0a\x94\x47\x13\x47\x94\xb1\xc5\x3f\x06\x40\xf5\x95\x62\x65\xf3\x63\xae\x1a\xae\xad\x77\x6d\xf5\xf6\x85\x32\x48\x5d\x51\xd0\x6a\x90\xa4\xe9\x5c\xf1\xdd\xf3\x58\xc7\x70\xa6\xbd\x1c\x4f\x29\x56\xa9\xa7\xc8\x55\xe3\xed\x2b\xb3\x23\xb9\x57\x66\x07\x6f\x69\xa8\xde\x9a\xff\x03\x00\x00\xff\xff\x02\x8e\x04\x89\x60\x04\x00\x00") func imagesBaseCleanInstallBytes() ([]byte, error) { return bindataRead( From 21952913698195a3d6add0732d828f014e7db5a5 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 16:48:34 -0700 Subject: [PATCH 04/18] eliminate SIGUSR1 --- images/base/Dockerfile | 2 +- images/base/entrypoint | 58 +++++++++++++++ images/base/entrypoint/main.go | 73 ------------------- pkg/build/base/base.go | 32 -------- .../internal/create/actions/config/config.go | 2 +- pkg/cluster/internal/create/nodes.go | 32 +------- pkg/cluster/nodes/create.go | 19 +---- pkg/cluster/nodes/node.go | 63 ---------------- 8 files changed, 64 insertions(+), 217 deletions(-) create mode 100755 images/base/entrypoint delete mode 100644 images/base/entrypoint/main.go diff --git a/images/base/Dockerfile b/images/base/Dockerfile index fe0a80b368..0603669f02 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -88,7 +88,7 @@ STOPSIGNAL SIGRTMIN+3 # basically this just lets us set up some things before continuing on to systemd # while preserving that systemd is PID1 # for how we leverage this, see pkg/cluster -COPY [ "entrypoint/entrypoint", "/usr/local/bin/" ] +COPY [ "entrypoint", "/usr/local/bin/" ] # We need systemd to be PID1 to run the various services (docker, kubelet, etc.) # NOTE: this is *only* for documentation, the entrypoint is overridden at runtime ENTRYPOINT [ "/usr/local/bin/entrypoint", "/sbin/init" ] diff --git a/images/base/entrypoint b/images/base/entrypoint new file mode 100755 index 0000000000..72007e89b1 --- /dev/null +++ b/images/base/entrypoint @@ -0,0 +1,58 @@ +#!/bin/bash + +# 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. + +set -o errexit +set -o nounset +set -o pipefail + +configure_proxy() { + mkdir -p /etc/systemd/system/containerd.service.d/ + cat </etc/systemd/system/containerd.service.d/http-proxy.conf +[Service] +Environment="HTTP_PROXY=${HTTP_PROXY:-}" +Environment="HTTPS_PROXY=${HTTPS_PROXY:-}" +Environment="NO_PROXY=${NO_PROXY:-}" +EOF +} + +fix_mount() { + # necessary only when userns-remap is enabled on the host, but harmless + # The binary /bin/mount should be owned by root and have the setuid bit + chown root:root /bin/mount + chmod -s /bin/mount + + # systemd-in-a-container should have read only /sys + # https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/ + # however, we need other things from `docker run --privileged` ... + # and this flag also happens to make /sys rw, amongst other things + mount -o remount,ro /sys +} + +fix_machine_id() { + # Deletes the machine-id embedded in the node image and generates a new one. + # This is necessary because both kubelet and other components like weave net + # use machine-id internally to distinguish nodes. + rm -f /etc/machine-id + systemd-machine-id-setup +} + +# run pre-init fixups +fix_mount +fix_machine_id +configure_proxy + +# we want the command (expected to be systemd) to be PID1, so exec to it +exec "$@" diff --git a/images/base/entrypoint/main.go b/images/base/entrypoint/main.go deleted file mode 100644 index e99c31b060..0000000000 --- a/images/base/entrypoint/main.go +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright 2018 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. -*/ - -/* -This implements our image entrypoint. It: -- waits for SIGUSR1 -- then execs (argv[1], argv[1:], env[:]) - -This allows us to perform other actions in the "node" container via `docker exec` -_before_ we have actually "booted" the init and everything else along with it. - -We can then send SIGUSR1 to this process to trigger starting the "actual" -entrypoint when we are done preforming any provisioning on the "node". - -NOTE: this is implemented as a single go1.X file, using only the stdlib. -This makes it easier to build portably, and is all we need for what it does. -*/ - -// Entrypoint implements a small docker image entrypoint that waits for SIGUSR1 -// before execing os.Args[1:] -package main - -import ( - "os" - "os/signal" - "syscall" - - "log" -) - -// yes this should be the c macro, but on linux in docker you're going to get this anyhow -// http://man7.org/linux/man-pages/man7/signal.7.html -// https://github.com/moby/moby/blob/562df8c2d6f48601c8d1df7256389569d25c0bf1/pkg/signal/signal_linux.go#L10 -const sigrtmin = 34 - -func main() { - // prevent zombie processes since we will be PID1 for a while - // https://linux.die.net/man/2/waitpid - signal.Ignore(syscall.SIGCHLD) - - // grab the "real" entrypoint command and args from our args - if len(os.Args) < 2 { - log.Fatal("Not enough arguments to entrypoint!") - } - cmd, argv := os.Args[1], os.Args[1:] - - // wait for SIGUSR1 (or exit on SIGRTMIN+3 to match systemd) - c := make(chan os.Signal, 1) - signal.Notify(c, syscall.SIGUSR1, syscall.Signal(sigrtmin+3)) - log.Println("Waiting for SIGUSR1 ...") - sig := <-c - if sig != syscall.SIGUSR1 { - log.Printf("Exiting after signal: %v != SIGUSR1", sig) - return - } - - // then exec to the "real" entrypoint, keeping the env - log.Printf("Received SIGUSR1, execing to: %v %v\n", cmd, argv) - syscall.Exec(cmd, argv, os.Environ()) -} diff --git a/pkg/build/base/base.go b/pkg/build/base/base.go index 098bfe57cf..f843a8327f 100644 --- a/pkg/build/base/base.go +++ b/pkg/build/base/base.go @@ -20,7 +20,6 @@ package base import ( "os" "path/filepath" - "sigs.k8s.io/kind/pkg/util" log "github.com/sirupsen/logrus" @@ -38,9 +37,6 @@ type BuildContext struct { // option fields sourceDir string image string - // non option fields - goCmd string // TODO(bentheelder): should be an option possibly - arch string // TODO(bentheelder): should be an option } // Option is BuildContext configuration option supplied to NewBuildContext @@ -65,8 +61,6 @@ func WithImage(image string) Option { func NewBuildContext(options ...Option) *BuildContext { ctx := &BuildContext{ image: DefaultImage, - goCmd: "go", - arch: util.GetArch(), } for _, option := range options { option(ctx) @@ -105,36 +99,10 @@ func (c *BuildContext) Build() (err error) { log.Infof("Building base image in: %s", buildDir) - // build the entrypoint binary first - if err := c.buildEntrypoint(buildDir); err != nil { - return err - } - // then the actual docker image return c.buildImage(buildDir) } -// builds the entrypoint binary -func (c *BuildContext) buildEntrypoint(dir string) error { - // NOTE: this binary only uses the go1 stdlib, and is a single file - entrypointSrc := filepath.Join(dir, "entrypoint", "main.go") - entrypointDest := filepath.Join(dir, "entrypoint", "entrypoint") - - cmd := exec.Command(c.goCmd, "build", "-o", entrypointDest, entrypointSrc) - // TODO(bentheelder): we may need to map between docker image arch and GOARCH - cmd.SetEnv(append(os.Environ(), "GOOS=linux", "GOARCH="+c.arch)...) - - // actually build - log.Info("Building entrypoint binary ...") - exec.InheritOutput(cmd) - if err := cmd.Run(); err != nil { - log.Errorf("Entrypoint build Failed! %v", err) - return err - } - log.Info("Entrypoint build completed.") - return nil -} - func (c *BuildContext) buildImage(dir string) error { // build the image, tagged as tagImageAs, using the our tempdir as the context cmd := exec.Command("docker", "build", "-t", c.image, dir) diff --git a/pkg/cluster/internal/create/actions/config/config.go b/pkg/cluster/internal/create/actions/config/config.go index b4200ce4f0..33ea0bf7eb 100644 --- a/pkg/cluster/internal/create/actions/config/config.go +++ b/pkg/cluster/internal/create/actions/config/config.go @@ -57,7 +57,7 @@ func (a *Action) Execute(ctx *actions.ActionContext) error { kubeVersion, err := node.KubeVersion() if err != nil { // TODO(bentheelder): logging here - return errors.Wrap(err, "failed to get kubernetes version from node: %v") + return errors.Wrap(err, "failed to get kubernetes version from node") } // get the control plane endpoint, in case the cluster has an external load balancer in diff --git a/pkg/cluster/internal/create/nodes.go b/pkg/cluster/internal/create/nodes.go index 58e5ea0a18..eeab03fed7 100644 --- a/pkg/cluster/internal/create/nodes.go +++ b/pkg/cluster/internal/create/nodes.go @@ -105,12 +105,7 @@ func createNodeContainers( go func() { defer wg.Done() // create the node into a container (docker run, but it is paused, see createNode) - node, err := desiredNode.Create(clusterLabel) - if err != nil { - errChan <- err - return - } - err = fixupNode(node) + _, err := desiredNode.Create(clusterLabel) if err != nil { errChan <- err return @@ -136,31 +131,6 @@ func createNodeContainers( return nil } -func fixupNode(node *nodes.Node) error { - // we need to change a few mounts once we have the container - // we'd do this ahead of time if we could, but --privileged implies things - // that don't seem to be configurable, and we need that flag - if err := node.FixMounts(); err != nil { - // TODO(bentheelder): logging here - return err - } - - if nodes.NeedProxy() { - if err := node.SetProxy(); err != nil { - // TODO: logging here - return errors.Wrapf(err, "failed to set proxy for node %s", node.Name()) - } - } - - // signal the node container entrypoint to continue booting into systemd - if err := node.SignalStart(); err != nil { - // TODO(bentheelder): logging here - return err - } - - return nil -} - // nodeSpec describes a node to create purely from the container aspect // this does not inlude eg starting kubernetes (see actions for that) type nodeSpec struct { diff --git a/pkg/cluster/nodes/create.go b/pkg/cluster/nodes/create.go index 1e2edbed3b..7e8f130bac 100644 --- a/pkg/cluster/nodes/create.go +++ b/pkg/cluster/nodes/create.go @@ -146,11 +146,9 @@ func createNode(name, image, clusterLabel, role string, mounts []cri.Mount, extr } // pass proxy environment variables to be used by node's docker deamon - if NeedProxy() { - proxyDetails := getProxyDetails() - for key, val := range proxyDetails.Envs { - runArgs = append(runArgs, "-e", fmt.Sprintf("%s=%s", key, val)) - } + proxyDetails := getProxyDetails() + for key, val := range proxyDetails.Envs { + runArgs = append(runArgs, "-e", fmt.Sprintf("%s=%s", key, val)) } // adds node specific args @@ -182,16 +180,5 @@ func createNode(name, image, clusterLabel, role string, mounts []cri.Mount, extr return handle, errors.Wrap(err, "docker run error") } - // Deletes the machine-id embedded in the node image and regenerate a new one. - // This is necessary because both kubelet and other components like weave net - // use machine-id internally to distinguish nodes. - if err := handle.Command("rm", "-f", "/etc/machine-id").Run(); err != nil { - return handle, errors.Wrap(err, "machine-id-setup error") - } - - if err := handle.Command("systemd-machine-id-setup").Run(); err != nil { - return handle, errors.Wrap(err, "machine-id-setup error") - } - return handle, nil } diff --git a/pkg/cluster/nodes/node.go b/pkg/cluster/nodes/node.go index b41c1cf570..97740f72b3 100644 --- a/pkg/cluster/nodes/node.go +++ b/pkg/cluster/nodes/node.go @@ -112,12 +112,6 @@ func (n *Node) Name() string { return n.name } -// SignalStart sends SIGUSR1 to the node, which signals our entrypoint to boot -// see images/node/entrypoint -func (n *Node) SignalStart() error { - return docker.Kill("SIGUSR1", n.name) -} - // CopyTo copies the source file on the host to dest on the node func (n *Node) CopyTo(source, dest string) error { return docker.CopyTo(source, n.name, dest) @@ -131,32 +125,6 @@ func (n *Node) CopyFrom(source, dest string) error { return docker.CopyFrom(n.name, source, dest) } -// FixMounts will correct mounts in the node container to meet the right -// sharing and permissions for systemd and Docker / Kubernetes -func (n *Node) FixMounts() error { - // Check if userns-remap is enabled - if docker.UsernsRemap() { - // The binary /bin/mount should be owned by root:root in order to execute - // the following mount commands - if err := n.Command("chown", "root:root", "/bin/mount").Run(); err != nil { - return err - } - // The binary /bin/mount should have the setuid bit - if err := n.Command("chmod", "-s", "/bin/mount").Run(); err != nil { - return err - } - } - - // systemd-in-a-container should have read only /sys - // https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/ - // however, we need other things from `docker run --privileged` ... - // and this flag also happens to make /sys rw, amongst other things - if err := n.Command("mount", "-o", "remount,ro", "/sys").Run(); err != nil { - return err - } - return nil -} - // KubeVersion returns the Kubernetes version installed on the node func (n *Node) KubeVersion() (version string, err error) { // use the cached version first @@ -307,37 +275,6 @@ func (n *Node) WriteFile(dest, content string) error { return n.Command("cp", "/dev/stdin", dest).SetStdin(strings.NewReader(content)).Run() } -// NeedProxy returns true if the host environment appears to have proxy settings -func NeedProxy() bool { - details := getProxyDetails() - return len(details.Envs) > 0 -} - -// SetProxy configures proxy settings for the node -// -// Currently it only creates systemd drop-in for Docker daemon -// as described in Docker documentation: https://docs.docker.com/config/daemon/systemd/#http-proxy -// -// See also: NeedProxy and getProxyDetails -func (n *Node) SetProxy() error { - details := getProxyDetails() - // configure Docker daemon to use proxy - proxies := "" - for key, val := range details.Envs { - proxies += fmt.Sprintf("\"%s=%s\" ", key, val) - } - - // TODO(bentheelder): containerd - - err := n.WriteFile("/etc/systemd/system/docker.service.d/http-proxy.conf", - "[Service]\nEnvironment="+proxies) - if err != nil { - errors.Wrap(err, "failed to create http-proxy drop-in") - } - - return nil -} - // proxyDetails contains proxy settings discovered on the host type proxyDetails struct { Envs map[string]string From 8549a7a0e2c9a44944675b791f24629b5c60964c Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 16:49:04 -0700 Subject: [PATCH 05/18] hack/update-generated.sh --- pkg/build/base/sources/images_sources.go | 28 +++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkg/build/base/sources/images_sources.go b/pkg/build/base/sources/images_sources.go index f934ac3d7c..d50006f44c 100644 --- a/pkg/build/base/sources/images_sources.go +++ b/pkg/build/base/sources/images_sources.go @@ -2,7 +2,7 @@ // sources: // ../../../../images/base/Dockerfile // ../../../../images/base/clean-install -// ../../../../images/base/entrypoint/main.go +// ../../../../images/base/entrypoint // DO NOT EDIT! package sources @@ -70,7 +70,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _imagesBaseDockerfile = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x57\xfb\x6f\xdb\x46\xf2\xff\x9d\x7f\xc5\x40\x0a\xf2\xb5\x53\x91\xf4\x23\x6e\xdd\x7c\xe1\x1e\x54\xc5\x49\x85\x3a\x52\x20\x29\x2d\x82\xbb\x43\xb0\x5c\x8e\xc8\xad\x96\xbb\xbc\x7d\x88\x56\x72\xfe\xdf\x0f\xb3\xa4\x5e\x4e\xd2\x2b\xae\x77\x41\x00\xdb\xdc\x99\xd9\xcf\xcc\x7c\xe6\xb1\x7d\x18\xe9\x7a\x63\x44\x51\x3a\xb8\x38\x3b\xbf\x86\x45\x89\xf0\xb3\xcf\xd0\x28\x74\x68\x61\xe8\x5d\xa9\x8d\x4d\xa2\x7e\xd4\x87\x3b\xc1\x51\x59\xcc\xc1\xab\x1c\x0d\xb8\x12\x61\x58\x33\x5e\xe2\xf6\x64\x00\xbf\xa0\xb1\x42\x2b\xb8\x48\xce\xe0\x84\x04\x7a\xdd\x51\xef\xf4\xff\xa3\x3e\x6c\xb4\x87\x8a\x6d\x40\x69\x07\xde\x22\xb8\x52\x58\x58\x0a\x89\x80\xf7\x1c\x6b\x07\x42\x01\xd7\x55\x2d\x05\x53\x1c\xa1\x11\xae\x0c\xd7\x74\x46\x92\xa8\x0f\xef\x3b\x13\x3a\x73\x4c\x28\x60\xc0\x75\xbd\x01\xbd\x3c\x94\x03\xe6\x02\x60\xfa\x57\x3a\x57\xbf\x48\xd3\xa6\x69\x12\x16\xc0\x26\xda\x14\xa9\x6c\x05\x6d\x7a\x37\x1e\xdd\x4e\xe6\xb7\xf1\x45\x72\x16\x54\xde\x29\x89\xd6\x82\xc1\x7f\x78\x61\x30\x87\x6c\x03\xac\xae\xa5\xe0\x2c\x93\x08\x92\x35\xa0\x0d\xb0\xc2\x20\xe6\xe0\x34\xe1\x6d\x8c\x70\x42\x15\x03\xb0\x7a\xe9\x1a\x66\x30\xea\x43\x2e\xac\x33\x22\xf3\xee\x28\x58\x5b\x74\xc2\x1e\x09\x68\x05\x4c\x41\x6f\x38\x87\xf1\xbc\x07\x3f\x0e\xe7\xe3\xf9\x20\xea\xc3\xaf\xe3\xc5\x4f\xd3\x77\x0b\xf8\x75\x38\x9b\x0d\x27\x8b\xf1\xed\x1c\xa6\x33\x18\x4d\x27\x2f\xc7\x8b\xf1\x74\x32\x87\xe9\x2b\x18\x4e\xde\xc3\xcf\xe3\xc9\xcb\x01\xa0\x70\x25\x1a\xc0\xfb\xda\x10\x7e\x6d\x40\x50\x18\x31\xa7\x98\xcd\x11\x8f\x00\x2c\x75\x0b\xc8\xd6\xc8\xc5\x52\x70\x90\x4c\x15\x9e\x15\x08\x85\x5e\xa3\x51\x42\x15\x50\xa3\xa9\x84\xa5\x64\x5a\x60\x2a\x8f\xfa\x20\x45\x25\x1c\x73\xe1\xcb\x67\x4e\x25\x51\xd4\x87\x95\x50\x39\x70\xe9\xad\x43\x03\x19\x23\x57\x2b\x56\x60\x08\xec\x2b\x6d\xc0\x6e\xac\xc3\x2a\x87\x6f\x20\xd7\x7c\x85\x06\xb8\x56\x4b\x51\x78\x13\xac\x12\x23\x72\xc8\x50\xea\x66\x00\xb6\x83\xbc\xd4\x52\xea\x86\x00\x19\x5c\xa2\x41\xc5\xd1\xbe\x88\xfa\x21\xad\xb6\xcb\xeb\x92\xb2\x81\x76\xe5\x74\x1d\x92\xdb\x88\x95\x48\xe7\x5d\x36\xd2\xee\xd2\x74\xa4\x15\x31\x06\xcd\x58\x39\x34\x4b\xc6\x31\x3d\xb0\x93\xe3\x1a\xa5\xae\xd1\xd8\xc4\x60\x5e\x32\x97\x70\x5d\xa5\x99\xd4\x45\x7a\x71\x76\xfe\x3c\x3d\xbb\xa2\xff\xc6\x2b\x0a\x4e\xdc\xd9\x8c\x89\xa0\x42\xc5\xad\x37\x31\xdf\xde\xf0\xc7\x0d\x7f\x9b\x9e\x7d\x9f\x9e\x5f\x7e\x66\x58\xa8\x98\xc5\x4a\xab\xb8\x36\x62\x2d\x24\x16\x98\x1f\x9a\x8f\x86\xb3\xd7\xc4\x94\xdb\x0f\xe3\x37\xc3\xd7\xb7\x37\x3d\x9f\x79\xe5\xfc\x8b\xf3\xef\x93\xb3\xe7\xbd\xe8\xd5\x6c\xfa\x06\x9e\x7c\xda\x0b\x3c\x50\x76\x2c\x3a\x22\x2a\xbc\xbc\xfd\x71\x3c\x9c\x7c\x78\x35\x9b\x4e\x16\xb7\x93\x97\x37\x4a\x2b\x41\x21\x61\xdc\x89\x35\x82\x75\xba\xb6\x60\x75\x85\xc0\x6a\x07\x0d\x0b\x7c\xb0\x83\xb6\x58\x85\x0d\xc5\x1b\xf5\x81\x81\x41\x26\x81\x99\xc2\x57\xa8\xdc\x00\x1a\xfc\x3f\x83\x70\xc2\xb2\x53\x6f\xe9\x1e\xc2\xe8\x34\x14\xe8\x80\x81\xc3\xaa\xd6\x86\x99\x0d\xdc\x4e\x7e\x01\x56\x30\xa1\x92\xe0\xc5\xef\xa3\x89\xa2\xd1\xf4\xed\x7b\xe0\x12\x99\x8a\x85\xb2\x8e\x49\x09\xa9\xb7\x26\x95\x9a\x33\x99\x66\x42\xa5\x47\x87\xd1\xec\xdd\x04\x78\x59\xe9\x1c\xbe\xb9\xff\x7d\xc9\xa8\x0f\xaf\xd1\x41\x8e\x35\xaa\x1c\x15\x17\x68\xa3\x7e\x68\x80\x7b\xea\x02\x93\x06\x59\xbe\x81\x92\xd9\x17\x60\x6d\x39\xa0\xa0\x0c\xc0\x2a\x56\xe7\x41\xba\x8d\x49\x66\xf4\x0a\x15\xe4\xba\x51\x20\x94\xd3\x70\x82\x8c\x97\xa1\xb4\x41\x0a\x85\xa7\xc4\xd9\x18\x6a\xc6\x57\xac\x40\x0b\x8a\x18\x1b\x3a\x88\xf1\x0a\x2c\x9a\xb5\xe0\x68\xe1\xa4\xcb\xff\x69\x90\x1e\xcd\xc6\x70\xb2\xcb\x7a\xf7\xf1\xb1\x09\xaa\xe5\xd5\xbe\x61\x53\xf7\xd4\x0a\x95\xb3\x41\xba\x12\x96\xef\x55\x42\x7d\x7a\x8b\x16\x84\xb3\x28\x97\xad\xbb\x0a\x1a\x6c\x23\xec\x6b\x38\x31\x58\xe9\x35\xa5\xcf\xab\x86\x29\xea\x4f\xdb\xaa\xdd\xa2\x24\x1c\xaf\x84\x62\x52\x6e\x48\x33\x17\x36\xf4\xc6\x55\x65\x0b\xea\x87\xbf\x69\x6f\x14\x93\xf9\xff\xae\xb8\x42\x8a\x8f\x18\xf1\xb7\x28\xf4\xfa\x3d\xd4\xce\x84\xdd\xd8\x35\x48\x91\x75\x7f\x9f\xed\x04\xf7\x51\x3d\xfc\xa4\x9c\x61\x7c\x05\xa2\x76\xe4\x91\x05\x51\x1b\xed\x1d\x5e\x00\xba\xd2\x69\x2d\xc1\x6a\xce\x1c\x78\x27\x64\x2c\x85\xf2\xf7\x50\x69\xaf\x1c\x60\xd6\x29\xf8\x1c\xd7\xb0\x22\xf2\x6d\xad\x66\xcc\x96\xc0\x59\xcc\xd1\x38\x6a\xb5\x2c\x24\xc9\x1b\x09\xc6\x6e\x14\xef\xe4\x9e\x3e\x85\x25\xe5\x26\x95\x22\xdb\x35\xac\xf6\x27\xfd\x10\x4a\xb8\xc4\x31\x53\xa0\x4b\x28\x29\x36\x85\x58\xb1\x0a\xa1\xb7\x75\xd4\x55\x35\x8d\x51\x1b\x5b\x74\xbe\x4e\xba\x54\xf5\x20\xce\x51\xa2\xc3\xfd\x35\xa6\x82\x78\xf9\xc5\x7b\x2a\x2f\x9d\x88\xbd\x45\x73\x7c\xd5\xb3\xcf\x94\xd1\xf1\xc7\xca\xcf\xbe\x2a\xfc\x85\x9b\x42\x41\xc6\x4b\xfb\xef\xee\xf9\x52\x30\x88\x0c\xee\xb1\x26\x85\xfd\x4f\xa8\x53\x78\xb9\x93\x7f\xc8\x42\xc6\xac\xe0\x5f\x05\x8e\xbc\xd4\xd0\x9b\x21\xcb\x7f\x7e\x63\x8b\x1b\xa5\x7b\xf0\xc3\x0f\xc7\x01\xdb\x96\x47\x42\xb3\x6f\xaf\xd9\x1e\x73\x27\x01\x55\x28\xa7\xcf\x18\xba\x33\x9f\x6b\x85\xd0\x31\x3f\x4c\xea\xae\xbc\x7b\xd4\xd1\x72\xcc\x7c\x71\xa8\xbc\xee\x36\x32\x46\xa3\xd9\x20\x73\x08\x39\x2e\x99\x97\xae\x9b\xbe\x6d\x39\xed\x15\xe2\x78\xab\xb2\xbb\xb7\x5a\xe5\xc2\x40\x5c\xb7\x9e\x1c\xc8\x3e\x7d\x7a\xa8\xd9\xda\xdb\x99\xff\xe1\xb1\x78\xda\x0a\x24\x4e\x57\xa1\xfb\x8e\xbb\xea\x1d\x4d\xc6\x90\x09\xc5\x8c\x40\x4b\x2d\x31\xd5\xb5\x4b\xb9\x12\xd4\xb3\xa9\x45\x4d\x5f\x4e\x4f\x32\x54\xae\x44\x94\x39\x9a\xd3\x17\xb4\x3e\x40\x53\x6e\x20\x85\xa6\x64\x0e\x4a\x34\x18\x86\xc9\x68\x32\xfe\xf0\xcb\xed\x6c\x3e\x9e\x4e\x6e\x7a\x67\xc9\x77\xc9\x55\x6f\xf7\x3d\x4c\xc3\x77\xb3\xbb\x9b\xde\xb6\x2d\x59\xa7\x0d\x2b\x30\x29\xb4\x2e\x24\xb2\x5a\xd8\xd0\x97\xf6\xdd\x34\x36\x28\x91\x59\x4c\x15\xba\x46\x9b\x55\x5c\x4b\x5f\x08\x65\xd3\x5e\x08\x1a\xde\xd7\xda\x38\x18\xce\x46\x3f\xdd\x3c\x39\xc9\xeb\x55\x01\x31\x0d\x6c\xe5\x62\x66\x78\x29\x1c\x72\xe7\x0d\x9e\x1e\x24\xb0\xd5\x20\x38\x8b\xe1\xec\xc7\xe1\xdd\xdd\x4d\x8f\x2b\xb1\xb5\x1b\x3f\xf9\x44\xc6\x1e\xe2\xf5\x93\x4f\x07\xae\x3c\x24\xae\xf8\xd8\xfb\xa2\x95\xe0\x4f\x2b\xbc\xf5\xef\xa1\xfd\xb3\xb3\xff\x70\xa0\x17\xda\x4e\x6c\xe7\x77\x10\xc7\x06\x9d\xd9\xc0\x15\xc4\xb1\xf6\xae\xf6\x0e\x52\x57\xd5\x14\x74\xba\x0b\x3a\x93\x64\xed\x40\xdf\x96\xec\xe2\xea\x5b\xeb\xab\x63\xe1\x2f\xd0\xe4\x20\x81\xfb\x63\xc7\x0c\xc4\xa3\xe3\xc3\xf8\xfe\xe3\xf2\x2b\xd6\xa8\x06\xcd\xf1\xe1\x21\x69\xb8\x11\x54\x2d\x44\x97\xa3\x21\xdf\xe6\x7b\x36\x1e\x2d\xee\xf6\x54\x58\x9f\x27\xe7\xcf\x93\xb3\xff\x34\x6d\x6d\xe0\x96\xf3\x3b\xd8\x71\xa7\x10\xae\xf4\xd9\x63\xbe\x58\x51\xd8\x94\x1b\x11\xd3\xb4\xb0\x69\x47\x1f\x9b\xd2\x5e\x20\x35\xcb\xd3\x27\x9f\x8e\xa1\x3d\xa4\xad\x1f\xf1\x67\x07\xed\x80\xd9\x32\x82\x3a\x4e\x42\x24\xf8\x67\x08\xe3\xfd\xc7\xd1\x63\xb7\xa3\x3e\x38\x94\x72\x37\x02\x1d\x15\x86\x70\xb4\x9c\x08\xb5\xdd\xb7\x4f\x84\x83\x46\x50\xf4\x4a\xe4\xab\xdd\x3b\x60\x57\xa2\x80\x6a\x7d\xfa\x5f\xdb\xae\x69\xd3\xdb\x9b\x6e\x21\xd0\x1e\xda\x21\xc4\x7b\xe1\x2c\xad\x48\xf3\xf1\xeb\xd9\xe2\xcd\x78\xf2\xcd\xe5\x20\x2c\x97\xf3\xf1\xeb\xc5\xed\xec\x0d\x9c\x34\xa5\xe0\x25\x18\x8c\xf1\x1e\xb9\x77\x61\x6f\x39\x84\x97\xf9\xe2\xa3\x90\x92\x1d\x6e\x15\xb6\xd4\xcd\x87\xcc\x17\x09\x2f\xc4\x5f\x44\x7e\x73\x4e\x5b\xf6\xd5\x77\xd1\x7c\x31\x7d\x3b\x1f\xbf\x9e\x0c\xef\x0e\xee\xa3\xa8\x35\x86\xd5\x3b\x4c\xe1\xc5\xa9\xbd\x69\x9f\x46\x8c\xba\xb1\x33\x9b\x5a\x0b\x5a\x70\xe9\x4d\x52\xaf\x8a\x34\xf3\x42\xb6\x8b\x57\xa9\x9b\xdd\x5a\x4c\x5f\x5d\xd4\x87\x30\x21\xc2\x72\x14\x4e\x7e\xf3\xd6\x81\x44\x67\xc1\x5b\x5a\xc1\xc1\xd7\xed\x72\x4d\xcb\x4d\x61\x21\xc3\xa5\x36\x6d\x0a\x84\xf2\xd4\xcf\xb5\x22\x56\x77\x88\x08\x60\x49\x0f\x64\x7a\xd7\xd1\x54\x57\x45\x9b\xda\x2d\x62\x61\xe1\xed\xf8\xe5\x79\xd4\xdf\x01\x6a\x10\x24\xae\x91\x5a\x5b\x80\xb0\x07\xde\x3d\xcd\xda\x9d\xfa\xaf\xd0\xdb\x3b\x97\xee\x7f\xed\x0d\xa0\xf7\x68\x6f\xee\xc1\xdf\xe9\x41\x8a\x61\xe7\xdc\x33\x4c\x43\x86\xe1\xf2\xed\x1e\x4b\x5c\x5a\x33\x23\x74\x70\x75\xbb\xd3\xb6\x89\x1f\x84\x2d\x55\xa2\x1b\x00\x3a\x9e\x50\x1a\x27\xd3\xc5\xed\x8b\x5d\xfc\x9e\x69\x25\x37\xcf\x82\x17\xb9\xe6\xe1\x4d\x11\x9e\x85\x83\x60\x76\x8f\x8f\x64\xe9\x95\x6a\x44\x9e\xa3\x02\xe6\xe8\x6a\x27\x2a\x8c\x6e\x27\x8b\xd9\xfb\xb7\xd3\xf1\x64\x41\xce\x3d\xf2\xe1\x91\x83\x96\xbe\xd1\xe0\x27\xdf\xbe\x32\x64\xe8\x79\x13\x08\xb1\xf5\xf8\xcd\x70\x04\x2c\xcf\xc3\x0b\x9b\x59\x2b\x0a\x45\x28\x0f\x08\x79\xd0\x15\x8e\xf7\x86\x3c\x15\xd6\x7a\xb4\xe9\xe5\xe5\x77\xcf\xfb\xe1\x77\xae\x2b\xd2\x8e\x2f\xae\xaf\xaf\xaf\x2f\x2e\xaf\xae\xfe\xa4\x9d\xcb\xcb\xef\x2f\xae\xae\x9f\x5f\x5f\x46\xff\x0a\x00\x00\xff\xff\x02\x13\x00\xb1\xd5\x11\x00\x00") +var _imagesBaseDockerfile = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x57\xfb\x6f\xdb\x46\xf2\xff\x9d\x7f\xc5\x40\x0a\xf2\xb5\x53\x91\xf4\x23\x6e\xdd\x7c\xe1\x1e\x54\xc5\x49\x85\x3a\x52\x20\x29\x2d\x82\xbb\x43\xb0\x5c\x8e\xc8\xad\x96\xbb\xbc\x7d\x88\x56\x72\xfe\xdf\x0f\xb3\xa4\x5e\x4e\xd2\x2b\xae\x77\x41\x00\xdb\xdc\x99\xd9\xcf\xcc\x7c\xe6\xb1\x7d\x18\xe9\x7a\x63\x44\x51\x3a\xb8\x38\x3b\xbf\x86\x45\x89\xf0\xb3\xcf\xd0\x28\x74\x68\x61\xe8\x5d\xa9\x8d\x4d\xa2\x7e\xd4\x87\x3b\xc1\x51\x59\xcc\xc1\xab\x1c\x0d\xb8\x12\x61\x58\x33\x5e\xe2\xf6\x64\x00\xbf\xa0\xb1\x42\x2b\xb8\x48\xce\xe0\x84\x04\x7a\xdd\x51\xef\xf4\xff\xa3\x3e\x6c\xb4\x87\x8a\x6d\x40\x69\x07\xde\x22\xb8\x52\x58\x58\x0a\x89\x80\xf7\x1c\x6b\x07\x42\x01\xd7\x55\x2d\x05\x53\x1c\xa1\x11\xae\x0c\xd7\x74\x46\x92\xa8\x0f\xef\x3b\x13\x3a\x73\x4c\x28\x60\xc0\x75\xbd\x01\xbd\x3c\x94\x03\xe6\x02\x60\xfa\x57\x3a\x57\xbf\x48\xd3\xa6\x69\x12\x16\xc0\x26\xda\x14\xa9\x6c\x05\x6d\x7a\x37\x1e\xdd\x4e\xe6\xb7\xf1\x45\x72\x16\x54\xde\x29\x89\xd6\x82\xc1\x7f\x78\x61\x30\x87\x6c\x03\xac\xae\xa5\xe0\x2c\x93\x08\x92\x35\xa0\x0d\xb0\xc2\x20\xe6\xe0\x34\xe1\x6d\x8c\x70\x42\x15\x03\xb0\x7a\xe9\x1a\x66\x30\xea\x43\x2e\xac\x33\x22\xf3\xee\x28\x58\x5b\x74\xc2\x1e\x09\x68\x05\x4c\x41\x6f\x38\x87\xf1\xbc\x07\x3f\x0e\xe7\xe3\xf9\x20\xea\xc3\xaf\xe3\xc5\x4f\xd3\x77\x0b\xf8\x75\x38\x9b\x0d\x27\x8b\xf1\xed\x1c\xa6\x33\x18\x4d\x27\x2f\xc7\x8b\xf1\x74\x32\x87\xe9\x2b\x18\x4e\xde\xc3\xcf\xe3\xc9\xcb\x01\xa0\x70\x25\x1a\xc0\xfb\xda\x10\x7e\x6d\x40\x50\x18\x31\xa7\x98\xcd\x11\x8f\x00\x2c\x75\x0b\xc8\xd6\xc8\xc5\x52\x70\x90\x4c\x15\x9e\x15\x08\x85\x5e\xa3\x51\x42\x15\x50\xa3\xa9\x84\xa5\x64\x5a\x60\x2a\x8f\xfa\x20\x45\x25\x1c\x73\xe1\xcb\x67\x4e\x25\x51\xd4\x87\x95\x50\x39\x70\xe9\xad\x43\x03\x19\x23\x57\x2b\x56\x60\x08\xec\x2b\x6d\xc0\x6e\xac\xc3\x2a\x87\x6f\x20\xd7\x7c\x85\x06\xb8\x56\x4b\x51\x78\x13\xac\x12\x23\x72\xc8\x50\xea\x66\x00\xb6\x83\xbc\xd4\x52\xea\x86\x00\x19\x5c\xa2\x41\xc5\xd1\xbe\x88\xfa\x21\xad\xb6\xcb\xeb\x92\xb2\x81\x76\xe5\x74\x1d\x92\xdb\x88\x95\x48\xe7\x5d\x36\xd2\xee\xd2\x74\xa4\x15\x31\x06\xcd\x58\x39\x34\x4b\xc6\x31\x3d\xb0\x93\xe3\x1a\xa5\xae\xd1\xd8\xc4\x60\x5e\x32\x97\x70\x5d\xa5\x99\xd4\x45\x7a\x71\x76\xfe\x3c\x3d\xbb\xa2\xff\xc6\x2b\x0a\x4e\xdc\xd9\x8c\x89\xa0\x42\xc5\xad\x37\x31\xdf\xde\xf0\xc7\x0d\x7f\x9b\x9e\x7d\x9f\x9e\x5f\x7e\x66\x58\xa8\x98\xc5\x4a\xab\xb8\x36\x62\x2d\x24\x16\x98\x1f\x9a\x8f\x86\xb3\xd7\xc4\x94\xdb\x0f\xe3\x37\xc3\xd7\xb7\x37\x3d\x9f\x79\xe5\xfc\x8b\xf3\xef\x93\xb3\xe7\xbd\xe8\xd5\x6c\xfa\x06\x9e\x7c\xda\x0b\x3c\x50\x76\x2c\x3a\x22\x2a\xbc\xbc\xfd\x71\x3c\x9c\x7c\x78\x35\x9b\x4e\x16\xb7\x93\x97\x37\x4a\x2b\x41\x21\x61\xdc\x89\x35\x82\x75\xba\xb6\x60\x75\x85\xc0\x6a\x07\x0d\x0b\x7c\xb0\x83\xb6\x58\x85\x0d\xc5\x1b\xf5\x81\x81\x41\x26\x81\x99\xc2\x57\xa8\xdc\x00\x1a\xfc\x3f\x83\x70\xc2\xb2\x53\x6f\xe9\x1e\xc2\xe8\x34\x14\xe8\x80\x81\xc3\xaa\xd6\x86\x99\x0d\xdc\x4e\x7e\x01\x56\x30\xa1\x92\xe0\xc5\xef\xa3\x89\xa2\xd1\xf4\xed\x7b\xe0\x12\x99\x8a\x85\xb2\x8e\x49\x09\xa9\xb7\x26\x95\x9a\x33\x99\x66\x42\xa5\x47\x87\xd1\xec\xdd\x04\x78\x59\xe9\x1c\xbe\xb9\xff\x7d\xc9\xa8\x0f\xaf\xd1\x41\x8e\x35\xaa\x1c\x15\x17\x68\xa3\x7e\x68\x80\x7b\xea\x02\x93\x06\x59\xbe\x81\x92\xd9\x17\x60\x6d\x39\xa0\xa0\x0c\xc0\x2a\x56\xe7\x41\xba\x8d\x49\x66\xf4\x0a\x15\xe4\xba\x51\x20\x94\xd3\x70\x82\x8c\x97\xa1\xb4\x41\x0a\x85\xa7\xc4\xd9\x18\x6a\xc6\x57\xac\x40\x0b\x8a\x18\x1b\x3a\x88\xf1\x0a\x2c\x9a\xb5\xe0\x68\xe1\xa4\xcb\xff\x69\x90\x1e\xcd\xc6\x70\xb2\xcb\x7a\xf7\xf1\xb1\x09\xaa\xe5\xd5\xbe\x61\x53\xf7\xd4\x0a\x95\xb3\x41\xba\x12\x96\xef\x55\x42\x7d\x7a\x8b\x16\x84\xb3\x28\x97\xad\xbb\x0a\x1a\x6c\x23\xec\x6b\x38\x31\x58\xe9\x35\xa5\xcf\xab\x86\x29\xea\x4f\xdb\xaa\xdd\xa2\x24\x1c\xaf\x84\x62\x52\x6e\x48\x33\x17\x36\xf4\xc6\x55\x65\x0b\xea\x87\xbf\x69\x6f\x14\x93\xf9\xff\xae\xb8\x42\x8a\x8f\x18\xf1\xb7\x28\xf4\xfa\x3d\xd4\xce\x84\xdd\xd8\x35\x48\x91\x75\x7f\x9f\xed\x04\xf7\x51\x3d\xfc\xa4\x9c\x61\x7c\x05\xa2\x76\xe4\x91\x05\x51\x1b\xed\x1d\x5e\x00\xba\xd2\x69\x2d\xc1\x6a\xce\x1c\x78\x27\x64\x2c\x85\xf2\xf7\x50\x69\xaf\x1c\x60\xd6\x29\xf8\x1c\xd7\xb0\x22\xf2\x6d\xad\x66\xcc\x96\xc0\x59\xcc\xd1\x38\x6a\xb5\x2c\x24\xc9\x1b\x09\xc6\x6e\x14\xef\xe4\x9e\x3e\x85\x25\xe5\x26\x95\x22\xdb\x35\xac\xf6\x27\xfd\x10\x4a\xb8\xc4\x31\x53\xa0\x4b\x28\x29\x36\x85\x58\xb1\x0a\xa1\xb7\x75\xd4\x55\x35\x8d\x51\x1b\x5b\x74\xbe\x4e\xba\x54\xf5\x20\xce\x51\xa2\xc3\xfd\x35\xa6\x82\x78\xf9\xc5\x7b\x2a\x2f\x9d\x88\xbd\x45\x73\x7c\xd5\xb3\xcf\x94\xd1\xf1\xc7\xca\xcf\xbe\x2a\xfc\x85\x9b\x42\x41\xc6\x4b\xfb\xef\xee\xf9\x52\x30\x88\x0c\xee\xb1\x26\x85\xfd\x4f\xa8\x53\x78\xb9\x93\x7f\xc8\x42\xc6\xac\xe0\x5f\x05\x8e\xbc\xd4\xd0\x9b\x21\xcb\x7f\x7e\x63\x8b\x1b\xa5\x7b\xf0\xc3\x0f\xc7\x01\xdb\x96\x47\x42\xb3\x6f\xaf\xd9\x1e\x73\x27\x01\x55\x28\xa7\xcf\x18\xba\x33\x9f\x6b\x85\xd0\x31\x3f\x4c\xea\xae\xbc\x7b\xd4\xd1\x72\xcc\x7c\x71\xa8\xbc\xee\x36\x32\x46\xa3\xd9\x20\x73\x08\x39\x2e\x99\x97\xae\x9b\xbe\x6d\x39\xed\x15\xe2\x78\xab\xb2\xbb\xb7\x5a\xe5\xc2\x40\x5c\xb7\x9e\x1c\xc8\x3e\x7d\x7a\xa8\xd9\xda\xdb\x99\xff\xe1\xb1\x78\xda\x0a\x24\x4e\x57\xa1\xfb\x8e\xbb\xea\x1d\x4d\xc6\x90\x09\xc5\x8c\x40\x4b\x2d\x31\xd5\xb5\x4b\xb9\x12\xd4\xb3\xa9\x45\x4d\x5f\x4e\x4f\x32\x54\xae\x44\x94\x39\x9a\xd3\x17\xb4\x3e\x40\x53\x6e\x20\x85\xa6\x64\x0e\x4a\x34\x18\x86\xc9\x68\x32\xfe\xf0\xcb\xed\x6c\x3e\x9e\x4e\x6e\x7a\x67\xc9\x77\xc9\x55\x6f\xf7\x3d\x4c\xc3\x77\xb3\xbb\x9b\xde\xb6\x2d\x59\xa7\x0d\x2b\x30\x29\xb4\x2e\x24\xb2\x5a\xd8\xd0\x97\xf6\xdd\x34\x36\x28\x91\x59\x4c\x15\xba\x46\x9b\x55\x5c\x4b\x5f\x08\x65\xd3\x5e\x08\x1a\xde\xd7\xda\x38\x18\xce\x46\x3f\xdd\x3c\x39\xc9\xeb\x55\x01\x31\x0d\x6c\xe5\x62\x66\x78\x29\x1c\x72\xe7\x0d\x9e\x1e\x24\xb0\xd5\x20\x38\x8b\xe1\xec\xc7\xe1\xdd\xdd\x4d\x8f\x2b\xb1\xb5\x1b\x3f\xf9\x44\xc6\x1e\xe2\xf5\x93\x4f\x07\xae\x3c\x24\xae\xf8\xd8\xfb\xa2\x95\xe0\x4f\x2b\xbc\xf5\xef\xa1\xfd\xb3\xb3\xff\x70\xa0\x17\xda\x4e\x6c\xe7\x77\x10\xc7\x06\x9d\xd9\xc0\x15\xc4\xb1\xf6\xae\xf6\x0e\x52\x57\xd5\x14\x74\xba\x0b\x3a\x93\x64\xed\x40\xdf\x96\xec\xe2\xea\x5b\xeb\xab\x63\xe1\x2f\xd0\xe4\x20\x81\xfb\x63\xc7\x0c\xc4\xa3\xe3\xc3\xf8\xfe\xe3\xf2\x2b\xd6\xa8\x06\xcd\xf1\xe1\x21\x69\xb8\x11\x54\x2d\x44\x97\xa3\x21\xdf\xe6\x7b\x36\x1e\x2d\xee\xf6\x54\x58\x9f\x27\xe7\xcf\x93\xb3\xff\x34\x6d\x6d\xe0\x96\xf3\x3b\xd8\x71\xa7\x10\xae\xf4\xd9\x63\xbe\x58\x51\xd8\x94\x1b\x11\xd3\xb4\xb0\x69\x47\x1f\x9b\xd2\x5e\x20\x35\xcb\xd3\x27\x9f\x8e\xa1\x3d\xa4\xad\x1f\xf1\x67\x07\xed\x80\xd9\x32\x82\x3a\x4e\x42\x24\xf8\x67\x08\xe3\xfd\xc7\xd1\x63\xb7\xa3\x3e\x38\x94\x72\x37\x02\x1d\x15\x86\x70\xb4\x9c\x08\xb5\xdd\xb7\x4f\x84\x83\x46\x50\xf4\x4a\xe4\xab\xdd\x3b\x60\x57\xa2\x80\x6a\x7d\xfa\x5f\xdb\xae\x69\xd3\xdb\x9b\x6e\x21\xd0\x1e\xda\x21\xc4\x7b\xe1\x2c\xad\x48\xf3\xf1\xeb\xd9\xe2\xcd\x78\xf2\xcd\xe5\x20\x2c\x97\xf3\xf1\xeb\xc5\xed\xec\x0d\x9c\x34\xa5\xe0\x25\x18\x8c\xf1\x1e\xb9\x77\x61\x6f\x39\x84\x97\xf9\xe2\xa3\x90\x92\x1d\x6e\x15\xb6\xd4\xcd\x87\xcc\x17\x09\x2f\xc4\x5f\x44\x7e\x73\x4e\x5b\xf6\xd5\x77\xd1\x7c\x31\x7d\x3b\x1f\xbf\x9e\x0c\xef\x0e\xee\xa3\xa8\x35\x86\xd5\x3b\x4c\xe1\xc5\xa9\xbd\x69\x9f\x46\x8c\xba\xb1\x33\x9b\x5a\x0b\x5a\x70\xe9\x4d\x52\xaf\x8a\x34\xf3\x42\xb6\x8b\x57\xa9\x9b\xdd\x5a\x4c\x5f\x5d\xd4\x87\x30\x21\xc2\x72\x14\x4e\x7e\xf3\xd6\x81\x44\x67\xc1\x5b\x5a\xc1\xc1\xd7\xed\x72\x4d\xcb\x4d\x61\x21\xc3\xa5\x36\x6d\x0a\x84\xf2\xd4\xcf\xb5\x22\x56\x77\x88\x08\x60\x49\x0f\x64\x7a\xd7\xd1\x54\x57\x45\x9b\xda\x2d\x62\x61\xe1\xed\xf8\xe5\x79\xd4\xdf\x01\x6a\x10\x24\xae\x91\x5a\x5b\x80\xb0\x07\xde\x3d\xcd\xda\x9d\xfa\xaf\xd0\xdb\x3b\xd7\x1b\x40\xef\xd1\xb2\xdc\x83\xbf\xd3\x2b\x14\xc3\xa2\xb9\xa7\x95\x86\x0c\xc3\x8d\xdb\xe5\x95\x08\xb4\x66\x46\xe8\xe0\xdf\x76\x91\x6d\xb3\x3d\x08\xab\xa9\x44\x37\x00\x74\x3c\xa1\xdc\x4d\xa6\x8b\xdb\x17\xbb\xa0\x3d\xd3\x4a\x6e\x9e\x05\xe8\xb9\xe6\xe1\x21\x11\xde\x82\x83\x60\x76\x8f\x8f\x64\xe9\x69\x6a\x44\x9e\xa3\x02\xe6\xe8\x6a\x27\x2a\x8c\x6e\x27\x8b\xd9\xfb\xb7\xd3\xf1\x64\x41\x1e\x3d\xf2\xe1\x91\x83\x96\xbe\xd1\xb4\x27\xdf\xbe\x32\x59\xe8\x4d\x13\x58\xb0\xf5\xf8\xcd\x70\x04\x2c\xcf\xc3\xb3\x9a\x59\x2b\x0a\x45\x28\x0f\x58\x78\xd0\x0a\x8e\x97\x85\x3c\x15\xd6\x7a\xb4\xe9\xe5\xe5\x77\xcf\xfb\xe1\x77\xae\x2b\xd2\x8e\x2f\xae\xaf\xaf\xaf\x2f\x2e\xaf\xae\xfe\xa4\x9d\xcb\xcb\xef\x2f\xae\xae\x9f\x5f\x5f\x46\xff\x0a\x00\x00\xff\xff\x43\x57\x8c\x3b\xca\x11\x00\x00") func imagesBaseDockerfileBytes() ([]byte, error) { return bindataRead( @@ -110,22 +110,22 @@ func imagesBaseCleanInstall() (*asset, error) { return a, nil } -var _imagesBaseEntrypointMainGo = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x55\x61\x73\xdb\xb8\x11\xfd\x2c\xfc\x8a\x3d\x76\x6e\x2a\xe5\x68\xd2\x92\xcf\x8e\x4f\x4d\x3e\xa8\xb6\x92\x68\xe2\xca\x19\x4b\xa9\x9b\x49\x3d\x09\x08\x2e\x49\x8c\x41\x80\x05\x40\xc9\x6c\x27\xff\xbd\xb3\x20\xed\xc8\xc9\x7d\xb0\x2c\x90\xc0\xdb\xb7\xef\x3d\xac\xd2\x17\xec\xc2\x34\x9d\x95\x65\xe5\x61\x76\x3c\x3d\x87\x6d\x85\xf0\xbe\xcd\xd0\x6a\xf4\xe8\x60\xd1\xfa\xca\x58\x97\x30\x76\x25\x05\x6a\x87\x39\xb4\x3a\x47\x0b\xbe\x42\x58\x34\x5c\x54\x08\xc3\x9b\x18\xfe\x89\xd6\x49\xa3\x61\x96\x1c\xc3\x98\x36\x44\xc3\xab\x68\xf2\x37\xd6\x99\x16\x6a\xde\x81\x36\x1e\x5a\x87\xe0\x2b\xe9\xa0\x90\x0a\x01\x1f\x04\x36\x1e\xa4\x06\x61\xea\x46\x49\xae\x05\xc2\x5e\xfa\x2a\x14\x19\x20\x12\xf6\x69\x00\x30\x99\xe7\x52\x03\x07\x61\x9a\x0e\x4c\x71\xb8\x0b\xb8\x67\x0c\x00\xa0\xf2\xbe\x99\xa7\xe9\x7e\xbf\x4f\x78\x60\x99\x18\x5b\xa6\xaa\xdf\xe5\xd2\xab\xd5\xc5\x72\xbd\x59\x1e\xcd\x92\x63\xc6\x3e\x6a\x85\xce\x81\xc5\xff\xb4\xd2\x62\x0e\x59\x07\xbc\x69\x94\x14\x3c\x53\x08\x8a\xef\xc1\x58\xe0\xa5\x45\xcc\xc1\x1b\xe2\xb9\xb7\xd2\x4b\x5d\xc6\xe0\x4c\xe1\xf7\xdc\x22\xcb\xa5\xf3\x56\x66\xad\x7f\x26\xd0\x23\x2b\xe9\xe0\x70\x83\xd1\xc0\x35\x44\x8b\x0d\xac\x36\x11\xfc\x7d\xb1\x59\x6d\x62\x76\xbb\xda\xbe\xbb\xfe\xb8\x85\xdb\xc5\xcd\xcd\x62\xbd\x5d\x2d\x37\x70\x7d\x03\x17\xd7\xeb\xcb\xd5\x76\x75\xbd\xde\xc0\xf5\x1b\x58\xac\x3f\xc1\xfb\xd5\xfa\x32\x06\x94\xbe\x42\x0b\xf8\xd0\x58\xe2\x6e\x2c\x48\x92\x0e\xf3\x84\x6d\x10\x9f\x15\x2f\x4c\x4f\xc6\x35\x28\x64\x21\x05\x28\xae\xcb\x96\x97\x08\xa5\xd9\xa1\xd5\x52\x97\xd0\xa0\xad\xa5\x23\xf3\x1c\x70\x9d\x33\x25\x6b\xe9\xb9\x0f\xeb\x9f\xda\x49\xd8\x8b\x94\xb1\xf4\x05\xdb\x92\x85\x54\x17\x6b\xd4\xde\x81\x69\x89\x06\x21\xa3\xf6\xb6\x6b\x8c\xd4\x3e\x81\x95\x9f\xb3\x23\xd8\x73\xe9\x5d\xe0\xb2\x59\xbd\xfd\xb8\xb9\x99\xb2\x23\xc2\xd4\x80\x0f\x28\x1c\x8c\xb9\x2d\x77\x9f\xa7\x77\x31\xf4\x5f\xe6\x77\x31\xa0\xde\x7d\x9e\xdf\x4d\x58\x5f\x87\x2b\x65\xf6\x0e\x5a\x47\x1e\x34\x68\x0b\x63\x6b\x30\x41\x05\x2e\x7a\xa6\x52\x07\x9a\x91\x36\x39\x46\x20\x8c\xa6\xa0\xa0\x85\x9d\xe4\xf0\x35\x37\xe2\x3e\x28\x86\xe2\x2b\xfb\x92\x61\x61\x2c\x7e\x81\x3d\x42\xc5\x77\x48\x10\x2d\x57\xaa\x83\x28\x33\xc6\x63\x1e\x05\x24\xa9\xa5\x27\x3d\x00\x77\x68\x3b\x5f\x91\x54\xa8\x28\x66\xca\xe8\xb2\xcf\xa8\xf4\x09\x63\xb7\x08\x82\xeb\xbe\x21\x87\x3a\x7f\x6c\x92\xb8\x86\xa0\x37\xd6\x08\x32\x8a\xd6\x56\x96\x25\x5a\x70\x9e\x5b\x4a\x51\xcf\xb9\x27\x10\xb1\xef\xca\xc1\x9e\xd0\xf6\x08\xdc\x22\xe4\x46\x23\x34\x96\x58\xd7\x74\x86\xeb\x8e\x30\x77\x92\x3c\xa3\x07\xe6\xb0\xf7\x84\xb1\xf5\xf5\x76\x39\xef\x6b\x1f\x9a\x84\x39\x70\x07\x1c\x9c\xd4\xa5\xa2\x04\x4c\x93\x7f\x85\x5b\x18\x43\xeb\x7a\x1c\xd5\xf5\x71\xf1\xb9\x92\x59\xd2\x8b\x5f\xf3\x7b\x74\x20\x3d\x20\x77\x92\xd2\x60\x20\x6b\xa5\xca\xa1\x31\xd6\xf3\x4c\x75\x71\x90\xa9\xb7\x89\x38\x6b\xba\x2c\xe4\xf6\xbe\xe2\x9e\x0e\xe6\x06\xdd\x10\x9c\x14\x96\xdf\x9b\x3c\x88\x0f\x07\x57\xd3\xf1\xc1\xa9\x1f\x93\x04\x9e\xa0\x7e\xce\x51\x9a\x42\xef\x66\xf0\x36\xf4\xe0\x92\x85\x2d\x1d\xa5\x88\x35\x5c\xdc\x13\x4e\xcd\xa5\x66\x4c\xd6\x44\x18\xc6\x6c\x14\x19\x17\x85\xcf\xd4\xc9\x52\x93\xf2\xa3\xc8\x75\x4e\x70\xa5\x22\xc6\x46\x91\x32\x65\xc4\x26\x81\x6d\x87\xae\x17\xd2\x55\xa6\x55\x39\x64\xfd\xfd\x12\x50\x73\x61\x4d\x0c\x59\xeb\x49\x7e\x25\x75\xfb\x40\x19\x1c\xf8\x77\xa6\xfd\xab\x25\x89\x83\xc7\x06\x4a\xf4\x3d\x0c\xd7\x5d\x65\xf6\x84\x3c\x4c\xa9\x9a\xeb\x97\xc3\x7c\xd2\xed\x03\x2d\x8f\x1a\x5e\xa2\x0b\x2f\x06\x7e\xc9\xcb\xa4\xf2\xb5\x7a\x3c\xe5\xe6\x69\x5a\x4a\x5f\xb5\x59\x22\x4c\x9d\xd6\x26\xeb\xfa\x8f\x4c\x99\x2c\x3d\x3d\x9b\xe5\xc5\xb9\x98\xe5\x67\xc5\xef\xe7\x67\xc7\x53\x71\x9e\x4f\xf3\xe2\xe5\xec\xf4\xec\xe4\xfc\x8f\xd3\xb3\x3f\xf2\xd9\xa9\x38\xce\x8a\x69\xda\xdc\x97\x03\xfe\xf0\xef\x4b\xa0\x90\x94\xe6\x2f\x57\xd3\x63\x26\x8c\x76\x1e\x9c\x2c\xad\xaf\xa5\x86\xd7\x70\xf2\x3b\x63\x45\xab\x45\x90\x73\x3c\x81\xff\xb1\x51\x9a\x52\x2e\x77\xa8\x3d\xfc\xd7\xd4\x99\xc4\xc7\xac\xa3\xa3\x94\xd1\x28\xa7\x69\xae\x14\xe9\xf6\x61\x75\x39\x0d\xe6\x71\xd8\x57\x52\x61\x38\xfe\xd8\x4f\x5f\x3a\x97\x98\x68\xf4\xd4\x7b\x3a\x4b\xc9\xee\x46\xe6\x6c\x34\xa8\xb0\x2a\xb5\xb1\x38\x1e\x9c\x4a\x36\xab\xb7\x17\xef\xae\x2e\x27\x2c\x00\x95\x96\x67\xfd\x2d\xb0\xc8\x55\x74\x98\x1d\x61\xea\x9a\x12\x1a\xfe\x6c\xe9\xa0\xb0\xa6\x0e\x03\x8b\x56\x6c\x24\x0b\x50\xa8\xc7\x43\x72\x26\xf0\x0a\x66\xd4\xdc\x48\x99\x32\x79\xc3\x3d\x57\xe3\x68\x6d\x3c\xa0\x36\x6d\x59\xd1\x99\xb6\xcf\xac\x37\x07\x55\x7e\x89\x26\x6c\xf4\x8d\x8d\x44\x9d\xf7\x73\x0c\xe6\xaf\xbf\x87\xf1\x2e\x7e\x16\xcc\xc0\x98\xda\x3b\x0c\x33\x8c\x0d\x8d\x28\x19\x02\xb5\x59\xbd\xbd\xd9\xfe\x63\xb5\xfe\xed\x84\xca\xd4\xdc\x8b\x0a\x5c\xe7\x3c\xd6\xf9\x84\x8d\x04\x81\xd3\xbd\x1c\x8b\x8a\x6b\x82\xde\x04\x89\x62\x98\x4e\x9e\xe4\x5a\x1b\x2f\x8b\x6e\x2c\x62\x38\x50\x8c\x0a\x1d\x3c\x08\x3b\xc7\x8f\x26\xff\x76\x32\x99\xb0\xd0\xf6\x07\x2b\xb5\x57\x7a\x1c\xdd\xf2\xf0\x6b\xf7\x8c\x67\x92\x24\x51\x5f\x86\x68\xbc\x3a\x12\x41\x42\x5a\xfe\xf2\xfa\xc7\x5a\x4f\x42\x06\xc4\x62\x1c\x2d\x1f\x7a\x40\x5e\x78\x9a\x83\x81\xc0\x1c\x7e\xdd\xd1\xd9\xe1\x4c\x14\xd3\xf3\x09\x1b\x8d\x2c\xfa\xd6\x6a\xd2\x35\x28\xf6\xf4\x9b\xd1\x8f\xd6\x3f\xf1\x3a\x86\x7b\xc4\xe6\x71\xb0\xa2\xde\xb1\x67\xc5\x6f\x50\xa0\xdc\xe1\xd3\x88\x8e\x9f\xc6\x86\x37\x81\xc4\xaf\xbb\x7f\xeb\x28\x86\x27\x13\xa9\xcd\xa1\xa1\xe5\x03\x8a\xf1\xd3\x8b\xe0\xe7\x52\xef\xa4\x35\x7a\x3c\x99\xb0\x6f\xec\xff\x01\x00\x00\xff\xff\x39\x8f\xbf\x84\x4f\x09\x00\x00") +var _imagesBaseEntrypoint = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\x61\x8f\xd3\x46\x10\xfd\x8c\x7f\xc5\x6b\xc2\x07\x90\x62\x07\xf8\x56\x0a\x55\xd3\xbb\x43\x44\xa0\x04\x9d\x43\x29\xaa\xaa\x63\x6d\x8f\xed\x51\xec\x59\x77\x77\x7d\x4e\x84\xf8\xef\xd5\xae\x9d\xcb\x1d\xa8\x52\xef\xcb\x79\x77\xdf\xcc\xbe\x9d\xf7\x66\x32\xff\x69\x99\xb1\x2c\x33\x65\xeb\x28\x9a\xe3\x42\x77\x47\xc3\x55\xed\xf0\xe2\xd9\xf3\x9f\xb1\xab\x09\xef\xfa\x8c\x8c\x90\x23\x8b\x55\xef\x6a\x6d\x6c\x12\xcd\xa3\x39\xde\x73\x4e\x62\xa9\x40\x2f\x05\x19\xb8\x9a\xb0\xea\x54\x5e\xd3\xe9\x64\x81\x3f\xc8\x58\xd6\x82\x17\xc9\x33\x3c\xf1\x80\xd9\x74\x34\x7b\xfa\x4b\x34\xc7\x51\xf7\x68\xd5\x11\xa2\x1d\x7a\x4b\x70\x35\x5b\x94\xdc\x10\xe8\x90\x53\xe7\xc0\x82\x5c\xb7\x5d\xc3\x4a\x72\xc2\xc0\xae\x0e\xd7\x4c\x49\x92\x68\x8e\xcf\x53\x0a\x9d\x39\xc5\x02\x85\x5c\x77\x47\xe8\xf2\x3e\x0e\xca\x05\xc2\xfe\xaf\x76\xae\x7b\xb9\x5c\x0e\xc3\x90\xa8\x40\x36\xd1\xa6\x5a\x36\x23\xd0\x2e\xdf\xaf\x2f\xae\x36\xe9\x55\xfc\x22\x79\x16\x42\x3e\x4a\x43\xd6\xc2\xd0\x3f\x3d\x1b\x2a\x90\x1d\xa1\xba\xae\xe1\x5c\x65\x0d\xa1\x51\x03\xb4\x81\xaa\x0c\x51\x01\xa7\x3d\xdf\xc1\xb0\x63\xa9\x16\xb0\xba\x74\x83\x32\x14\xcd\x51\xb0\x75\x86\xb3\xde\x3d\x28\xd6\x89\x1d\xdb\x07\x00\x2d\x50\x82\xd9\x2a\xc5\x3a\x9d\xe1\xf7\x55\xba\x4e\x17\xd1\x1c\x9f\xd6\xbb\xb7\xdb\x8f\x3b\x7c\x5a\x5d\x5f\xaf\x36\xbb\xf5\x55\x8a\xed\x35\x2e\xb6\x9b\xcb\xf5\x6e\xbd\xdd\xa4\xd8\xbe\xc1\x6a\xf3\x19\xef\xd6\x9b\xcb\x05\x88\x5d\x4d\x06\x74\xe8\x8c\xe7\xaf\x0d\xd8\x97\x91\x0a\x5f\xb3\x94\xe8\x01\x81\x52\x8f\x84\x6c\x47\x39\x97\x9c\xa3\x51\x52\xf5\xaa\x22\x54\xfa\x96\x8c\xb0\x54\xe8\xc8\xb4\x6c\xbd\x98\x16\x4a\x8a\x68\x8e\x86\x5b\x76\xca\x85\x9d\x1f\x1e\x95\x44\x91\x25\x87\x58\x83\x8c\xa1\x03\xbb\xd3\x52\x74\x2f\x96\xee\x96\x1d\x77\x54\x2a\x6e\xa2\x28\xd7\x52\x72\xd5\x1b\xba\xe9\x8c\x3e\x1c\x9f\x3c\xc5\xd7\xc8\x0b\xd6\xee\x0b\x36\x88\x3b\x2c\xc9\xe5\x4b\x7b\xb4\x8e\xda\x62\xfa\xbf\xcc\xb5\x78\xd9\xc9\x14\x89\x25\x73\xcb\x39\x25\xc5\x32\x84\xe5\xca\xe1\xd5\xab\xab\xed\x1b\xfc\xfa\xbf\x03\xbd\x37\xe2\x70\x7b\xe2\xd9\x44\x7f\xa5\xe3\xd1\xdf\xd1\x95\xdc\xb2\xd1\xd2\x92\xb8\xd7\xb3\xb7\xbb\xdd\x87\x9b\x0f\xd7\xdb\x3f\x3f\xbf\x7e\xfc\xf5\xbc\x78\x19\x7f\x9b\xfd\x08\x4c\x1f\x20\xd3\xff\x82\x6e\xb6\x77\xb8\xd3\xe7\x08\xda\xbe\x89\xbe\x45\x51\xc9\x87\x9b\x56\xf7\xe2\xee\xca\x32\x87\x50\x4e\xd6\x2a\x73\x84\x96\xe6\x88\xa1\x26\xf1\x4d\x64\xc4\xc6\x86\x5a\xd5\x79\x5f\x91\x78\x9f\x06\x4f\x79\x71\x6a\x6d\xdd\x02\x59\xef\x50\x2b\xd3\x7a\x67\x4f\xb9\x7c\x9b\x67\x2c\x3e\x59\x98\x06\xe1\x2e\xd8\x5a\xf7\x4d\x81\x8c\xa0\x07\x19\xcd\x6f\xb4\x76\x5e\x7f\xd4\xea\x76\x34\x91\x25\xd7\x73\x81\x8c\xdd\x58\xf7\x5a\x0f\x12\x60\x2f\x03\xf6\x9c\x6e\x3a\x6e\x75\x81\xd8\xde\xdf\x9f\x38\x4c\x0a\xc5\x2c\xb1\x8a\xef\xf4\x39\x91\x08\xf7\x19\x52\xc5\xf8\x5a\xaf\xe3\x14\xe7\x55\xb3\x53\x4b\x97\xbe\x11\xc9\xee\x9d\xee\x42\x5f\x0f\xbc\xe7\x65\x3a\x35\xe2\x9d\x07\x2e\x4e\xc9\xd7\xe2\xc8\x94\x2a\xa7\xe5\x29\x97\x1e\xe8\x96\xcc\x02\x03\x41\x7c\x4f\xeb\xd0\x46\xae\x66\xa9\x2c\x4a\xa3\x5b\x7c\x29\x74\xbe\x27\x03\xd3\x0b\xe2\xb8\x33\x7c\xcb\x0d\x55\x54\x7c\x41\x92\x24\x53\x1a\x5f\xa0\x71\x96\x35\xaa\x82\x6a\xac\x46\xad\xba\x8e\xc4\xfa\x21\xd1\xaa\x3d\x85\x07\xc0\x0c\x0b\xa8\x56\x4b\x65\xdd\x83\x9b\x46\xe3\x07\x0d\x62\x0d\x43\xe1\x73\x61\xf4\xf8\xec\x93\x1f\x54\x5e\xb3\xd0\x0d\x17\xf7\x4c\x71\x49\x4d\x18\xd4\x5e\x99\x09\x10\x73\x01\x6a\x33\x2a\x0a\x2a\xfc\x80\xf2\x47\xa2\x0b\x02\xb7\xbe\xc5\x3d\xd7\x8a\x84\x8c\xf2\x71\x0a\x42\x03\xb4\x50\x12\x3d\xf2\xb6\x60\xeb\x6d\x74\xb6\x5a\x46\xb9\xf2\x93\x3a\xd3\xae\xc6\xbe\xcf\xfc\x75\x21\xc5\x48\xdf\x0f\x6b\x2d\x24\xce\xa2\xe1\x3d\x61\x20\x2f\x9b\x90\xf3\xd9\x7c\xdc\x3d\x4e\xec\x8b\x2f\xaa\x69\x8e\xbe\x28\x7e\x02\xb2\x54\x3d\xdb\x3a\xb0\xb3\x49\xf4\xc8\xb4\x88\xcb\xb1\xef\xcf\x71\xd1\xa3\x93\x51\xce\x7b\xb1\x37\x61\xe7\x0b\x33\x0f\xba\x74\x86\x62\x16\x76\x28\xf9\xd0\x77\xf6\xdc\x3e\xdf\x15\xee\xfb\xa1\xe3\xe3\x07\xc2\xa0\xc4\x85\x32\xe5\xba\x6d\xfd\xe3\x9e\xd0\xa1\xa3\xdc\x8d\x33\x3e\xa3\x93\x55\x9f\x4e\xcb\x0f\xeb\xcb\xe7\x7e\xde\x83\x0e\x94\x87\x9f\x01\x17\x85\xcf\xd9\xe3\xdf\x66\xd1\xbf\x01\x00\x00\xff\xff\x70\x78\x32\xcc\x61\x07\x00\x00") -func imagesBaseEntrypointMainGoBytes() ([]byte, error) { +func imagesBaseEntrypointBytes() ([]byte, error) { return bindataRead( - _imagesBaseEntrypointMainGo, - "images/base/entrypoint/main.go", + _imagesBaseEntrypoint, + "images/base/entrypoint", ) } -func imagesBaseEntrypointMainGo() (*asset, error) { - bytes, err := imagesBaseEntrypointMainGoBytes() +func imagesBaseEntrypoint() (*asset, error) { + bytes, err := imagesBaseEntrypointBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "images/base/entrypoint/main.go", size: 0, mode: os.FileMode(438), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "images/base/entrypoint", size: 0, mode: os.FileMode(438), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -182,9 +182,9 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "images/base/Dockerfile": imagesBaseDockerfile, - "images/base/clean-install": imagesBaseCleanInstall, - "images/base/entrypoint/main.go": imagesBaseEntrypointMainGo, + "images/base/Dockerfile": imagesBaseDockerfile, + "images/base/clean-install": imagesBaseCleanInstall, + "images/base/entrypoint": imagesBaseEntrypoint, } // AssetDir returns the file names below a certain @@ -232,9 +232,7 @@ var _bintree = &bintree{nil, map[string]*bintree{ "base": {nil, map[string]*bintree{ "Dockerfile": {imagesBaseDockerfile, map[string]*bintree{}}, "clean-install": {imagesBaseCleanInstall, map[string]*bintree{}}, - "entrypoint": {nil, map[string]*bintree{ - "main.go": {imagesBaseEntrypointMainGo, map[string]*bintree{}}, - }}, + "entrypoint": {imagesBaseEntrypoint, map[string]*bintree{}}, }}, }}, }} From dd90f6c714aaf8fe880911ac9ec47dd5c02724a4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 16:56:47 -0700 Subject: [PATCH 06/18] fix permissions in base image --- pkg/build/base/sources/generate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/base/sources/generate.go b/pkg/build/base/sources/generate.go index 544ef85369..2362c2df13 100644 --- a/pkg/build/base/sources/generate.go +++ b/pkg/build/base/sources/generate.go @@ -21,4 +21,4 @@ limitations under the License. package sources // We pull in the sources with go-bindata -//go:generate go-bindata -nometadata -mode=0666 -pkg=$GOPACKAGE -o=images_sources.go -ignore=(\.*README\.md)|(\.*BUILD\.bazel) -prefix=./../../../../ ./../../../../images/... +//go:generate go-bindata -nometadata -mode=0777 -pkg=$GOPACKAGE -o=images_sources.go -ignore=(\.*README\.md)|(\.*BUILD\.bazel) -prefix=./../../../../ ./../../../../images/... From 5277c8425f8358083c44ce00e3c2ced8bf61154d Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 16:57:09 -0700 Subject: [PATCH 07/18] hack/update-generated.sh --- pkg/build/base/sources/images_sources.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/build/base/sources/images_sources.go b/pkg/build/base/sources/images_sources.go index d50006f44c..07ae6146c1 100644 --- a/pkg/build/base/sources/images_sources.go +++ b/pkg/build/base/sources/images_sources.go @@ -85,7 +85,7 @@ func imagesBaseDockerfile() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "images/base/Dockerfile", size: 0, mode: os.FileMode(438), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "images/base/Dockerfile", size: 0, mode: os.FileMode(511), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -105,7 +105,7 @@ func imagesBaseCleanInstall() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "images/base/clean-install", size: 0, mode: os.FileMode(438), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "images/base/clean-install", size: 0, mode: os.FileMode(511), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -125,7 +125,7 @@ func imagesBaseEntrypoint() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "images/base/entrypoint", size: 0, mode: os.FileMode(438), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "images/base/entrypoint", size: 0, mode: os.FileMode(511), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info} return a, nil } From 9bbcaffc824a36a0bca2e8c92d33de0c2de3012f Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 17:30:36 -0700 Subject: [PATCH 08/18] bump base image to v20190429-a8e2079 --- pkg/build/node/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/node/node.go b/pkg/build/node/node.go index 3611049ed8..2fbd3f8f86 100644 --- a/pkg/build/node/node.go +++ b/pkg/build/node/node.go @@ -44,7 +44,7 @@ import ( const DefaultImage = "kindest/node:latest" // DefaultBaseImage is the default base image used -const DefaultBaseImage = "kindest/base:v20190402-b53e1df" +const DefaultBaseImage = "kindest/base:v20190429-a8e2079" // DefaultMode is the default kubernetes build mode for the built image // see pkg/build/kube.Bits From 9f844a80d98c67b2b2ab98f3e52b4a27cbeb62c4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 19:15:12 -0700 Subject: [PATCH 09/18] fix join --- pkg/cluster/internal/create/actions/kubeadmjoin/join.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/internal/create/actions/kubeadmjoin/join.go b/pkg/cluster/internal/create/actions/kubeadmjoin/join.go index f66c62f732..9d02ddc171 100644 --- a/pkg/cluster/internal/create/actions/kubeadmjoin/join.go +++ b/pkg/cluster/internal/create/actions/kubeadmjoin/join.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package kubeadmjoin implements the kubeadm config action +// Package kubeadmjoin implements the kubeadm join action package kubeadmjoin import ( @@ -36,11 +36,11 @@ import ( "sigs.k8s.io/kind/pkg/fs" ) -// Action implements action for creating the kubeadm config +// Action implements action for creating the kubeadm join // and deployng it on the bootrap control-plane node. type Action struct{} -// NewAction returns a new action for creating the kubadm config +// NewAction returns a new action for creating the kubeadm jion func NewAction() actions.Action { return &Action{} } @@ -214,6 +214,7 @@ func runKubeadmJoinControlPlane( "--ignore-preflight-errors=all", // increase verbosity for debug "--v=6", + "--cri-socket=/run/containerd/containerd.sock", ) lines, err := exec.CombinedOutputLines(cmd) log.Debug(strings.Join(lines, "\n")) @@ -238,6 +239,7 @@ func runKubeadmJoin( } // run kubeadm join + // TODO(bentheelder): this should be using the config file cmd := node.Command( "kubeadm", "join", // the join command uses the docker ip and a well know port that @@ -251,6 +253,7 @@ func runKubeadmJoin( "--ignore-preflight-errors=all", // increase verbosity for debugging "--v=6", + "--cri-socket=/run/containerd/containerd.sock", ) lines, err := exec.CombinedOutputLines(cmd) log.Debug(strings.Join(lines, "\n")) From e90a3d692d425048497fbce35755c18cd302aa52 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Mon, 29 Apr 2019 19:27:49 -0700 Subject: [PATCH 10/18] fix template formatting --- pkg/cluster/internal/kubeadm/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cluster/internal/kubeadm/config.go b/pkg/cluster/internal/kubeadm/config.go index ed135e2335..046ea7aa7b 100644 --- a/pkg/cluster/internal/kubeadm/config.go +++ b/pkg/cluster/internal/kubeadm/config.go @@ -105,7 +105,7 @@ kubeletConfiguration: controllerManagerExtraArgs: enable-hostpath-provisioner: "true" nodeRegistration: - criSocket: "/run/containerd/containerd.sock" + criSocket: "/run/containerd/containerd.sock" --- apiVersion: kubeadm.k8s.io/v1alpha2 kind: NodeConfiguration From 7d1c501f2838c383594818fee554840c7be33b10 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 01:13:36 -0700 Subject: [PATCH 11/18] add support for bazel + < v1.12 --- pkg/build/kube/bazelbuildbits.go | 74 ++++++++++++++++++++++++++++++- pkg/build/kube/dockerbuildbits.go | 3 +- pkg/build/kube/version.go | 23 +++++----- pkg/build/node/node.go | 4 +- pkg/container/docker/archive.go | 70 +++++++++++++++++++++++++++-- 5 files changed, 155 insertions(+), 19 deletions(-) diff --git a/pkg/build/kube/bazelbuildbits.go b/pkg/build/kube/bazelbuildbits.go index 222181870e..7f9b4b62d3 100644 --- a/pkg/build/kube/bazelbuildbits.go +++ b/pkg/build/kube/bazelbuildbits.go @@ -21,8 +21,12 @@ import ( "os" "path" "path/filepath" + "strings" + + "sigs.k8s.io/kind/pkg/container/docker" "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/version" "sigs.k8s.io/kind/pkg/exec" "sigs.k8s.io/kind/pkg/util" ) @@ -62,7 +66,8 @@ func (b *BazelBuildBits) Build() error { // TODO(bentheelder): we assume the host arch, but cross compiling should // be possible now - bazelGoosGoarch := fmt.Sprintf("linux_%s", util.GetArch()) + arch := util.GetArch() + bazelGoosGoarch := fmt.Sprintf("linux_%s", arch) // build artifacts cmd := exec.Command( @@ -82,7 +87,72 @@ func (b *BazelBuildBits) Build() error { b.paths = b.findPaths(bazelGoosGoarch) // capture version info - return buildVersionFile(b.kubeRoot) + rawVersion, err := buildVersionFile(b.kubeRoot) + if err != nil { + return err + } + + // additional special handling for old kubernetes versions + bazel + // before Kubernetes v1.12.0 kubeadm requires arch specific images, instead + // later releases use manifest list images + // we must re-tag them here + ver, err := version.ParseGeneric(rawVersion) + if err != nil { + return err + } + // only < 1.12.0 has this problem + if !ver.LessThan(version.MustParseSemantic("v1.12.0")) { + return nil + } + + // fix all tar files + for path := range b.paths { + if !strings.HasSuffix(path, ".tar") { + continue + } + if err := fixOldImageTags(path, arch); err != nil { + return err + } + } + + return nil +} + +func fixOldImageTags(path, arch string) error { + // open input at path and create a fixed file at path+.fixed + in, err := os.Open(path) + if err != nil { + return err + } + defer in.Close() + out, err := os.Create(path + ".fixed") + if err != nil { + return err + } + defer out.Close() + + // create a tarball with corrected tags + tagFixer := func(tags docker.ArchiveRepositories) docker.ArchiveRepositories { + archSuffix := "-" + arch + fixed := make(docker.ArchiveRepositories) + for repository, tagsToRefs := range tags { + // ensure the suffix + if !strings.HasSuffix(repository, archSuffix) { + repository = repository + archSuffix + } + fixed[repository] = tagsToRefs + } + return fixed + } + if err := docker.EditArchiveRepositories(in, out, tagFixer); err != nil { + return err + } + + // replace the original file with the fixed file + in.Close() + out.Sync() + out.Close() + return os.Rename(out.Name(), in.Name()) } func (b *BazelBuildBits) findPaths(bazelGoosGoarch string) map[string]string { diff --git a/pkg/build/kube/dockerbuildbits.go b/pkg/build/kube/dockerbuildbits.go index 4c2cdd84ab..cfc57a9d73 100644 --- a/pkg/build/kube/dockerbuildbits.go +++ b/pkg/build/kube/dockerbuildbits.go @@ -84,7 +84,8 @@ func (b *DockerBuildBits) Build() error { } // capture version info - return buildVersionFile(b.kubeRoot) + _, err = buildVersionFile(b.kubeRoot) + return err } func dockerBuildOsAndArch() string { diff --git a/pkg/build/kube/version.go b/pkg/build/kube/version.go index 125f276511..19a65d1dd7 100644 --- a/pkg/build/kube/version.go +++ b/pkg/build/kube/version.go @@ -31,10 +31,11 @@ import ( // buildVersionFile creates a file for the kubernetes git version in // ./_output/version based on hack/print-workspace-status.sh, // these are built into the node image and consumed by the cluster tooling -func buildVersionFile(kubeRoot string) error { +// the raw version is also returned +func buildVersionFile(kubeRoot string) (string, error) { cwd, err := os.Getwd() if err != nil { - return err + return "", err } os.Chdir(kubeRoot) // make sure we cd back when done @@ -44,7 +45,7 @@ func buildVersionFile(kubeRoot string) error { cmd := exec.Command("hack/print-workspace-status.sh") output, err := exec.CombinedOutputLines(cmd) if err != nil { - return err + return "", err } // we will place the file in _output with other build artifacts @@ -56,27 +57,27 @@ func buildVersionFile(kubeRoot string) error { _ = os.Mkdir(outputDir, os.ModePerm) // parse it, and populate it into _output/git_version - wroteVersion := false + version := "" for _, line := range output { parts := strings.SplitN(line, " ", 2) if len(parts) != 2 { log.Errorf("Could not parse kubernetes version, output: %s", strings.Join(output, "\n")) - return errors.New("could not parse kubernetes version") + return "", errors.New("could not parse kubernetes version") } if parts[0] == "gitVersion" { + version = parts[1] if err := ioutil.WriteFile( filepath.Join(outputDir, "git_version"), - []byte(parts[1]), + []byte(version), 0777, ); err != nil { - return errors.Wrap(err, "failed to write version file") + return "", errors.Wrap(err, "failed to write version file") } - wroteVersion = true } } - if !wroteVersion { + if version == "" { log.Errorf("Could not obtain kubernetes version, output: %s", strings.Join(output, "\n")) - return errors.New("could not obtain kubernetes version") + return "", errors.New("could not obtain kubernetes version") } - return nil + return version, nil } diff --git a/pkg/build/node/node.go b/pkg/build/node/node.go index 2fbd3f8f86..0528da46a1 100644 --- a/pkg/build/node/node.go +++ b/pkg/build/node/node.go @@ -457,11 +457,11 @@ func (c *BuildContext) prePullImages(dir, containerID string) error { // see https://github.com/containerd/containerd/blob/master/design/architecture.md // TODO(bentheelder): the API is actually Import(); Unpack(), we should be able // to skip unpackaging and avoid the errors - if err = inheritOutputAndRun(cmder.Command( + if err = cmder.Command( "bash", "-c", // TODO(bentheelder): error handling? (this will always return the rm) `containerd & find /kind/images -name *.tar -print0 | xargs -0 -n 1 -P $(nproc) ctr --namespace=k8s.io images import; kill %1; rm -rf /kind/images/*`, - )); err != nil { + ).Run(); err != nil { log.Errorf("Image build Failed! Failed to load images into containerd %v", err) return err } diff --git a/pkg/container/docker/archive.go b/pkg/container/docker/archive.go index 8d6bb5a39a..97b1d38d00 100644 --- a/pkg/container/docker/archive.go +++ b/pkg/container/docker/archive.go @@ -32,7 +32,7 @@ import ( // GetArchiveTags obtains a list of "repo:tag" docker image tags from a // given docker image archive (tarball) path // compatible with all known specs: -// https://github.com/moby/moby/blob/master/image/spec/v1.0.md +// https://github.com/moby/moby/blob/master/image/spec/v1.md // https://github.com/moby/moby/blob/master/image/spec/v1.1.md // https://github.com/moby/moby/blob/master/image/spec/v1.2.md func GetArchiveTags(path string) ([]string, error) { @@ -61,10 +61,12 @@ func GetArchiveTags(path string) ([]string, error) { if err != nil { return nil, err } - var repoTags map[string]map[string]string - if err := json.Unmarshal(b, &repoTags); err != nil { + // parse + repoTags, err := parseRepositories(b) + if err != nil { return nil, err } + // convert to tags in the docker CLI sense res := []string{} for repo, tags := range repoTags { for tag := range tags { @@ -73,3 +75,65 @@ func GetArchiveTags(path string) ([]string, error) { } return res, nil } + +// ArchiveRepositories represents repository:tag:ref +// +// https://github.com/moby/moby/blob/master/image/spec/v1.md +// https://github.com/moby/moby/blob/master/image/spec/v1.1.md +// https://github.com/moby/moby/blob/master/image/spec/v1.2.md +type ArchiveRepositories map[string]map[string]string + +// EditArchiveRepositories applies edit to reader's repositories file +func EditArchiveRepositories(reader io.Reader, writer io.Writer, edit func(ArchiveRepositories) ArchiveRepositories) error { + tarReader := tar.NewReader(reader) + tarWriter := tar.NewWriter(writer) + // iterate all entries in the tarball + for { + // read an entry + hdr, err := tarReader.Next() + if err == io.EOF { + return tarWriter.Close() + } else if err != nil { + return err + } + b, err := ioutil.ReadAll(tarReader) + if err != nil { + return err + } + + // parse the tags if we found the repositories file + if hdr.Name == "repositories" { + tags, err := parseRepositories(b) + if err != nil { + return err + } + // run the user's edit function + edit(tags) + // marshal back the tags for writing + b, err = json.Marshal(tags) + if err != nil { + return err + } + hdr.Size = int64(len(b)) + } + + // write to the output tarball + if err := tarWriter.WriteHeader(hdr); err != nil { + return err + } + if len(b) > 0 { + if _, err := tarWriter.Write(b); err != nil { + return err + } + } + } +} + +// returns repository:tag:ref +func parseRepositories(data []byte) (ArchiveRepositories, error) { + var repoTags ArchiveRepositories + if err := json.Unmarshal(data, &repoTags); err != nil { + return nil, err + } + return repoTags, nil +} From 7c32d016c8cb0d53049e7ae6d1064fcafc6bfa31 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 01:59:12 -0700 Subject: [PATCH 12/18] debug --- pkg/build/kube/bazelbuildbits.go | 1 + pkg/build/node/node.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/build/kube/bazelbuildbits.go b/pkg/build/kube/bazelbuildbits.go index 7f9b4b62d3..fd631faf8a 100644 --- a/pkg/build/kube/bazelbuildbits.go +++ b/pkg/build/kube/bazelbuildbits.go @@ -138,6 +138,7 @@ func fixOldImageTags(path, arch string) error { for repository, tagsToRefs := range tags { // ensure the suffix if !strings.HasSuffix(repository, archSuffix) { + println("fixed: " + repository + " -> " + repository + archSuffix) repository = repository + archSuffix } fixed[repository] = tagsToRefs diff --git a/pkg/build/node/node.go b/pkg/build/node/node.go index 0528da46a1..2fbd3f8f86 100644 --- a/pkg/build/node/node.go +++ b/pkg/build/node/node.go @@ -457,11 +457,11 @@ func (c *BuildContext) prePullImages(dir, containerID string) error { // see https://github.com/containerd/containerd/blob/master/design/architecture.md // TODO(bentheelder): the API is actually Import(); Unpack(), we should be able // to skip unpackaging and avoid the errors - if err = cmder.Command( + if err = inheritOutputAndRun(cmder.Command( "bash", "-c", // TODO(bentheelder): error handling? (this will always return the rm) `containerd & find /kind/images -name *.tar -print0 | xargs -0 -n 1 -P $(nproc) ctr --namespace=k8s.io images import; kill %1; rm -rf /kind/images/*`, - ).Run(); err != nil { + )); err != nil { log.Errorf("Image build Failed! Failed to load images into containerd %v", err) return err } From fb766bcd72a47bd0ee3b711f3757dbc30d15b1fd Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 11:33:24 -0700 Subject: [PATCH 13/18] edit manifest.json as well --- pkg/build/kube/bazelbuildbits.go | 19 +++----- pkg/container/docker/archive.go | 84 +++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 34 deletions(-) diff --git a/pkg/build/kube/bazelbuildbits.go b/pkg/build/kube/bazelbuildbits.go index fd631faf8a..7988b7c7d8 100644 --- a/pkg/build/kube/bazelbuildbits.go +++ b/pkg/build/kube/bazelbuildbits.go @@ -132,20 +132,15 @@ func fixOldImageTags(path, arch string) error { defer out.Close() // create a tarball with corrected tags - tagFixer := func(tags docker.ArchiveRepositories) docker.ArchiveRepositories { - archSuffix := "-" + arch - fixed := make(docker.ArchiveRepositories) - for repository, tagsToRefs := range tags { - // ensure the suffix - if !strings.HasSuffix(repository, archSuffix) { - println("fixed: " + repository + " -> " + repository + archSuffix) - repository = repository + archSuffix - } - fixed[repository] = tagsToRefs + archSuffix := "-" + arch + repositoryFixer := func(repository string) string { + if !strings.HasSuffix(repository, archSuffix) { + println("fixed: " + repository + " -> " + repository + archSuffix) + repository = repository + archSuffix } - return fixed + return repository } - if err := docker.EditArchiveRepositories(in, out, tagFixer); err != nil { + if err := docker.EditArchiveRepositories(in, out, repositoryFixer); err != nil { return err } diff --git a/pkg/container/docker/archive.go b/pkg/container/docker/archive.go index 97b1d38d00..9dd9eb84b1 100644 --- a/pkg/container/docker/archive.go +++ b/pkg/container/docker/archive.go @@ -25,6 +25,7 @@ import ( "io" "io/ioutil" "os" + "strings" "github.com/pkg/errors" ) @@ -76,15 +77,8 @@ func GetArchiveTags(path string) ([]string, error) { return res, nil } -// ArchiveRepositories represents repository:tag:ref -// -// https://github.com/moby/moby/blob/master/image/spec/v1.md -// https://github.com/moby/moby/blob/master/image/spec/v1.1.md -// https://github.com/moby/moby/blob/master/image/spec/v1.2.md -type ArchiveRepositories map[string]map[string]string - // EditArchiveRepositories applies edit to reader's repositories file -func EditArchiveRepositories(reader io.Reader, writer io.Writer, edit func(ArchiveRepositories) ArchiveRepositories) error { +func EditArchiveRepositories(reader io.Reader, writer io.Writer, edit func(string) string) error { tarReader := tar.NewReader(reader) tarWriter := tar.NewWriter(writer) // iterate all entries in the tarball @@ -101,19 +95,12 @@ func EditArchiveRepositories(reader io.Reader, writer io.Writer, edit func(Archi return err } - // parse the tags if we found the repositories file + // edit the repostories and manifests files when we find them if hdr.Name == "repositories" { - tags, err := parseRepositories(b) - if err != nil { - return err - } - // run the user's edit function - edit(tags) - // marshal back the tags for writing - b, err = json.Marshal(tags) - if err != nil { - return err - } + b, err = editRepositories(b, edit) + hdr.Size = int64(len(b)) + } else if hdr.Name == "manifest.json" { + b, err = editManifestRepositories(b, edit) hdr.Size = int64(len(b)) } @@ -129,9 +116,62 @@ func EditArchiveRepositories(reader io.Reader, writer io.Writer, edit func(Archi } } +/* helpers */ + +// archiveRepositories represents repository:tag:ref +// +// https://github.com/moby/moby/blob/master/image/spec/v1.md +// https://github.com/moby/moby/blob/master/image/spec/v1.1.md +// https://github.com/moby/moby/blob/master/image/spec/v1.2.md +type archiveRepositories map[string]map[string]string + +func editRepositories(raw []byte, edit func(string) string) ([]byte, error) { + tags, err := parseRepositories(raw) + if err != nil { + return nil, err + } + + fixed := make(archiveRepositories) + for repository, tagsToRefs := range tags { + fixed[edit(repository)] = tagsToRefs + } + + return json.Marshal(fixed) +} + +// https://github.com/moby/moby/blob/master/image/spec/v1.2.md#combined-image-json--filesystem-changeset-format +type metadataEntry struct { + Config string `json:"Config"` + RepoTags []string `json:"RepoTags"` + Layers []string `json:"Layers"` +} + +func editManifestRepositories(raw []byte, edit func(string) string) ([]byte, error) { + var entries []metadataEntry + if err := json.Unmarshal(raw, &entries); err != nil { + return nil, err + } + + for i, entry := range entries { + fixed := make([]string, len(entry.RepoTags)) + for i, tag := range entry.RepoTags { + parts := strings.Split(tag, ":") + if len(parts) > 2 { + return nil, fmt.Errorf("invalid repotag: %s", entry) + } + parts[0] = edit(parts[0]) + fixed[i] = strings.Join(parts, ":") + } + + entries[i].RepoTags = fixed + } + + return json.Marshal(entries) +} + // returns repository:tag:ref -func parseRepositories(data []byte) (ArchiveRepositories, error) { - var repoTags ArchiveRepositories +func parseRepositories(data []byte) (archiveRepositories, error) { + var repoTags archiveRepositories if err := json.Unmarshal(data, &repoTags); err != nil { return nil, err } From 857731ba82317a312db84a419c3e5877dc8c94e8 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 13:54:29 -0700 Subject: [PATCH 14/18] fix kind load * --- cmd/kind/load/docker-image/docker-image.go | 13 ++----------- cmd/kind/load/image-archive/image-archive.go | 13 ++----------- pkg/cluster/nodes/node.go | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/cmd/kind/load/docker-image/docker-image.go b/cmd/kind/load/docker-image/docker-image.go index 516a596ba5..7014fb9042 100644 --- a/cmd/kind/load/docker-image/docker-image.go +++ b/cmd/kind/load/docker-image/docker-image.go @@ -114,6 +114,7 @@ func runE(flags *flagpole, cmd *cobra.Command, args []string) error { } // Load the image into every node + // TODO(bentheelder): this should probably be concurrent for _, node := range selectedNodes { if err := loadImage(imageTarPath, &node); err != nil { return err @@ -123,20 +124,10 @@ func runE(flags *flagpole, cmd *cobra.Command, args []string) error { } func loadImage(imageTarName string, node *clusternodes.Node) error { - // Copy image tar to each node f, err := os.Open(imageTarName) if err != nil { return errors.Wrap(err, "failed to open image") } defer f.Close() - - // Load image into each node - cmd := node.Command( - "docker", "load", - ) - cmd.SetStdin(f) - if err := cmd.Run(); err != nil { - return errors.Wrap(err, "failed to load image") - } - return nil + return node.LoadImageArchive(f) } diff --git a/cmd/kind/load/image-archive/image-archive.go b/cmd/kind/load/image-archive/image-archive.go index 61e4e8f483..7993ce1fd6 100644 --- a/cmd/kind/load/image-archive/image-archive.go +++ b/cmd/kind/load/image-archive/image-archive.go @@ -98,6 +98,7 @@ func runE(flags *flagpole, cmd *cobra.Command, args []string) error { } // Load the image into every node + // TODO(bentheelder): this should probably be concurrent for _, node := range selectedNodes { if err := loadImage(args[0], &node); err != nil { return err @@ -107,20 +108,10 @@ func runE(flags *flagpole, cmd *cobra.Command, args []string) error { } func loadImage(imageTarName string, node *clusternodes.Node) error { - // Copy image tar to each node f, err := os.Open(imageTarName) if err != nil { return errors.Wrap(err, "failed to open image") } defer f.Close() - - // Load image into each node - cmd := node.Command( - "docker", "load", - ) - cmd.SetStdin(f) - if err := cmd.Run(); err != nil { - return errors.Wrap(err, "failed to load image") - } - return nil + return node.LoadImageArchive(f) } diff --git a/pkg/cluster/nodes/node.go b/pkg/cluster/nodes/node.go index 97740f72b3..b9dad496cf 100644 --- a/pkg/cluster/nodes/node.go +++ b/pkg/cluster/nodes/node.go @@ -19,6 +19,7 @@ package nodes import ( "bytes" "fmt" + "io" "io/ioutil" "os" "path/filepath" @@ -275,6 +276,20 @@ func (n *Node) WriteFile(dest, content string) error { return n.Command("cp", "/dev/stdin", dest).SetStdin(strings.NewReader(content)).Run() } +// LoadImageArchive will load the image contents in the image reader to the +// k8s.io namespace on the node such that the image can be used from a +// Kubernetes pod +func (n *Node) LoadImageArchive(image io.Reader) error { + cmd := n.Command( + "ctr", "--namespace=k8s.io", "images", "import", "-", + ) + cmd.SetStdin(image) + if err := cmd.Run(); err != nil { + return errors.Wrap(err, "failed to load image") + } + return nil +} + // proxyDetails contains proxy settings discovered on the host type proxyDetails struct { Envs map[string]string From e82f63a55fde03cb00177403d122d9ddca499282 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 14:00:31 -0700 Subject: [PATCH 15/18] fix product_name in entrypoint --- images/base/entrypoint | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/images/base/entrypoint b/images/base/entrypoint index 72007e89b1..512c1b45c2 100755 --- a/images/base/entrypoint +++ b/images/base/entrypoint @@ -49,9 +49,17 @@ fix_machine_id() { systemd-machine-id-setup } +fix_product_name() { + # this is a small fix to hide the underlying hardware and fix issue #426 + # https://github.com/kubernetes-sigs/kind/issues/426 + echo "kind" > /kind/product_name + mount -o ro,bind /kind/product_name /sys/class/dmi/id/product_name +} + # run pre-init fixups fix_mount fix_machine_id +fix_product_name configure_proxy # we want the command (expected to be systemd) to be PID1, so exec to it From 8023742f58731ee9696aaa7a5f924a68a9ad7de4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 14:15:43 -0700 Subject: [PATCH 16/18] hack/update-generated.sh --- pkg/build/base/sources/images_sources.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/base/sources/images_sources.go b/pkg/build/base/sources/images_sources.go index 07ae6146c1..bbb30f5ea1 100644 --- a/pkg/build/base/sources/images_sources.go +++ b/pkg/build/base/sources/images_sources.go @@ -110,7 +110,7 @@ func imagesBaseCleanInstall() (*asset, error) { return a, nil } -var _imagesBaseEntrypoint = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\x61\x8f\xd3\x46\x10\xfd\x8c\x7f\xc5\x6b\xc2\x07\x90\x62\x07\xf8\x56\x0a\x55\xd3\xbb\x43\x44\xa0\x04\x9d\x43\x29\xaa\xaa\x63\x6d\x8f\xed\x51\xec\x59\x77\x77\x7d\x4e\x84\xf8\xef\xd5\xae\x9d\xcb\x1d\xa8\x52\xef\xcb\x79\x77\xdf\xcc\xbe\x9d\xf7\x66\x32\xff\x69\x99\xb1\x2c\x33\x65\xeb\x28\x9a\xe3\x42\x77\x47\xc3\x55\xed\xf0\xe2\xd9\xf3\x9f\xb1\xab\x09\xef\xfa\x8c\x8c\x90\x23\x8b\x55\xef\x6a\x6d\x6c\x12\xcd\xa3\x39\xde\x73\x4e\x62\xa9\x40\x2f\x05\x19\xb8\x9a\xb0\xea\x54\x5e\xd3\xe9\x64\x81\x3f\xc8\x58\xd6\x82\x17\xc9\x33\x3c\xf1\x80\xd9\x74\x34\x7b\xfa\x4b\x34\xc7\x51\xf7\x68\xd5\x11\xa2\x1d\x7a\x4b\x70\x35\x5b\x94\xdc\x10\xe8\x90\x53\xe7\xc0\x82\x5c\xb7\x5d\xc3\x4a\x72\xc2\xc0\xae\x0e\xd7\x4c\x49\x92\x68\x8e\xcf\x53\x0a\x9d\x39\xc5\x02\x85\x5c\x77\x47\xe8\xf2\x3e\x0e\xca\x05\xc2\xfe\xaf\x76\xae\x7b\xb9\x5c\x0e\xc3\x90\xa8\x40\x36\xd1\xa6\x5a\x36\x23\xd0\x2e\xdf\xaf\x2f\xae\x36\xe9\x55\xfc\x22\x79\x16\x42\x3e\x4a\x43\xd6\xc2\xd0\x3f\x3d\x1b\x2a\x90\x1d\xa1\xba\xae\xe1\x5c\x65\x0d\xa1\x51\x03\xb4\x81\xaa\x0c\x51\x01\xa7\x3d\xdf\xc1\xb0\x63\xa9\x16\xb0\xba\x74\x83\x32\x14\xcd\x51\xb0\x75\x86\xb3\xde\x3d\x28\xd6\x89\x1d\xdb\x07\x00\x2d\x50\x82\xd9\x2a\xc5\x3a\x9d\xe1\xf7\x55\xba\x4e\x17\xd1\x1c\x9f\xd6\xbb\xb7\xdb\x8f\x3b\x7c\x5a\x5d\x5f\xaf\x36\xbb\xf5\x55\x8a\xed\x35\x2e\xb6\x9b\xcb\xf5\x6e\xbd\xdd\xa4\xd8\xbe\xc1\x6a\xf3\x19\xef\xd6\x9b\xcb\x05\x88\x5d\x4d\x06\x74\xe8\x8c\xe7\xaf\x0d\xd8\x97\x91\x0a\x5f\xb3\x94\xe8\x01\x81\x52\x8f\x84\x6c\x47\x39\x97\x9c\xa3\x51\x52\xf5\xaa\x22\x54\xfa\x96\x8c\xb0\x54\xe8\xc8\xb4\x6c\xbd\x98\x16\x4a\x8a\x68\x8e\x86\x5b\x76\xca\x85\x9d\x1f\x1e\x95\x44\x91\x25\x87\x58\x83\x8c\xa1\x03\xbb\xd3\x52\x74\x2f\x96\xee\x96\x1d\x77\x54\x2a\x6e\xa2\x28\xd7\x52\x72\xd5\x1b\xba\xe9\x8c\x3e\x1c\x9f\x3c\xc5\xd7\xc8\x0b\xd6\xee\x0b\x36\x88\x3b\x2c\xc9\xe5\x4b\x7b\xb4\x8e\xda\x62\xfa\xbf\xcc\xb5\x78\xd9\xc9\x14\x89\x25\x73\xcb\x39\x25\xc5\x32\x84\xe5\xca\xe1\xd5\xab\xab\xed\x1b\xfc\xfa\xbf\x03\xbd\x37\xe2\x70\x7b\xe2\xd9\x44\x7f\xa5\xe3\xd1\xdf\xd1\x95\xdc\xb2\xd1\xd2\x92\xb8\xd7\xb3\xb7\xbb\xdd\x87\x9b\x0f\xd7\xdb\x3f\x3f\xbf\x7e\xfc\xf5\xbc\x78\x19\x7f\x9b\xfd\x08\x4c\x1f\x20\xd3\xff\x82\x6e\xb6\x77\xb8\xd3\xe7\x08\xda\xbe\x89\xbe\x45\x51\xc9\x87\x9b\x56\xf7\xe2\xee\xca\x32\x87\x50\x4e\xd6\x2a\x73\x84\x96\xe6\x88\xa1\x26\xf1\x4d\x64\xc4\xc6\x86\x5a\xd5\x79\x5f\x91\x78\x9f\x06\x4f\x79\x71\x6a\x6d\xdd\x02\x59\xef\x50\x2b\xd3\x7a\x67\x4f\xb9\x7c\x9b\x67\x2c\x3e\x59\x98\x06\xe1\x2e\xd8\x5a\xf7\x4d\x81\x8c\xa0\x07\x19\xcd\x6f\xb4\x76\x5e\x7f\xd4\xea\x76\x34\x91\x25\xd7\x73\x81\x8c\xdd\x58\xf7\x5a\x0f\x12\x60\x2f\x03\xf6\x9c\x6e\x3a\x6e\x75\x81\xd8\xde\xdf\x9f\x38\x4c\x0a\xc5\x2c\xb1\x8a\xef\xf4\x39\x91\x08\xf7\x19\x52\xc5\xf8\x5a\xaf\xe3\x14\xe7\x55\xb3\x53\x4b\x97\xbe\x11\xc9\xee\x9d\xee\x42\x5f\x0f\xbc\xe7\x65\x3a\x35\xe2\x9d\x07\x2e\x4e\xc9\xd7\xe2\xc8\x94\x2a\xa7\xe5\x29\x97\x1e\xe8\x96\xcc\x02\x03\x41\x7c\x4f\xeb\xd0\x46\xae\x66\xa9\x2c\x4a\xa3\x5b\x7c\x29\x74\xbe\x27\x03\xd3\x0b\xe2\xb8\x33\x7c\xcb\x0d\x55\x54\x7c\x41\x92\x24\x53\x1a\x5f\xa0\x71\x96\x35\xaa\x82\x6a\xac\x46\xad\xba\x8e\xc4\xfa\x21\xd1\xaa\x3d\x85\x07\xc0\x0c\x0b\xa8\x56\x4b\x65\xdd\x83\x9b\x46\xe3\x07\x0d\x62\x0d\x43\xe1\x73\x61\xf4\xf8\xec\x93\x1f\x54\x5e\xb3\xd0\x0d\x17\xf7\x4c\x71\x49\x4d\x18\xd4\x5e\x99\x09\x10\x73\x01\x6a\x33\x2a\x0a\x2a\xfc\x80\xf2\x47\xa2\x0b\x02\xb7\xbe\xc5\x3d\xd7\x8a\x84\x8c\xf2\x71\x0a\x42\x03\xb4\x50\x12\x3d\xf2\xb6\x60\xeb\x6d\x74\xb6\x5a\x46\xb9\xf2\x93\x3a\xd3\xae\xc6\xbe\xcf\xfc\x75\x21\xc5\x48\xdf\x0f\x6b\x2d\x24\xce\xa2\xe1\x3d\x61\x20\x2f\x9b\x90\xf3\xd9\x7c\xdc\x3d\x4e\xec\x8b\x2f\xaa\x69\x8e\xbe\x28\x7e\x02\xb2\x54\x3d\xdb\x3a\xb0\xb3\x49\xf4\xc8\xb4\x88\xcb\xb1\xef\xcf\x71\xd1\xa3\x93\x51\xce\x7b\xb1\x37\x61\xe7\x0b\x33\x0f\xba\x74\x86\x62\x16\x76\x28\xf9\xd0\x77\xf6\xdc\x3e\xdf\x15\xee\xfb\xa1\xe3\xe3\x07\xc2\xa0\xc4\x85\x32\xe5\xba\x6d\xfd\xe3\x9e\xd0\xa1\xa3\xdc\x8d\x33\x3e\xa3\x93\x55\x9f\x4e\xcb\x0f\xeb\xcb\xe7\x7e\xde\x83\x0e\x94\x87\x9f\x01\x17\x85\xcf\xd9\xe3\xdf\x66\xd1\xbf\x01\x00\x00\xff\xff\x70\x78\x32\xcc\x61\x07\x00\x00") +var _imagesBaseEntrypoint = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x55\xdf\x8f\xdb\x36\x0c\x7e\xae\xff\x0a\x2e\xe9\x43\x0b\xc4\x76\x7b\x18\x06\xac\x6b\x8b\xdd\xee\xae\x68\xd0\x22\x29\x2e\xe9\xba\x62\x18\xae\xb2\x44\xdb\x44\x6c\xca\x93\xe4\x73\x82\xa2\xff\xfb\x40\xd9\xb9\x5f\xdd\x80\xe5\x25\xb6\xf5\x91\xfc\x48\x7e\xa4\xe6\x3f\xe4\x05\x71\x5e\x28\x5f\x27\xc9\x1c\xce\x6c\x77\x70\x54\xd5\x01\x4e\x9e\x3d\xff\x19\xb6\x35\xc2\xbb\xbe\x40\xc7\x18\xd0\xc3\x69\x1f\x6a\xeb\x7c\x96\xcc\x93\x39\xbc\x27\x8d\xec\xd1\x40\xcf\x06\x1d\x84\x1a\xe1\xb4\x53\xba\xc6\xe3\xc9\x02\x7e\x47\xe7\xc9\x32\x9c\x64\xcf\xe0\x89\x00\x66\xd3\xd1\xec\xe9\x2f\xc9\x1c\x0e\xb6\x87\x56\x1d\x80\x6d\x80\xde\x23\x84\x9a\x3c\x94\xd4\x20\xe0\x5e\x63\x17\x80\x18\xb4\x6d\xbb\x86\x14\x6b\x84\x81\x42\x1d\xc3\x4c\x4e\xb2\x64\x0e\x9f\x27\x17\xb6\x08\x8a\x18\x14\x68\xdb\x1d\xc0\x96\x77\x71\xa0\x42\x24\x2c\xbf\x3a\x84\xee\x45\x9e\x0f\xc3\x90\xa9\x48\x36\xb3\xae\xca\x9b\x11\xe8\xf3\xf7\xcb\xb3\x8b\xd5\xe6\x22\x3d\xc9\x9e\x45\x93\x8f\xdc\xa0\xf7\xe0\xf0\xef\x9e\x1c\x1a\x28\x0e\xa0\xba\xae\x21\xad\x8a\x06\xa1\x51\x03\x58\x07\xaa\x72\x88\x06\x82\x15\xbe\x83\xa3\x40\x5c\x2d\xc0\xdb\x32\x0c\xca\x61\x32\x07\x43\x3e\x38\x2a\xfa\x70\xaf\x58\x47\x76\xe4\xef\x01\x2c\x83\x62\x98\x9d\x6e\x60\xb9\x99\xc1\x6f\xa7\x9b\xe5\x66\x91\xcc\xe1\xd3\x72\xfb\x76\xfd\x71\x0b\x9f\x4e\x2f\x2f\x4f\x57\xdb\xe5\xc5\x06\xd6\x97\x70\xb6\x5e\x9d\x2f\xb7\xcb\xf5\x6a\x03\xeb\x37\x70\xba\xfa\x0c\xef\x96\xab\xf3\x05\x20\x85\x1a\x1d\xe0\xbe\x73\xc2\xdf\x3a\x20\x29\x23\x1a\xa9\xd9\x06\xf1\x1e\x81\xd2\x8e\x84\x7c\x87\x9a\x4a\xd2\xd0\x28\xae\x7a\x55\x21\x54\xf6\x1a\x1d\x13\x57\xd0\xa1\x6b\xc9\x4b\x33\x3d\x28\x36\xc9\x1c\x1a\x6a\x29\xa8\x10\xbf\x7c\x97\x54\x96\x24\x1e\x03\xa4\x16\xd0\x39\xdc\x53\x38\xbe\xb2\xed\xd9\xe3\xcd\x6b\x47\x1d\x96\x8a\x9a\x24\xd1\x96\x4b\xaa\x7a\x87\x57\x9d\xb3\xfb\xc3\x93\xa7\xf0\x35\x91\x86\xb5\x3b\x43\x0e\xd2\x0e\x72\x0c\x3a\xf7\x07\x1f\xb0\x35\xd3\x7f\xae\x2d\x4b\xdb\xd1\x99\xcc\xa3\xbb\x26\x8d\x99\xc9\xa3\x99\x56\x01\x5e\xbe\xbc\x58\xbf\x81\xd7\xff\xdb\x50\xb4\x91\xc6\xe8\x99\xb0\x49\xfe\xdc\x8c\x47\x7f\x25\x17\x7c\x4d\xce\x72\x8b\x1c\x5e\xcd\xde\x6e\xb7\x1f\xae\x3e\x5c\xae\xff\xf8\xfc\xea\xf1\xd7\xdb\x97\x17\xe9\xb7\xd9\xf7\xc0\xcd\x3d\xe4\xe6\xbf\xa0\xab\xf5\x0d\xee\xf8\x38\x82\xd6\x6f\x92\x6f\x49\x52\xd2\xfe\xaa\xb5\x3d\x87\x9b\xb2\xcc\x81\x51\xa3\xf7\xca\x1d\xc0\x72\x73\x80\xa1\x46\x96\x21\x72\xec\x53\x87\xad\xea\x44\x57\xc8\xa2\xd3\xa8\x29\x69\x4e\x6d\x7d\x58\x40\xd1\x07\xa8\x95\x6b\x45\xd9\x93\x2f\x19\xf3\x82\x58\x9c\xc5\x6d\x10\x63\x81\xaf\x6d\xdf\x18\x28\x10\xec\xc0\xa3\xf8\x9d\xb5\x41\xfa\x0f\xb5\xba\x1e\x45\xe4\x31\xf4\x64\xa0\xa0\x30\xd6\xbd\xb6\x03\x47\xd8\x8b\x88\xbd\x75\x37\x1d\xb7\xd6\x40\xea\xef\x7e\x9f\x38\x4c\x1d\x4a\x89\x53\x95\xde\xf4\xe7\x48\x22\xc6\x73\xa8\xcc\x98\xad\xf4\x71\xb2\x93\xae\xf9\x69\xa4\x4b\x19\x44\xf4\xbb\x60\xbb\x38\xd7\x03\xed\x28\xdf\x4c\x83\x78\xa3\x81\xb3\xa3\xf3\x25\x07\x74\xa5\xd2\x98\x1f\x7d\xd9\x01\xaf\xd1\x2d\x60\x40\x60\x99\x69\x1b\xc7\x28\xd4\xc4\x95\x87\xd2\xd9\x16\xbe\x18\xab\x77\xe8\xc0\xf5\x0c\x69\xda\x39\xba\xa6\x06\x2b\x34\x5f\x20\xcb\xb2\xc9\x8d\x14\x68\xdc\x65\x8d\xaa\x40\x35\xde\x42\xad\xba\x0e\xd9\xcb\x92\x68\xd5\x0e\x63\x02\xe0\x86\x05\xa8\xd6\x72\xe5\xc3\xbd\x48\xa3\xf0\x63\x0f\x52\x0b\x0e\xe3\xe3\xc2\xd9\x31\xed\xa3\x1e\x94\xae\x89\xf1\x8a\xcc\x1d\x51\x9c\x63\x13\x17\xb5\x74\x66\x02\xa4\x64\x00\xdb\x02\x8d\x41\x23\x0b\x4a\x8e\xd8\x1a\x04\x6a\x65\xc4\x85\x6b\x85\x8c\x4e\x89\x9d\x02\xc6\x01\x2c\x63\x96\x3c\x12\x59\x90\x17\x19\xdd\x4a\xad\x40\xad\x64\x53\x17\x36\xd4\xb0\xeb\x0b\x09\x17\x5d\x8c\xf4\x65\x59\x5b\x46\x0e\x1e\x1a\xda\x21\x0c\x28\x6d\x63\x0c\xe2\x4d\xec\xee\x70\x22\x29\x3e\xab\xa6\x39\x48\x51\x64\x03\x12\x57\x3d\xf9\x3a\xb2\xf3\x59\xf2\xc8\xb5\x90\x96\xe3\xdc\xdf\xda\x25\x8f\x8e\x42\xb9\xfd\x96\x8a\x08\xbb\x63\x61\x3a\x67\x4d\xaf\xc3\x15\xab\x16\xef\x94\x26\x4c\xc9\x28\xf0\xad\x6a\x1a\x28\x69\x2f\x81\x6b\x32\xa3\x90\xe3\x0e\x6b\x0e\xb2\xec\x6a\xe5\x8c\x28\x26\x66\x26\x38\xf2\xbe\x47\x98\xff\x78\xf2\xd3\x03\xd1\x55\x14\xea\xbe\xc8\xb4\x6d\xf3\xdd\xcd\x35\x99\x7a\xaa\x7c\xbe\x23\x36\x79\x34\xf4\xf9\xd1\x10\x75\x6d\x61\x26\x27\x33\x78\x0d\x23\xe4\x2e\xdd\x07\x8d\xb7\x8b\x82\xd8\xfc\x0b\x2e\x0a\x21\xd7\x8d\xf2\x3e\x37\x2d\xe5\xf4\xc0\xcd\x37\xb9\xca\x45\xa1\x9d\xc3\x94\x98\x82\x64\xd1\x77\xfe\x76\x91\x3c\x90\xd0\x77\x85\x7b\xb8\x8f\xc5\xe1\x80\x30\x28\x0e\xb1\x5a\xda\xb6\xad\x54\xe7\x09\xee\x3b\xd4\x61\xbc\xfe\x0a\x3c\x4e\xf1\xd3\xe9\xf5\xc3\xf2\xfc\xb9\x5c\x85\x80\x7b\xd4\xf1\x86\x0c\x49\x7c\x9c\x3d\xfe\x75\x96\xfc\x13\x00\x00\xff\xff\xca\xcc\x44\x26\x7c\x08\x00\x00") func imagesBaseEntrypointBytes() ([]byte, error) { return bindataRead( From e05bc7efc8886c2d101d30509338a39ee77585b2 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 14:19:25 -0700 Subject: [PATCH 17/18] bump base to v20190430-8023742 --- pkg/build/node/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/build/node/node.go b/pkg/build/node/node.go index 2fbd3f8f86..85947ff760 100644 --- a/pkg/build/node/node.go +++ b/pkg/build/node/node.go @@ -44,7 +44,7 @@ import ( const DefaultImage = "kindest/node:latest" // DefaultBaseImage is the default base image used -const DefaultBaseImage = "kindest/base:v20190429-a8e2079" +const DefaultBaseImage = "kindest/base:v20190430-8023742" // DefaultMode is the default kubernetes build mode for the built image // see pkg/build/kube.Bits From 0c5176a6513639886370eab9dcdd2b561a16a6f4 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 30 Apr 2019 15:41:12 -0700 Subject: [PATCH 18/18] upgrade kindest/node to v1.14.1 --- pkg/cluster/config/defaults/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cluster/config/defaults/image.go b/pkg/cluster/config/defaults/image.go index 3a9e243040..904f6eb919 100644 --- a/pkg/cluster/config/defaults/image.go +++ b/pkg/cluster/config/defaults/image.go @@ -18,4 +18,4 @@ limitations under the License. package defaults // Image is the default for the Config.Image field, aka the default node image. -const Image = "kindest/node:v1.13.4" +const Image = "kindest/node:v1.14.1"