From 6129515a845a7146e0bd62e0d166892f5fc9ece9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sun, 17 May 2020 01:36:01 -0400 Subject: [PATCH] app-admin/*-wrapper: pull container as docker image by default quay.io is removing ACI conversion support. Unless overridden, pull as a docker image instead. --- ...cd-wrapper-3.3.18.ebuild => etcd-wrapper-3.3.18-r1.ebuild} | 0 .../coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper | 4 +++- .../app-admin/flannel-wrapper/files/flannel-wrapper | 4 +++- ...wrapper-0.11.0.ebuild => flannel-wrapper-0.11.0-r1.ebuild} | 0 .../app-admin/kubelet-wrapper/files/kubelet-wrapper | 4 +++- ...t-wrapper-0.0.4.ebuild => kubelet-wrapper-0.0.4-r1.ebuild} | 0 6 files changed, 9 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/{etcd-wrapper-3.3.18.ebuild => etcd-wrapper-3.3.18-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/{flannel-wrapper-0.11.0.ebuild => flannel-wrapper-0.11.0-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/{kubelet-wrapper-0.0.4.ebuild => kubelet-wrapper-0.0.4-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.18.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.18-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.18.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/etcd-wrapper-3.3.18-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper index 022bc5dd65..d0e5c7660e 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/etcd-wrapper/files/etcd-wrapper @@ -27,11 +27,13 @@ function require_ev_one() { require_ev_one ETCD_IMAGE ETCD_IMAGE_TAG require_ev_all ETCD_USER ETCD_DATA_DIR -ETCD_IMAGE_URL="${ETCD_IMAGE_URL:-quay.io/coreos/etcd}" +ETCD_IMAGE_URL="${ETCD_IMAGE_URL:-docker://quay.io/coreos/etcd}" ETCD_IMAGE="${ETCD_IMAGE:-${ETCD_IMAGE_URL}:${ETCD_IMAGE_TAG}}" if [[ "${ETCD_IMAGE%%/*}" == "quay.io" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} --trust-keys-from-https" +elif [[ "${ETCD_IMAGE%%/*}" == "docker:" ]]; then + RKT_RUN_ARGS="${RKT_RUN_ARGS} --insecure-options=image" fi if [[ ! -e "${ETCD_DATA_DIR}" ]]; then diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper index 88a27ee2ce..7747194712 100755 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/flannel-wrapper @@ -36,11 +36,13 @@ FLANNEL_IMAGE_TAG="${FLANNEL_IMAGE_TAG:-${FLANNEL_VER}}" require_ev_one FLANNEL_IMAGE FLANNEL_IMAGE_TAG -FLANNEL_IMAGE_URL="${FLANNEL_IMAGE_URL:-${FLANNEL_IMG:-quay.io/coreos/flannel}}" +FLANNEL_IMAGE_URL="${FLANNEL_IMAGE_URL:-${FLANNEL_IMG:-docker://quay.io/coreos/flannel}}" FLANNEL_IMAGE="${FLANNEL_IMAGE:-${FLANNEL_IMAGE_URL}:${FLANNEL_IMAGE_TAG}}" if [[ "${FLANNEL_IMAGE%%/*}" == "quay.io" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} --trust-keys-from-https" +elif [[ "${FLANNEL_IMAGE%%/*}" == "docker:" ]]; then + RKT_RUN_ARGS="${RKT_RUN_ARGS} --insecure-options=image" fi ETCD_SSL_DIR="${ETCD_SSL_DIR:-/etc/ssl/etcd}" diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0-r1.ebuild 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 6dbfcec3b2..ed7558887e 100755 --- 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 @@ -42,13 +42,15 @@ KUBELET_IMAGE_TAG="${KUBELET_IMAGE_TAG:-${KUBELET_VERSION}}" require_ev_one KUBELET_IMAGE KUBELET_IMAGE_TAG -KUBELET_IMAGE_URL="${KUBELET_IMAGE_URL:-${KUBELET_ACI:-quay.io/coreos/hyperkube}}" +KUBELET_IMAGE_URL="${KUBELET_IMAGE_URL:-${KUBELET_ACI:-docker://quay.io/coreos/hyperkube}}" KUBELET_IMAGE="${KUBELET_IMAGE:-${KUBELET_IMAGE_URL}:${KUBELET_IMAGE_TAG}}" RKT_RUN_ARGS="${RKT_RUN_ARGS} ${RKT_OPTS}" if [[ "${KUBELET_IMAGE%%/*}" == "quay.io" ]]; then RKT_RUN_ARGS="${RKT_RUN_ARGS} --trust-keys-from-https" +elif [[ "${KUBELET_IMAGE%%/*}" == "docker:" ]]; then + RKT_RUN_ARGS="${RKT_RUN_ARGS} --insecure-options=image" fi mkdir --parents /etc/kubernetes diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/kubelet-wrapper/kubelet-wrapper-0.0.4-r1.ebuild