Merge pull request #794 from scality/improvement/GH-707-upgrade-helm-…

…version Upgrade Helm Version
scality · Mar 21, 2019 · e149cc8 · e149cc8
2 parents 921a25b + a229965
commit e149cc8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -25,11 +25,11 @@ KUBECTL_VERSION = 1.11.3
 KUBECTL_BIN_SHA256SUM.linux = 0d4c70484e90d4310f03f997b4432e0a97a7f5b5be5c31d281f3d05919f8b46c
 KUBECTL_BIN_SHA256SUM.darwin = cf1feeac2fdedfb069131e7d62735b99b49ec43bf0d7565a30379c35056906c4
 
-HELM_VERSION = 2.9.1
-HELM_SRC_SHA256SUM.linux = 56ae2d5d08c68d6e7400d462d6ed10c929effac929fedce18d2636a9b4e166ba
-HELM_SRC_SHA256SUM.darwin = 3bf676b6adbc4bb1a513c22c59f8d183fed278c9cb4db5808473541888f1efcb
-HELM_BIN_SHA256SUM.linux = 9c9b77b0aa9c25debcadd1b538e0f42311e8c2d60a356b256b552642fcd5c6d5
-HELM_BIN_SHA256SUM.darwin = bee3146de8b0cf940e74c9b1e7d3e23a1ffd8f7c4b8aad59c3e5a5152d7b818b
+HELM_VERSION = 2.11.0
+HELM_SRC_SHA256SUM.linux = 02a4751586d6a80f6848b58e7f6bd6c973ffffadc52b4c06652db7def02773a1
+HELM_SRC_SHA256SUM.darwin = 551b13a398749ae3e0a5c54d3078f6e3bee552c5d6a0bf6f338cab64ce38ab0f
+HELM_BIN_SHA256SUM.linux = 147fb24a21d6d69d33f5900d42bea790b658a8168f0a60d364af5b894c8a94e6
+HELM_BIN_SHA256SUM.darwin = ca437d9e78a499d50e433e074681c654d3098558e36964ba4ff37bff2848d1d1
 
 V=@
 

diff --git a/contrib/terraform/openstack/inventory.tf b/contrib/terraform/openstack/inventory.tf
@@ -1,3 +1,7 @@
+provider "template" {
+    "version" = "~>1.0"
+}
+
 locals {
   # etcd_name are formed bt name of all dedicated etcd server and
   # In the case of shared group: a portion of the of the nodes name

diff --git a/eve/images/pep8-checker/Dockerfile b/eve/images/pep8-checker/Dockerfile
@@ -5,9 +5,17 @@
 
 FROM alpine:3.8
 
-RUN apk add --no-cache git python python3 py2-pip py-twisted && \
+RUN apk add --no-cache \
+        gcc \
+        git \
+        musl-dev \
+        python \
+        python2-dev \
+        python3 \
+        py2-pip \
+        && \
     pip install tox && \
-    pip install buildbot-worker
+    pip install buildbot-worker==1.8.0
 
 WORKDIR /usr/src/metalk8s
 ARG USER_ID=1000

diff --git a/roles/helm_install/defaults/main.yml b/roles/helm_install/defaults/main.yml
@@ -2,8 +2,8 @@ debug: False
 install_tiller: True
 
 helm_bin_dir: /usr/local/bin/
-helm_version: v2.9.1
+helm_version: v2.11.0
 
-helm_checksum_v2.9.1: sha256:56ae2d5d08c68d6e7400d462d6ed10c929effac929fedce18d2636a9b4e166ba
+helm_checksum_v2.11.0: sha256:02a4751586d6a80f6848b58e7f6bd6c973ffffadc52b4c06652db7def02773a1
 
 tiller_addon_dir: '{{ kube_config_dir }}/addons/tiller'