diff --git a/ezctl b/ezctl index 1b15eb502..3e0075df8 100755 --- a/ezctl +++ b/ezctl @@ -149,23 +149,25 @@ function new() { cp example/config.yml "clusters/$1/config.yml" logger debug "set versions" - k8sVer=$(grep 'K8S_BIN_VER=v' ezdown|cut -d'v' -f2) - calicoVer=$(grep 'calicoVer=' ezdown|cut -d'=' -f2) - ciliumVer=$(grep 'ciliumVer=' ezdown|cut -d'=' -f2) - flannelVer=$(grep 'flannelVer=' ezdown|cut -d'=' -f2) - kubeRouterVer=$(grep 'kubeRouterVer=' ezdown|cut -d'=' -f2) - kubeOvnVer=$(grep 'kubeOvnVer=' ezdown|cut -d'=' -f2) - corednsVer=$(grep 'corednsVer=' ezdown|cut -d'=' -f2) - dnsNodeCacheVer=$(grep 'dnsNodeCacheVer=' ezdown|cut -d'=' -f2) - dashboardVer=$(grep 'dashboardVer=' ezdown|cut -d'=' -f2) - dashboardMetricsScraperVer=$(grep 'dashboardMetricsScraperVer=' ezdown|cut -d'=' -f2) - metricsVer=$(grep 'metricsVer=' ezdown|cut -d'=' -f2) - localpathProvisionerVer=$(grep 'localpathProvisionerVer=' ezdown|cut -d'=' -f2) - nfsProvisionerVer=$(grep 'nfsProvisionerVer=' ezdown|cut -d'=' -f2) - pauseVer=$(grep 'pauseVer=' ezdown|cut -d'=' -f2) - promChartVer=$(grep 'promChartVer=' ezdown|cut -d'=' -f2) - kubeappsVer=$(grep 'kubeappsVer=' ezdown|cut -d'=' -f2) - harborVer=$(grep 'HARBOR_VER=' ezdown|cut -d'=' -f2) + eval $(sed '/[ver|VER]=.*\./!d;s|=v|=|' ezdown) + k8sVer="$K8S_BIN_VER" + harborVer="$HARBOR_VER" + # these variables were imported with eval and have the same name in ezdown, setting value to itself is pointless so commented out and kept for reference + #calicoVer="$calicoVer" + #ciliumVer="$ciliumVer" + #flannelVer="$flannelVer" + #kubeRouterVer="$kubeRouterVer" + #kubeOvnVer="$kubeOvnVer" + #corednsVer="$corednsVer" + #dnsNodeCacheVer="$dnsNodeCacheVer" + #dashboardVer="$dashboardVer" + #dashboardMetricsScraperVer="$dashboardMetricsScraperVer" + #metricsVer="$metricsVer" + #localpathProvisionerVer="$localpathProvisionerVer" + #nfsProvisionerVer="$nfsProvisionerVer" + #pauseVer="$pauseVer" + #promChartVer="$promChartVer" + #kubeappsVer="$kubeappsVer" registryMirror=true grep registry-mirrors /etc/docker/daemon.json > /dev/null 2>&1 || { logger debug "disable registry mirrors"; registryMirror=false; }