diff --git a/Changelog.md b/Changelog.md index d9b966ae99f392818599ab47f13ce793f6e9cce4..538823ab276438dcded1ce53d30cb2108c56679f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## [1.4.1] - 2019-03-13 +### Fixed +* not testing for unused parameters because of reusing existing configs + ## [1.4.0] - 2019-03-13 ### Added * new command `init` to only initialize docker, helm and kubectl @@ -72,3 +76,4 @@ [1.3.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.3.0...release%2F1.3.1 [1.3.2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.3.1...release%2F1.3.2 [1.4.0]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.3.2...release%2F1.4.0 +[1.4.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.0...release%2F1.4.1 \ No newline at end of file diff --git a/assets/deployer b/assets/deployer index c2883e16a28f91eb55ebe796daa72ebc6e0e9db7..d7ffaba7b900044c73efd7560711c13150b5593c 100755 --- a/assets/deployer +++ b/assets/deployer @@ -130,7 +130,21 @@ prepare_kubectl() { local out local args="" - echo -ne "setting kubectl " + if [ "${reset}" == "true" ];then + echo -ne "Removing \".kube\" folder (because \"--reset\" was provided) ..." + out=`rm -rf ${HOME}/.kube/*` + if [ "$?" != "0" ];then + echo "failed" + echo "$out" + return 1 + fi + echo "done" + elif [ -d "${HOME}/.kube" ];then + echo "Folder \".kube\" already exists. If you want to ignore it provide the \"--reset\" parameter. Skipping" + return 0 + fi + + echo -ne "Setting kubectl " if [ "${cluster_url}" == "" ];then echo "failed! No cluster url set." echo "Please be sure to provide a cluster url via --cluster-url" @@ -152,19 +166,6 @@ prepare_kubectl() { echo "Please be sure to provide a service-account via --service-account" fi - if [ "${reset}" == "true" ];then - echo -ne " (removing .kube folder because \"--reset\" was provided)" - out=`rm -rf ${HOME}/.kube/*` - if [ "$?" != "0" ];then - echo "failed" - echo "$out" - return 1 - fi - elif [ -d "${HOME}/.kube" ];then - echo "folder .kube already exists. if you want to ignore it provide the \"--reset\" parameter. skipping" - return 0 - fi - echo "" if [ "${certificate_authority}" != "" ];then @@ -223,21 +224,22 @@ prepare_kubectl() { } prepare_helm() { - echo -ne "Preparing helm..." - if [ "${reset}" == "true" ];then - echo -ne " (removing .helm folder because \"--reset\" was provided) ..." + echo -ne "Removing \".helm\" folder (because \"--reset\" was provided) ..." out=`rm -rf ${HOME}/.helm/*` if [ "$?" != "0" ];then echo "failed" echo "$out" return 1 fi + echo "done" elif [ -d "${HOME}/.helm" ];then - echo "folder .helm already exists. if you want to ignore it provide the \"--reset\" parameter. skipping" + echo "Folder \".helm\" already exists. If you want to ignore it provide the \"--reset\" parameter. Skipping" return 0 fi + echo -ne "Preparing helm..." + out=`helm init --wait --tiller-namespace="${namespace}" --service-account="${service_account}" --upgrade --force-upgrade` if [ "$?" != "0" ];then echo "failed!" @@ -340,26 +342,28 @@ helm_undeploy() { } prepare_image_publisher() { - echo -ne "setting docker auth config ..." - if [ "${dockerconfig}" == "" ];then - echo "failed! No auth config found" - echo "Please be sure to provide the docker config via option --docker-config" - return 1 - fi if [ "${reset}" == "true" ];then - echo -ne " (removing .docker folder because \"--reset\" was provided) ..." + echo -ne "Removing \".docker\" folder (because \"--reset\" was provided) ..." out=`rm -rf ${HOME}/.docker/*` if [ "$?" != "0" ];then echo "failed" echo "$out" return 1 fi + echo "done" elif [ -d "${HOME}/.docker" ];then - echo "folder .docker already exists. if you want to ignore it provide the \"--reset\" parameter. skipping" + echo "Folder \".docker\" already exists. If you want to ignore it provide the \"--reset\" parameter. Skipping" return 0 fi + echo -ne "Setting docker auth config ..." + if [ "${dockerconfig}" == "" ];then + echo "failed! No auth config found" + echo "Please be sure to provide the docker config via option --docker-config" + return 1 + fi + mkdir -p ${HOME}/.docker && echo "${dockerconfig}" >${HOME}/.docker/config.json if [ "$?" != "0" ];then diff --git a/docker-compose.yml b/docker-compose.yml index 145560f461907cca2e1d5497660fa5a32228b410..5653c094330dde50b100db741082108483b3cdf5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: - docker environment: DOCKER_HOST: tcp://docker:2375 - command: deployer init --namespace test --cluster-url https://172.18.85.125:6443 --certificate-authority ${ca_cert} --token ${token} --service-account test --docker-config "${docker_config}" + command: deployer init init-with-existing-and-reset: build: .