linuxkit / kubernetes

minimal and immutable Kubernetes images built with LinuxKit
Apache License 2.0
400 stars 75 forks source link

Bump to Kubernetes 1.9.2 #51

Closed errordeveloper closed 6 years ago

errordeveloper commented 6 years ago

@ijc PTAL

GordonTheTurtle commented 6 years ago

Please sign your commits following these rules: https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work The easiest way to do this is to amend the last commit:

$ git clone -b "kubernetes-1.9.2" git@github.com:errordeveloper/linuxkit-kubernetes.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

ijc commented 6 years ago

You need to run make update-hashes to fix the CI. Unlike the main repo you can update hashes in the same commit as you change things.

errordeveloper commented 6 years ago

You need to run make update-hashes...

Ah, yes... it fails on macOS. I have changed to use xargs gsed locally, if you have a suggestion on how to add an OS condition to it, let me know.

ijc commented 6 years ago

What is the failure? Perhaps we can come up with a more portable rune?

errordeveloper commented 6 years ago
> make update-hashes
set -e ; for tag in $(linuxkit pkg show-tag pkg/kubelet) \
               $(linuxkit pkg show-tag pkg/cri-containerd) \
               $(linuxkit pkg show-tag pkg/kubernetes-docker-image-cache-common) \
               $(linuxkit pkg show-tag pkg/kubernetes-docker-image-cache-control-plane) ; do \
        image=${tag%:*} ; \
        git grep -E -l "\b$image:" | xargs --no-run-if-empty sed -i.bak -e "s,$image:[[:xdigit:]]\{40\}\(-dirty\)\?,$tag,g" ; \
    done
xargs: illegal option -- -
usage: xargs [-0opt] [-E eofstr] [-I replstr [-R replacements]] [-J replstr]
             [-L number] [-n number [-x]] [-P maxprocs] [-s size]
             [utility [argument ...]]
make: *** [update-hashes] Error 1
errordeveloper commented 6 years ago

@ijc this PR should be good to go, let's discuss the portability of make update-hashes in https://github.com/linuxkit/kubernetes/issues/52.