Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (2)
ca_cert=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQWFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEU0TVRFd05UQTVNVFV4TVZvWERUSTRNVEV3TWpBNU1UVXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUowL2JmOUFZbDZ1CnhIbmNQZEk4ejlSRGQ4N2srYnIvU0lwSEdKYnQyS0FLbjBnWUZxdnRPRk83Vk1SamlwblhFMXBHSmJicXVPMi8KcFVLekdsY3R2REV2QnVWa3VLSlZZUXF5Z0NZdXFWN01xVHpqOXZFZ2JNdHh5OStlL3NtcjB3bEdxa3hpWTdiVQp5aEpiSEpSeVFoMFFTdkhyam01K3ZHQVRqRU1yNmZZVjQwYlg4VjUrWG5sNko5R0xBVjdtOTRXalpjVUxVY0hoCjFhYjFhSFpMN3lCa3ppcFU0a20vamw0dDVzZDNiYlk0SENtbVo1WGdCcFBoNUlDL0hPTVlYd0U0VGNWb0VsWHYKdTZJR3RIa1ZJZ2xvcjUwTEZ6ZW5XeTE0eEJVRjFlemk0SmE5QVQzNFRGaWQrNXBSa25TSHJvYVFUbFcvZDFtUgpTN2JwSjBUSlFtRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ1pUdzVlbzZvQVcxMlhmL1cyeEcrZFZ5dWpnZUZGUjNxSG4KSVMzUElzT29DbWk3Sk1vYmRCekdxUTNjdVYrN0JETEJHMzVlR0JSMFFyMGcycjc3cWhGRmF1SlZ5MnZyZG5WSQplQ3gzaDFIRy9vK0JKckJxV3d5YmVCcGNHb1VUWDNhOWFOd0JKZDlQK3h2aUFySml1TGlHcHgybW85VFRPUHZNCmxzR3o3SG5QSG1aTkNoTExwWXd3ZndUbyt0TlhhZ25FeWw3aWowcVVLSXZXSFdlbDhGLytWeEFVdHRsZGhIZngKS1ErMVhnMU1ic2hZWC9zeERXTTZ4L1V0VUIrc3ZETXhOaDN0UHNtazFha0NMbi9hTkxOVjJvRHhOV0FtZ2kvdwp5TUtCK2pJcTdIb3lYOHhwRVRuVDRIWG1CRjRxQVY3L00rVm52U0ZrSHExNXkwSUhveDA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K ca_cert=LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQWFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEU0TVRFd05UQTVNVFV4TVZvWERUSTRNVEV3TWpBNU1UVXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUowL2JmOUFZbDZ1CnhIbmNQZEk4ejlSRGQ4N2srYnIvU0lwSEdKYnQyS0FLbjBnWUZxdnRPRk83Vk1SamlwblhFMXBHSmJicXVPMi8KcFVLekdsY3R2REV2QnVWa3VLSlZZUXF5Z0NZdXFWN01xVHpqOXZFZ2JNdHh5OStlL3NtcjB3bEdxa3hpWTdiVQp5aEpiSEpSeVFoMFFTdkhyam01K3ZHQVRqRU1yNmZZVjQwYlg4VjUrWG5sNko5R0xBVjdtOTRXalpjVUxVY0hoCjFhYjFhSFpMN3lCa3ppcFU0a20vamw0dDVzZDNiYlk0SENtbVo1WGdCcFBoNUlDL0hPTVlYd0U0VGNWb0VsWHYKdTZJR3RIa1ZJZ2xvcjUwTEZ6ZW5XeTE0eEJVRjFlemk0SmE5QVQzNFRGaWQrNXBSa25TSHJvYVFUbFcvZDFtUgpTN2JwSjBUSlFtRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ1pUdzVlbzZvQVcxMlhmL1cyeEcrZFZ5dWpnZUZGUjNxSG4KSVMzUElzT29DbWk3Sk1vYmRCekdxUTNjdVYrN0JETEJHMzVlR0JSMFFyMGcycjc3cWhGRmF1SlZ5MnZyZG5WSQplQ3gzaDFIRy9vK0JKckJxV3d5YmVCcGNHb1VUWDNhOWFOd0JKZDlQK3h2aUFySml1TGlHcHgybW85VFRPUHZNCmxzR3o3SG5QSG1aTkNoTExwWXd3ZndUbyt0TlhhZ25FeWw3aWowcVVLSXZXSFdlbDhGLytWeEFVdHRsZGhIZngKS1ErMVhnMU1ic2hZWC9zeERXTTZ4L1V0VUIrc3ZETXhOaDN0UHNtazFha0NMbi9hTkxOVjJvRHhOV0FtZ2kvdwp5TUtCK2pJcTdIb3lYOHhwRVRuVDRIWG1CRjRxQVY3L00rVm52U0ZrSHExNXkwSUhveDA9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
token=ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklpSjkuZXlKcGMzTWlPaUpyZFdKbGNtNWxkR1Z6TDNObGNuWnBZMlZoWTJOdmRXNTBJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5dVlXMWxjM0JoWTJVaU9pSjBaWE4wSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXpaV055WlhRdWJtRnRaU0k2SW5SbGMzUXRkRzlyWlc0dGMybzJlR2NpTENKcmRXSmxjbTVsZEdWekxtbHZMM05sY25acFkyVmhZMk52ZFc1MEwzTmxjblpwWTJVdFlXTmpiM1Z1ZEM1dVlXMWxJam9pZEdWemRDSXNJbXQxWW1WeWJtVjBaWE11YVc4dmMyVnlkbWxqWldGalkyOTFiblF2YzJWeWRtbGpaUzFoWTJOdmRXNTBMblZwWkNJNklqY3lZVEkyTW1Oa0xXVXdabVV0TVRGbE9DMWlaREZsTFRBd1l6QmtaREZoWldKa01DSXNJbk4xWWlJNkluTjVjM1JsYlRwelpYSjJhV05sWVdOamIzVnVkRHAwWlhOME9uUmxjM1FpZlEuYXg3U1JTZnk5VGtTeUFaMmFRYWl1Y3FKZkwyTzZyZGdJc2d3Q0lBb1JlX2VQakNNMjRydld6SkdULU8yLU1hcHpRTGJ3UjhaVEZTa211RG1BcDhBZFhpYlBocjB4RXFkTnBkREhraTlkVTg5djdnT09wQklEaTVsWHlNRlNmbFBFOVU3QWZ3TFduMU5wS0VVbjkzZlhGRHRobjd3T3JXcEoxYzE4WS1ubnR2MTduMEk5c25qZmZVMXNPME1rdm9TTHEzZ3lZcHotb0hic1MzVGFGMDlBLU05WDBPVWJ6ZXdKMjBFcFhRbUJvOXUycEY4dDFoc2lQcE92UGFQNWF6dHp2c3ZDVld2QktjRzB0RUoweklUWTA2WU5KSWFmb2dXUV9RbjlsVmxqTzk5c245ZnktS2xMVkdVdGdSS1g5aTlSNlZWMGRXSWx4SS1lMl9NTzVIendR token=ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklpSjkuZXlKcGMzTWlPaUpyZFdKbGNtNWxkR1Z6TDNObGNuWnBZMlZoWTJOdmRXNTBJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5dVlXMWxjM0JoWTJVaU9pSjBaWE4wSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXpaV055WlhRdWJtRnRaU0k2SW5SbGMzUXRkRzlyWlc0dE5ISnNjbUlpTENKcmRXSmxjbTVsZEdWekxtbHZMM05sY25acFkyVmhZMk52ZFc1MEwzTmxjblpwWTJVdFlXTmpiM1Z1ZEM1dVlXMWxJam9pZEdWemRDSXNJbXQxWW1WeWJtVjBaWE11YVc4dmMyVnlkbWxqWldGalkyOTFiblF2YzJWeWRtbGpaUzFoWTJOdmRXNTBMblZwWkNJNklqbGpaR0l3WVdZM0xUVXdPV1V0TVRGbE9TMWlNRFl4TFRBd1l6QmtaREZoWldKa01DSXNJbk4xWWlJNkluTjVjM1JsYlRwelpYSjJhV05sWVdOamIzVnVkRHAwWlhOME9uUmxjM1FpZlEuZmlJNzJTM2tuRXBNQVkxQzJFTXQ3T1pIV2FlbU5yN2xNYzZuVmZvWjAyQ0NnWWZoNEN5OHMwek43bFY1dXYzWVlvY1l2ZmJieW9jcDZPdnFtZEVrb2hhel9ORWt2dS1JV2IwRlY4RjlEcm1sYmZkejVyZkJxVWF0dkZBdG9MM2pjY0NNZ2I2eERoVVJ5WVBTcDJwdEpfZ1J6Ykg3ZWtFNWtvSG1ZRC1uUWxiaUhybHUzZENuZHhscW9iZ0ZxY21GWEFzWjNRTVNvVE4zYXpfUGpkZ2F2R3ZmaW5QaXN3eC1adk9ob1JzU01NT21ha3dhOEtPY3NLcnY3MmlscDJQVVhUX29YN3JyUFdPUkd1V096ekFsRF90cTVuNzFiLUxqMi12R2lKYm9FLS1wS1gzV0FQb29WWnNmX2pNWWN2LU5odTY3TERyWDBiLThicDlVckI0U1Fn
docker_config=foobar docker_config=foobar
\ No newline at end of file
# Changelog # Changelog
## [1.4.6] - 2019-03-27
### Added
* explicitly deleting chart when `PENDING`, `FAILED` or `DELETED` since this blocks
redeploying previous deployments
## [1.4.5] - 2019-03-27 ## [1.4.5] - 2019-03-27
### Added ### Added
* git-binary to docker-image * git-binary to docker-image
...@@ -104,4 +109,5 @@ ...@@ -104,4 +109,5 @@
[1.4.2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.1...release%2F1.4.2 [1.4.2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.1...release%2F1.4.2
[1.4.3]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.2...release%2F1.4.3 [1.4.3]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.2...release%2F1.4.3
[1.4.4]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.3...release%2F1.4.4 [1.4.4]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.3...release%2F1.4.4
[1.4.5]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.4...release%2F1.4.5 [1.4.5]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.4...release%2F1.4.5
\ No newline at end of file [1.4.6]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.5...release%2F1.4.6
\ No newline at end of file
...@@ -328,6 +328,16 @@ helm_deploy() { ...@@ -328,6 +328,16 @@ helm_deploy() {
local out local out
local cmd local cmd
if [ "$(helm ls --tiller-namespace=${namespace} --namespace=${namespace} --pending --deleted --failed --short | grep ${name})" != "" ];then
debug "helm delete --tiller-namespace=${namespace} --purge ${name}"
out=`helm delete --tiller-namespace=${namespace} --purge ${name} 2>&1`
if [ "$?" != "0" ];then
echo "failed"
echo "$out"
return 1
fi
fi
helmargs=$(echo -e "$helmargs" | sed -E 's/(^[[:space:]]*)|([[:space:]]*$)//g') helmargs=$(echo -e "$helmargs" | sed -E 's/(^[[:space:]]*)|([[:space:]]*$)//g')
cmd="helm upgrade --install --wait --timeout=${timeout} --tiller-namespace=${namespace} --namespace=${namespace}" cmd="helm upgrade --install --wait --timeout=${timeout} --tiller-namespace=${namespace} --namespace=${namespace}"
cmd="$cmd --namespace=${namespace} --force --recreate-pods ${name} ${charts} ${helmargs}" cmd="$cmd --namespace=${namespace} --force --recreate-pods ${name} ${charts} ${helmargs}"
......