From 7e7dc8c5d7e38335a1b3e62ab1836dadd1bbcee3 Mon Sep 17 00:00:00 2001
From: kmlTE <tokmakovkamil@gmail.com>
Date: Thu, 11 Mar 2021 14:52:39 +0100
Subject: [PATCH] fix remote kube cluster access

---
 kubernetes/main.yaml                       | 7 +++++++
 kubernetes/playbooks/create_from_helm.yaml | 6 ++++--
 kubernetes/playbooks/delete_from_helm.yaml | 5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/kubernetes/main.yaml b/kubernetes/main.yaml
index 0d3434a..bef04d1 100644
--- a/kubernetes/main.yaml
+++ b/kubernetes/main.yaml
@@ -20,6 +20,11 @@ node_types:
         type: string
         default: ~/.kube/config
         description: Path to kubeconfig file
+      username:
+        type: string
+        default: centos
+        required: false
+        description: User for remote cluster access
 
   sodalite.nodes.Kubernetes.Definition:
     derived_from: tosca.nodes.SoftwareComponent
@@ -74,6 +79,7 @@ node_types:
         operations:
           create:
             inputs:
+              ansible_user: { type: string, default: { get_property: [ SELF, host, username ] } }
               kubeconfig: { type: string, default: { get_property: [ SELF, host, kubeconfig ] } }
               helm_name: { type: string, default: { get_property: [ SELF, name ] } }
               helm_namespace: { type: string, default: { get_property: [ SELF, namespace ] } }
@@ -87,6 +93,7 @@ node_types:
               primary: playbooks/create_from_helm.yaml
           delete:
             inputs:
+              ansible_user: { type: string, default: { get_property: [ SELF, host, username ] } }
               kubeconfig: { type: string, default: { get_property: [ SELF, host, kubeconfig ] } }
               helm_name: { type: string, default: { get_property: [ SELF, name ] } }
               helm_namespace: { type: string, default: { get_property: [ SELF, namespace ] } }
diff --git a/kubernetes/playbooks/create_from_helm.yaml b/kubernetes/playbooks/create_from_helm.yaml
index 60e8656..71b5b84 100644
--- a/kubernetes/playbooks/create_from_helm.yaml
+++ b/kubernetes/playbooks/create_from_helm.yaml
@@ -5,6 +5,7 @@
     chart_from_git: "{{ helm_repo_url[-4:] == '.git' }}"
     defined_helm_repo: "{{ helm_repo_url != '' and helm_repo_name != '' }}"
     actual_helm_chart: "{{ tmp_helm_repo + '/' + helm_chart if chart_from_git else helm_chart }}"
+    ansible_python_interpreter: "/usr/bin/env python3"
   tasks:
 
     - name: Check if helm is installed
@@ -37,10 +38,11 @@
     - name: Install chart
       community.kubernetes.helm:
         state: present
-        kubeconfig: "{{ kubeconfig }}"
         name: "{{ helm_name }}"
         namespace: "{{ helm_namespace }}"
         chart_ref: "{{ actual_helm_chart }}"
         chart_version: "{{ helm_chart_version if helm_chart_version is defined and helm_chart_version != 'latest' }}"
         values_files: "{{ helm_values_files }}"
-        values: "{{ helm_values }}"
\ No newline at end of file
+        values: "{{ helm_values }}"
+      environment:
+        K8S_AUTH_KUBECONFIG: "{{ kubeconfig }}"
\ No newline at end of file
diff --git a/kubernetes/playbooks/delete_from_helm.yaml b/kubernetes/playbooks/delete_from_helm.yaml
index 4c79e8f..086020b 100644
--- a/kubernetes/playbooks/delete_from_helm.yaml
+++ b/kubernetes/playbooks/delete_from_helm.yaml
@@ -5,6 +5,7 @@
     chart_from_git: "{{ helm_repo_url[-4:] == '.git' }}"
     defined_helm_repo: "{{ helm_repo_url != '' and helm_repo_name != '' }}"
     actual_helm_chart: "{{ tmp_helm_repo + '/' + helm_chart if chart_from_git else helm_chart }}"
+    ansible_python_interpreter: "/usr/bin/env python3"
   tasks:
 
     - name: Check if helm is installed
@@ -21,11 +22,13 @@
         msg: Helm must be installed
       when: not helm_exists
 
-    - name: Remove stable/mysql chart
+    - name: Remove chart
       community.kubernetes.helm:
         state: absent
         name: "{{ helm_name }}"
         namespace: "{{ helm_namespace }}"
+      environment:
+        K8S_AUTH_KUBECONFIG: "{{ kubeconfig }}"
 
     - name: Remove repo
       block: