From: Ricardo Noriega Date: Thu, 16 Apr 2020 11:08:57 +0000 (+0200) Subject: Change in SiteConfig Kustomize Plugin X-Git-Tag: akraino_r3~2 X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=e3b041db865675ae161547ea9cb0894b4ff361f5;p=kni%2Finstaller.git Change in SiteConfig Kustomize Plugin This change allows to add a manifest with a dockerconfigjson type of Secret, so deployments can pull images from private registries and kubeconfig from a hub management site as secret. Signed-off-by: Ricardo Noriega Change-Id: Ic4a5b3ee3ea15a88e7d4f4318feea41a4e753800 --- diff --git a/plugins/kustomize/plugin/kni.akraino.org/v1alpha1/siteconfig/SiteConfig b/plugins/kustomize/plugin/kni.akraino.org/v1alpha1/siteconfig/SiteConfig index 23e65f0..20d9d07 100755 --- a/plugins/kustomize/plugin/kni.akraino.org/v1alpha1/siteconfig/SiteConfig +++ b/plugins/kustomize/plugin/kni.akraino.org/v1alpha1/siteconfig/SiteConfig @@ -17,7 +17,11 @@ shift PULL_SECRET=$(cat ${HOME}/.kni/pull-secret.json) SSH_PUB_KEY=$(cat ${HOME}/.kni/id_rsa.pub) +DOCKERCONFIGJSON=$(cat ${HOME}/.kni/dockerconfig.json) +KUBECONFIGHUB=$(cat ${HOME}/.kni/kubeconfighub.json) cat - | sed \ -e "s|PULL_SECRET|\'${PULL_SECRET}\'|" \ - -e "s|SSH_PUB_KEY|${SSH_PUB_KEY}|" \ No newline at end of file + -e "s|SSH_PUB_KEY|${SSH_PUB_KEY}|" \ + -e "s|DOCKERCONFIGJSON|${DOCKERCONFIGJSON}|" \ + -e "s|KUBECONFIGHUB|${KUBECONFIGHUB}|"