Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Midburn/midburn-k8s
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.4
Choose a base ref
...
head repository: Midburn/midburn-k8s
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 2,756 additions and 369 deletions.
  1. +1 −0 .helmignore
  2. +44 −38 .travis.yml
  3. +198 −175 README.md
  4. +2 −3 charts-external/bi/README.md
  5. +14 −14 charts-external/bi/templates/metabase.yaml
  6. +1 −0 charts-external/camps-index/Chart.yaml
  7. +8 −0 charts-external/camps-index/README.md
  8. +70 −0 charts-external/camps-index/templates/camps-index.yaml
  9. +1 −0 charts-external/chatops/Chart.yaml
  10. +10 −0 charts-external/chatops/README.md
  11. +42 −0 charts-external/chatops/templates/chatops.yaml
  12. +121 −0 charts-external/communities/README.md
  13. +1 −0 charts-external/communities/chart.yaml
  14. +50 −0 charts-external/communities/templates/communities-configmap.yaml
  15. +100 −0 charts-external/communities/templates/communities.yaml
  16. +73 −0 charts-external/communities/templates/communitiesdb.yaml
  17. +1 −0 charts-external/dreams/Chart.yaml
  18. +31 −0 charts-external/dreams/README.md
  19. +14 −0 charts-external/dreams/templates/dreams-autoscaler.yaml
  20. +99 −0 charts-external/dreams/templates/dreams.yaml
  21. +64 −0 charts-external/dreams/templates/dreamsdb-backup-job.yaml
  22. +92 −0 charts-external/dreams/templates/dreamsdb.yaml
  23. +1 −0 charts-external/loomio/Chart.yaml
  24. +20 −0 charts-external/loomio/README.md
  25. +100 −0 charts-external/loomio/templates/configmap.yaml
  26. +36 −0 charts-external/loomio/templates/db-deployment.yaml
  27. +10 −0 charts-external/loomio/templates/db-service.yaml
  28. +75 −0 charts-external/loomio/templates/deployment.yaml
  29. +24 −0 charts-external/loomio/templates/mailin-deployment.yaml
  30. +16 −0 charts-external/loomio/templates/mailin-service.yaml
  31. +10 −0 charts-external/loomio/templates/service.yaml
  32. +41 −13 charts-external/spark/README.md
  33. +74 −0 charts-external/spark/recreate_db.sh
  34. +14 −0 charts-external/spark/templates/spark-autoscaler.yaml
  35. +9 −0 charts-external/spark/templates/spark-configmap.yaml
  36. +2 −2 charts-external/spark/templates/spark-drupal-sync.yaml
  37. +16 −11 charts-external/spark/templates/spark.yaml
  38. +3 −1 charts-external/spark/templates/sparkdb-backup-job.yaml
  39. +13 −4 charts-external/spark/templates/sparkdb.yaml
  40. +7 −0 charts-external/spark/testing-environment-template/.env
  41. +43 −0 charts-external/spark/testing-environment-template/values.yaml
  42. +1 −0 charts-external/tickets-sync/Chart.yaml
  43. +7 −0 charts-external/tickets-sync/Dockerfile
  44. +73 −0 charts-external/tickets-sync/entrypoint.py
  45. +25 −0 charts-external/tickets-sync/templates/deployment.yaml
  46. +1 −3 charts-external/volunteers/templates/mongo-express.yaml
  47. +2 −2 charts-external/volunteers/templates/volunteers.yaml
  48. +2 −0 charts-external/volunteers/templates/volunteersdb-backup-job.yaml
  49. +17 −2 charts-external/volunteers/templates/volunteersdb.yaml
  50. +29 −15 connect.sh
  51. +7 −0 environments/loomio/.env
  52. +7 −0 environments/loomio/values.yaml
  53. +7 −0 environments/minikube/.env
  54. +32 −0 environments/minikube/values.yaml
  55. +13 −6 environments/ori/values.yaml
  56. +19 −0 environments/production/dreamsdb_persistent_storage_migration.sh
  57. +12 −0 environments/production/metabase_persistent_storage_migration.sh
  58. +34 −0 environments/production/sparkdb_persistent_storage_migration.sh
  59. +10 −2 environments/production/values.auto-updated.yaml
  60. +72 −17 environments/production/values.yaml
  61. +34 −0 environments/production/volunteersdb_persistent_storage_migration.sh
  62. +7 −0 environments/sparktesting/.env
  63. +43 −0 environments/sparktesting/values.yaml
  64. +2 −1 environments/staging/README.md
  65. +19 −0 environments/staging/dreamsdb_persistent_storage_migration.sh
  66. +34 −0 environments/staging/sparkdb_persistent_storage_migration.sh
  67. +10 −2 environments/staging/values.auto-updated.yaml
  68. +72 −14 environments/staging/values.yaml
  69. +17 −0 environments/staging/volunteersdb_persistent_storage_migration.sh
  70. +245 −0 get_helm.sh
  71. +74 −0 helm_healthcheck.sh
  72. +20 −0 helm_remove_all.sh
  73. +6 −1 helm_upgrade.sh
  74. +18 −0 helm_upgrade_all.sh
  75. +6 −2 helm_upgrade_external_chart.sh
  76. +23 −0 read_env_yaml.sh
  77. +2 −0 read_yaml.py
  78. +44 −0 run_docker_ops.sh
  79. +0 −2 switch_environment.sh
  80. +1 −13 templates/adminer.yaml
  81. +6 −0 templates/nginx-conf.yaml
  82. +0 −2 templates/nginx.yaml
  83. +0 −2 templates/ops.yaml
  84. +73 −0 templates/traefik-etc.yaml
  85. +21 −20 templates/traefik.yaml
  86. +58 −2 values.yaml
1 change: 1 addition & 0 deletions .helmignore
Original file line number Diff line number Diff line change
@@ -2,3 +2,4 @@
*.sh
*.py
secret-*
.*
82 changes: 44 additions & 38 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,43 +2,49 @@ language: bash
sudo: required
env:
matrix:
- DEPLOY_ENVIRONMENT=staging DEPLOY_BRANCH=master
- DEPLOY_ENVIRONMENT=production DEPLOY_TAGS=true
# - DEPLOY_ENVIRONMENT=ori DEPLOY_BRANCH=midburn-profiles-aka-drupal-infra
- DEPLOY_ENVIRONMENT=staging DEPLOY_BRANCH=master
- DEPLOY_ENVIRONMENT=production DEPLOY_TAGS=true
services:
- docker
- docker
script:
- |
if [ "${DEPLOY_ENVIRONMENT}" != "" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ] &&\
( \
([ "${TRAVIS_BRANCH}" == "${DEPLOY_BRANCH}" ] && ! echo "${TRAVIS_COMMIT_MESSAGE}" | grep -- --no-deploy) ||\
([ "${DEPLOY_TAGS}" == "true" ] && [ "${TRAVIS_TAG}" != "" ]) \
)
then
openssl aes-256-cbc -K $encrypted_de69cc520442_key -iv $encrypted_de69cc520442_iv -in ./k8s-ops-secret.json.enc -out secret-k8s-ops.json -d
K8S_ENVIRONMENT_NAME="${DEPLOY_ENVIRONMENT}"
OPS_REPO_SLUG="Midburn/midburn-k8s"
OPS_REPO_BRANCH="${DEPLOY_BRANCH}"
wget https://raw.githubusercontent.com/OriHoch/sk8s-ops/master/run_docker_ops.sh
chmod +x run_docker_ops.sh
if ./run_docker_ops.sh "${K8S_ENVIRONMENT_NAME}" "
RES=0;
! ./helm_upgrade.sh && echo 'failed helm upgrade' && RES=1;
! ./helm_upgrade_external_chart.sh spark && echo 'failed spark upgrade' && RES=1;
! ./helm_upgrade_external_chart.sh volunteers && echo 'failed volunteers upgrade' && RES=1;
! ./helm_upgrade_external_chart.sh bi && echo 'failed bi upgrade' && RES=1;
! ./helm_upgrade_external_chart.sh profiles && echo 'failed profiles upgrade' && RES=1;
sleep 2;
kubectl get pods --all-namespaces;
kubectl get service --all-namespaces;
exit "'$'"RES
" "orihoch/sk8s-ops" "${OPS_REPO_SLUG}" "${OPS_REPO_BRANCH}"; then
true
else
echo "failed to run docker ops"
false
fi
else
echo "skipping deployment"
true
fi
- |
if [ "${DEPLOY_ENVIRONMENT}" != "" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ] &&\
( \
([ "${TRAVIS_BRANCH}" == "${DEPLOY_BRANCH}" ] && ! echo "${TRAVIS_COMMIT_MESSAGE}" | grep -- --no-deploy) ||\
([ "${DEPLOY_TAGS}" == "true" ] && [ "${TRAVIS_TAG}" != "" ]) \
)
then
openssl aes-256-cbc -K $encrypted_de69cc520442_key -iv $encrypted_de69cc520442_iv -in ./k8s-ops-secret.json.enc -out secret-k8s-ops.json -d
K8S_ENVIRONMENT_NAME="${DEPLOY_ENVIRONMENT}"
OPS_REPO_SLUG="Midburn/midburn-k8s"
OPS_REPO_BRANCH="${DEPLOY_BRANCH}"
cat secret-k8s-ops.json | docker login -u _json_key --password-stdin https://gcr.io
wget https://raw.githubusercontent.com/Midburn/midburn-k8s/master/run_docker_ops.sh
chmod +x run_docker_ops.sh
if ./run_docker_ops.sh "${K8S_ENVIRONMENT_NAME}" "
RES=0;
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get > get_helm.sh &&\
chmod 700 get_helm.sh &&\
./get_helm.sh --version v2.8.2;
if ./helm_upgrade_all.sh --install --dry-run --debug; then
echo Dry run was successfull, performing upgrades
! ./helm_upgrade_all.sh --install && echo Failed upgrade && RES=1
! ./helm_healthcheck.sh && echo Failed healthcheck && RES=1
else
echo Failed dry run
RES=1
fi
sleep 2;
kubectl get pods --all-namespaces;
kubectl get service --all-namespaces;
exit "'$'"RES
" "gcr.io/midbarrn/sk8s-ops" "${OPS_REPO_SLUG}" "${OPS_REPO_BRANCH}"; then
true
else
echo "failed to run docker ops"
false
fi
else
echo "skipping deployment"
true
fi
Loading