From cea579f3c4c25deac6f093368bff0dd67e8e344f Mon Sep 17 00:00:00 2001 From: Andrew Lytvynov Date: Tue, 4 Sep 2018 14:09:24 -0700 Subject: [PATCH] Fetch gke-exec-plugin license file along with the binary --- cluster/gce/gci/configure.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index c2fd675002f..852bebc0677 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -275,6 +275,14 @@ function install-exec-auth-plugin { download-or-bust "${plugin_sha1}" "${plugin_url}" mv "${KUBE_HOME}/gke-exec-auth-plugin" "${KUBE_BIN}/gke-exec-auth-plugin" chmod a+x "${KUBE_BIN}/gke-exec-auth-plugin" + + if [[ ! "${EXEC_AUTH_PLUGIN_LICENSE_URL:-}" ]]; then + return + fi + local -r license_url="${EXEC_AUTH_PLUGIN_LICENSE_URL}" + echo "Downloading gke-exec-auth-plugin license" + download-or-bust "" "${license_url}" + mv "${KUBE_HOME}/LICENSE" "${KUBE_BIN}/gke-exec-auth-plugin-license" } function install-kube-manifests { @@ -421,6 +429,7 @@ function install-kube-binary-config { install-crictl if [[ "${KUBERNETES_MASTER:-}" == "false" ]]; then + # TODO(awly): include the binary and license in the OS image. install-exec-auth-plugin fi