From 3a4ce452b8f989641a25ec7b539a704168f51858 Mon Sep 17 00:00:00 2001
From: Balazs Szekeres <balazs.szekeres@nokia.com>
Date: Tue, 22 Oct 2019 11:04:33 +0200
Subject: [PATCH] Update Helm to version 2.15.0

Change-Id: Ibec72a1c6541421f454d3a9e290d44333324e5a6
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>
---
 SPECS/caas-helm.spec                              | 4 ++--
 ansible/playbooks/chart_repo.yaml                 | 2 +-
 ansible/roles/chart_repo/meta/main.yml            | 2 +-
 ansible/roles/chart_repo/tasks/main.yaml          | 6 +++---
 ansible/roles/chart_repo/templates/chart-repo.yml | 4 ++--
 docker-build/helm-builder/Dockerfile              | 7 +++----
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index 6cd384f..fa5c15a 100644
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 2.14.3
-%define RPM_MINOR_VERSION 5
+%define RPM_MAJOR_VERSION 2.15.0
+%define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define go_version 1.12.10
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
diff --git a/ansible/playbooks/chart_repo.yaml b/ansible/playbooks/chart_repo.yaml
index f3deaa0..14c6786 100644
--- a/ansible/playbooks/chart_repo.yaml
+++ b/ansible/playbooks/chart_repo.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # cmframework.requires: image_push.yaml
-- hosts: installation_controller:&caas_master
+- hosts: caas_master
   strategy: free
   become: true
   become_user: "{{ users.admin_user_name }}"
diff --git a/ansible/roles/chart_repo/meta/main.yml b/ansible/roles/chart_repo/meta/main.yml
index 7c77703..4679fa5 100644
--- a/ansible/roles/chart_repo/meta/main.yml
+++ b/ansible/roles/chart_repo/meta/main.yml
@@ -31,7 +31,7 @@ dependencies:
     become_user: "root"
 
   - role: cert
-    instance: "chart-repo{{ nodeindex }}"
+    instance: "chart-repo"
     cert_path: /etc/chart-repo/ssl
     common_name: "chart-repo"
     add_users:
diff --git a/ansible/roles/chart_repo/tasks/main.yaml b/ansible/roles/chart_repo/tasks/main.yaml
index 1e15df8..852328d 100644
--- a/ansible/roles/chart_repo/tasks/main.yaml
+++ b/ansible/roles/chart_repo/tasks/main.yaml
@@ -24,14 +24,14 @@
     dest: "{{ caas.manifests_directory }}/chart-repo_service.yml"
 
 - name: Authenticate into swift
-  shell: 'curl -XGET -i -H"X-Auth-User:{{ caas.swift_credential.tenant }}:{{ caas.swift_credential.user }}" -H"X-Auth-Key:{{ caas.swift_credential.password }}" {{ caas.swift }}/auth/v1.0 | grep X-Auth-Token: | awk "{ print \$2 }"'
+  shell: 'curl -ifs -XGET -H"X-Auth-User:{{ caas.swift_credential.tenant }}:{{ caas.swift_credential.user }}" -H"X-Auth-Key:{{ caas.swift_credential.password }}" {{ caas.swift }}/auth/v1.0 | grep X-Auth-Token: | awk "{ print \$2 }"'
   register: SWIFT_AUTH_KEY
 
 - name: Create packages folder/container into swift
-  shell: 'curl -XPUT -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin/packages'
+  shell: 'curl -fs -XPUT -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin/packages'
 
 - name: Read the swift main folder/container and check if is there the packages folder/conatiner
-  shell: 'curl -XGET -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin | grep packages'
+  shell: 'curl -fs -XGET -H"X-Auth-Token: {{ SWIFT_AUTH_KEY.stdout }}" {{ caas.swift }}/v1.0/AUTH_admin | grep packages'
 
 - name: start chart repo handler
   kubectl:
diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index 580adb2..9a111a7 100644
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -63,9 +63,9 @@ spec:
             - name: CHARTREPOHANDLER_INDEXPATH
               value: charts
             - name: CHARTREPOHANDLER_TLSCERTPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}.pem
+              value: /etc/chart-repo/ssl/chart-repo.pem
             - name: CHARTREPOHANDLER_TLSKEYPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}-key.pem
+              value: /etc/chart-repo/ssl/chart-repo-key.pem
             - name: CHARTREPOHANDLER_TLSCAPATH
               value: /etc/chart-repo/ssl/ca.pem
           volumeMounts:
diff --git a/docker-build/helm-builder/Dockerfile b/docker-build/helm-builder/Dockerfile
index 23b41d8..93a4ef6 100644
--- a/docker-build/helm-builder/Dockerfile
+++ b/docker-build/helm-builder/Dockerfile
@@ -35,10 +35,9 @@ RUN yum install -y --setopt=skip_missing_names_on_install=False \
 &&  curl -fsSL -k https://dl.google.com/go/go${go_version}.linux-${HOST_ARCH}.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
 \
 # Build Helm
-&&  mkdir -p $GOPATH/src/k8s.io \
-&&  cd $GOPATH/src/k8s.io \
-&&  git clone https://github.com/kubernetes/helm.git \
-&&  cd helm \
+&&  mkdir -p $GOPATH/src/k8s.io/helm \
+&&  curl -fsSL -k https://github.com/helm/helm/archive/v${HELM_VERSION}.tar.gz | tar zx --strip-components=1 -C $GOPATH/src/k8s.io/helm \
+&&  cd $GOPATH/src/k8s.io/helm \
 &&  make GIT_TAG=v${HELM_VERSION} bootstrap build-cross \
 &&  mkdir -p ${binaries} \
 &&  mv ./_dist/linux-${HOST_ARCH}/tiller ${binaries}/ \
-- 
2.16.6