From 4742dcd356e85772bb7e349b2df1c8976de10125 Mon Sep 17 00:00:00 2001 From: Tomasz Arendt Date: Thu, 14 Jan 2021 13:49:46 +0100 Subject: [PATCH 1/2] Upgrade Vault to lastest version --- .../files/download-requirements/centos-7/requirements.txt | 8 ++++---- .../files/download-requirements/redhat-7/requirements.txt | 8 ++++---- .../download-requirements/ubuntu-18.04/requirements.txt | 8 ++++---- .../playbooks/roles/vault/files/vault/configure-vault.sh | 4 ++-- .../data/common/defaults/configuration/image-registry.yml | 8 ++++---- .../epicli/data/common/defaults/configuration/vault.yml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt index 9b97c5a4b3..fa78809fe5 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt @@ -155,9 +155,9 @@ https://github.com/prometheus/prometheus/releases/download/v2.10.0/prometheus-2. https://github.com/prometheus/alertmanager/releases/download/v0.17.0/alertmanager-0.17.0.linux-amd64.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.5.8/apache-zookeeper-3.5.8-bin.tar.gz https://archive.apache.org/dist/ignite/2.9.1/apache-ignite-2.9.1-bin.zip -https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_linux_amd64.zip +https://releases.hashicorp.com/vault/1.6.1/vault_1.6.1_linux_amd64.zip https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz -https://github.com/hashicorp/vault-helm/archive/v0.4.0.tar.gz +https://github.com/hashicorp/vault-helm/archive/v0.9.0.tar.gz https://github.com/wrouesnel/postgres_exporter/releases/download/v0.8.0/postgres_exporter_v0.8.0_linux-amd64.tar.gz https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz @@ -167,8 +167,8 @@ haproxy:2.2.2-alpine kubernetesui/dashboard:v2.0.3 kubernetesui/metrics-scraper:v1.0.4 registry:2 -hashicorp/vault-k8s:0.2.0 -vault:1.3.2 +hashicorp/vault-k8s:0.7.0 +vault:1.6.1 # applications apacheignite/ignite:2.5.0 bitnami/pgpool:4.1.1-debian-10-r29 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt index fa79911130..e7e248a05a 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt @@ -152,9 +152,9 @@ https://github.com/prometheus/prometheus/releases/download/v2.10.0/prometheus-2. https://github.com/prometheus/alertmanager/releases/download/v0.17.0/alertmanager-0.17.0.linux-amd64.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.5.8/apache-zookeeper-3.5.8-bin.tar.gz https://archive.apache.org/dist/ignite/2.9.1/apache-ignite-2.9.1-bin.zip -https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_linux_amd64.zip +https://releases.hashicorp.com/vault/1.6.1/vault_1.6.1_linux_amd64.zip https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz -https://github.com/hashicorp/vault-helm/archive/v0.4.0.tar.gz +https://github.com/hashicorp/vault-helm/archive/v0.9.0.tar.gz https://github.com/wrouesnel/postgres_exporter/releases/download/v0.8.0/postgres_exporter_v0.8.0_linux-amd64.tar.gz https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz @@ -164,8 +164,8 @@ haproxy:2.2.2-alpine kubernetesui/dashboard:v2.0.3 kubernetesui/metrics-scraper:v1.0.4 registry:2 -hashicorp/vault-k8s:0.2.0 -vault:1.3.2 +hashicorp/vault-k8s:0.7.0 +vault:1.6.1 # applications apacheignite/ignite:2.5.0 bitnami/pgpool:4.1.1-debian-10-r29 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt index 991b86a0bb..683397bf2e 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt @@ -200,9 +200,9 @@ https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy https://github.com/prometheus/node_exporter/releases/download/v1.0.1/node_exporter-1.0.1.linux-amd64.tar.gz https://github.com/prometheus/prometheus/releases/download/v2.10.0/prometheus-2.10.0.linux-amd64.tar.gz https://archive.apache.org/dist/ignite/2.9.1/apache-ignite-2.9.1-bin.zip -https://releases.hashicorp.com/vault/1.4.0/vault_1.4.0_linux_amd64.zip +https://releases.hashicorp.com/vault/1.6.1/vault_1.6.1_linux_amd64.zip https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz -https://github.com/hashicorp/vault-helm/archive/v0.4.0.tar.gz +https://github.com/hashicorp/vault-helm/archive/v0.9.0.tar.gz https://github.com/wrouesnel/postgres_exporter/releases/download/v0.8.0/postgres_exporter_v0.8.0_linux-amd64.tar.gz https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz @@ -212,8 +212,8 @@ haproxy:2.2.2-alpine kubernetesui/dashboard:v2.0.3 kubernetesui/metrics-scraper:v1.0.4 registry:2 -hashicorp/vault-k8s:0.2.0 -vault:1.3.2 +hashicorp/vault-k8s:0.7.0 +vault:1.6.1 # applications apacheignite/ignite:2.5.0 bitnami/pgpool:4.1.1-debian-10-r29 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/vault/files/vault/configure-vault.sh b/core/src/epicli/data/common/ansible/playbooks/roles/vault/files/vault/configure-vault.sh index cbec3767a2..d57398e7fc 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/vault/files/vault/configure-vault.sh +++ b/core/src/epicli/data/common/ansible/playbooks/roles/vault/files/vault/configure-vault.sh @@ -217,9 +217,9 @@ function configure_kubernetes { elif [ "${command_result[1]}" = "1" ] ; then log_and_print "Installing Vault Agent Helm Chart..."; if [ "$helm_custom_values_set_bool" = "true" ] ; then - helm upgrade --install --wait -f /tmp/vault_helm_chart_values.yaml vault /tmp/v0.4.0.tar.gz --namespace vault + helm upgrade --install --wait -f /tmp/vault_helm_chart_values.yaml vault /tmp/v0.9.0.tar.gz --namespace vault else - helm upgrade --install --wait vault /tmp/v0.4.0.tar.gz --namespace vault + helm upgrade --install --wait vault /tmp/v0.9.0.tar.gz --namespace vault fi check_status $? "Vault Agent Helm Chart installed." "There was an error during installation of Vault Agent Helm Chart."; fi diff --git a/core/src/epicli/data/common/defaults/configuration/image-registry.yml b/core/src/epicli/data/common/defaults/configuration/image-registry.yml index d97d038d68..def21f0be4 100644 --- a/core/src/epicli/data/common/defaults/configuration/image-registry.yml +++ b/core/src/epicli/data/common/defaults/configuration/image-registry.yml @@ -18,10 +18,10 @@ specification: file_name: dashboard-v2.0.3.tar - name: "kubernetesui/metrics-scraper:v1.0.4" file_name: metrics-scraper-v1.0.4.tar - - name: "vault:1.3.2" - file_name: vault-1.3.2.tar - - name: "hashicorp/vault-k8s:0.2.0" - file_name: vault-k8s-0.2.0.tar + - name: "vault:1.6.1" + file_name: vault-1.6.1.tar + - name: "hashicorp/vault-k8s:0.7.0" + file_name: vault-k8s-0.7.0.tar - name: "istio/proxyv2:1.8.1" file_name: proxyv2-1.8.1.tar - name: "istio/pilot:1.8.1" diff --git a/core/src/epicli/data/common/defaults/configuration/vault.yml b/core/src/epicli/data/common/defaults/configuration/vault.yml index 6c0c5a2e3a..9762b0e5d5 100644 --- a/core/src/epicli/data/common/defaults/configuration/vault.yml +++ b/core/src/epicli/data/common/defaults/configuration/vault.yml @@ -36,8 +36,8 @@ specification: - name: provisioner policy: provisioner files: - vault_package_file_name: vault_1.4.0_linux_amd64.zip - vault_helm_chart_file_name: v0.4.0.tar.gz + vault_package_file_name: vault_1.6.1_linux_amd64.zip + vault_helm_chart_file_name: v0.9.0.tar.gz vault_helm_chart_values: injector: image: From 4bff6e9986003942c2afbfc46c825c0a3dc3d0f7 Mon Sep 17 00:00:00 2001 From: Tomasz Arendt Date: Mon, 18 Jan 2021 18:10:46 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG-0.10.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-0.10.md b/CHANGELOG-0.10.md index 93b0a3b1bf..127e2fd4c5 100644 --- a/CHANGELOG-0.10.md +++ b/CHANGELOG-0.10.md @@ -15,6 +15,7 @@ - [#1953](https://github.com/epiphany-platform/epiphany/issues/1953) - Replace Pipenv with Poetry - [#1862](https://github.com/epiphany-platform/epiphany/issues/1862) - Upgrade Ignite (2.9.1) - [#1952](https://github.com/epiphany-platform/epiphany/issues/1952) - Upgrade ansible to 2.10.x +- [#1864](https://github.com/epiphany-platform/epiphany/issues/1864) - Upgrade Hashicorp Vault (1.6.1), Vault Helm Chart (0.9.0), Vault-k8s (0.7.0) ### Breaking changes