Merge pull request #1324 from makkes/improve-deployment-scripts

chore: improve some of the deployment and build scripts

Author: k8s-ci-robot

scripts/deploy-kubefed.sh

@@ -173,8 +173,10 @@ cd -
 deploy-with-helm
 
 # Join the host cluster
-CONTEXT="$(kubectl config current-context)"
-./bin/kubefedctl join "${CONTEXT}" --host-cluster-context "${CONTEXT}" --v=2 "${KF_NS_ARGS}" --error-on-existing=false
+if [ -z "${NO_JOIN_HOST_CLUSTER:-}" ] ; then
+    CONTEXT="$(kubectl config current-context)"
+    ./bin/kubefedctl join "${CONTEXT}" --host-cluster-context "${CONTEXT}" --v=2 "${KF_NS_ARGS}" --error-on-existing=false
+fi
 
 for c in ${JOIN_CLUSTERS}; do
   ./bin/kubefedctl join "${c}" --host-cluster-context "${CONTEXT}" --v=2 "${KF_NS_ARGS}" --error-on-existing=false

scripts/sync-up-helm-chart.sh

@@ -78,11 +78,11 @@ users: []
 EOF
 
 # Start kube-apiserver to generate CRDs
-${ROOT_DIR}/bin/etcd --data-dir ${WORKDIR} &
-util::wait-for-condition 'ok' "curl http://127.0.0.1:2379/version &> /dev/null" 30
+${ROOT_DIR}/bin/etcd --data-dir ${WORKDIR} --log-output stdout > ${WORKDIR}/etcd.log 2>&1 &
+util::wait-for-condition 'etcd' "curl http://127.0.0.1:2379/version &> /dev/null" 30
 
-${ROOT_DIR}/bin/kube-apiserver --etcd-servers=http://127.0.0.1:2379 --service-cluster-ip-range=10.0.0.0/16 --cert-dir ${WORKDIR} &
-util::wait-for-condition 'ok' "kubectl --kubeconfig ${WORKDIR}/kubeconfig --context kubefed get --raw=/healthz &> /dev/null" 60
+${ROOT_DIR}/bin/kube-apiserver --etcd-servers=http://127.0.0.1:2379 --service-cluster-ip-range=10.0.0.0/16 --cert-dir=${WORKDIR} --log-file=${WORKDIR}/kube-apiserver.log --logtostderr=false 2> /dev/null &
+util::wait-for-condition 'kube-apiserver' "kubectl --kubeconfig ${WORKDIR}/kubeconfig --context kubefed get --raw=/healthz &> /dev/null" 60
 
 # Generate YAML templates to enable resource propagation for helm chart.
 echo -n > ${CHART_FEDERATED_PROPAGATION_DIR}/templates/federatedtypeconfig.yaml
@@ -104,3 +104,4 @@ done
 kill %1 # etcd
 kill %2 # kube-apiserver
 rm -fr ${WORKDIR}
+echo "Helm chart synced successfully"