From acf641ca670834283da4c8de0d3578137970fd34 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Thu, 12 May 2016 21:32:13 -0700 Subject: [PATCH] app-admin/kubelet-wrapper: fix stage1 reference since rkt 1.3.0, rkt has began checking stage1 hashes, and will do so if the stage1 is not in the default stage1 directory. for compatibility, df131e85d5240a75fb9cd4e1fb85e86e6f5290c1 symlinked the old stage1 directory to the new one, however, if a stage1 is referred to by the old stage1 path under rkt >1.3.0, image verification will fail because no signature exists. instead of using a path, use stage1-fly.aci by name and let rkt handle finding it in the default directory. --- .../app-admin/kubelet-wrapper/files/kubelet-wrapper | 3 ++- ...wrapper-0.0.1-r4.ebuild => kubelet-wrapper-0.0.1-r5.ebuild} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/{kubelet-wrapper-0.0.1-r4.ebuild => kubelet-wrapper-0.0.1-r5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper index e054466fa3..3526b4b9f7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/files/kubelet-wrapper @@ -34,5 +34,6 @@ exec /usr/bin/rkt run \ --mount volume=run,target=/run \ --trust-keys-from-https \ $RKT_OPTS \ - --stage1-path=/usr/share/rkt/stage1-fly.aci \ + --stage1-from-dir=stage1-fly.aci \ ${KUBELET_ACI}:${KUBELET_VERSION} --exec=/kubelet -- "$@" + diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.1-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.1-r5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.1-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.1-r5.ebuild