From 4b74d6494911af6e120369a397fde640ad7649a7 Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Wed, 2 Mar 2022 13:50:08 +0100
Subject: [PATCH] review: added changes discussed with fgrz

---
 kubernetes.yml                                         |  2 +-
 roles/kubernetes/awx/tasks/awx-config.yml              |  3 ---
 roles/kubernetes/awx/tasks/main.yml                    |  2 ++
 .../awx/templates/awx-create-credential.json.j2        |  4 ++--
 roles/kubernetes/base/tasks/main.yml                   | 10 +++++-----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/kubernetes.yml b/kubernetes.yml
index 684976e..f86f043 100644
--- a/kubernetes.yml
+++ b/kubernetes.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: 'apply kubernetes setup to {{ host | default("all") }}'
-  hosts: '{{ host | default("k8s_cluster") }}'
+  hosts: '{{ host | default("kube_control_plane") }}'
   serial: "{{ serial_number | default(10) }}"
 
   pre_tasks:
diff --git a/roles/kubernetes/awx/tasks/awx-config.yml b/roles/kubernetes/awx/tasks/awx-config.yml
index ef19645..d93585d 100644
--- a/roles/kubernetes/awx/tasks/awx-config.yml
+++ b/roles/kubernetes/awx/tasks/awx-config.yml
@@ -96,7 +96,6 @@
 - name: "Create json object for <Machine> credentials <hetzner-ansible-ssh>"
   vars:
     name: "hetzner-ansible-ssh"
-    user_id: "{{ ansible_awx_user_id }}"
     credential_type_id: "{{ awx_credential_type_machine_id }}"
     credential_type_name: "Machine"
     username: "Ansible"
@@ -244,7 +243,6 @@
   delegate_to: localhost
   vars:
     name: "hetzner-ansible-vault"
-    user_id: "{{ ansible_awx_user_id }}"
     credential_type_id: "{{ awx_credential_type_vault_id }}"
     credential_type_name: "Vault"
     vault_password: "{{ ansible_vault_password }}"
@@ -310,7 +308,6 @@
   vars:
     name: "{{ shared_service_harbor_hostname }}"
     description: "{{ shared_service_harbor_hostname }}"
-    user_id: "{{ ansible_awx_user_id }}"
     credential_type_id: "{{ awx_credential_type_container_registry_id }}"
     credential_type_name: "Container Registry"
     host: "{{ shared_service_harbor_hostname }}"
diff --git a/roles/kubernetes/awx/tasks/main.yml b/roles/kubernetes/awx/tasks/main.yml
index ed37dcf..5bc5a80 100644
--- a/roles/kubernetes/awx/tasks/main.yml
+++ b/roles/kubernetes/awx/tasks/main.yml
@@ -41,6 +41,8 @@
 - name: "Define some VARs"
   set_fact:
     awx_admin_password: '{{ ( awx_admin_creds.resources | first ).data.password | b64decode }}'
+  when:
+  - inventory_hostname == groups['kube_control_plane'][0]
   tags:
     - awx
 
diff --git a/roles/kubernetes/awx/templates/awx-create-credential.json.j2 b/roles/kubernetes/awx/templates/awx-create-credential.json.j2
index a97d956..6ecafb4 100644
--- a/roles/kubernetes/awx/templates/awx-create-credential.json.j2
+++ b/roles/kubernetes/awx/templates/awx-create-credential.json.j2
@@ -2,8 +2,8 @@
   "name": "{{ name }}",
   "description": "{{ description | default("") }}",
   "organization": "{{ organization_id | default(None) }}",
-  {% if user_id is defined %}
-    "user": "{{ user_id }}",
+  {% if ansible_awx_user_id is defined %}
+    "user": "{{ ansible_awx_user_id }}",
   {% endif %}
   {% if team_id is defined %}
     "team": "{{ team_id }}",
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index bd8b6d6..19fd3ca 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -10,7 +10,7 @@
   loop:
     - python3-pip=20.0.2-5ubuntu1.6
   when:
-  - inventory_hostname == groups['kube_control_plane'][0]
+  - inventory_hostname == groups['kube_control_plane']
   tags:
     - base
 
@@ -32,7 +32,7 @@
   loop:
     - https://github.com/databus23/helm-diff
   when:
-  - inventory_hostname == groups['kube_control_plane'][0]
+  - inventory_hostname == groups['kube_control_plane']
   tags:
     - base
 
@@ -41,7 +41,7 @@
     url: 'https://github.com/derailed/k9s/releases/download/{{ kubernetes_tools_k9s_version | default("v0.25.18") }}/k9s_Linux_x86_64.tar.gz'
     dest: '/tmp/k9s_Linux_x86_64_{{ kubernetes_tools_k9s_version | default("v0.25.18") }}.tar.gz'
   when:
-  - inventory_hostname == groups['kube_control_plane'][0]
+  - inventory_hostname == groups['kube_control_plane']
   tags:
     - base
 
@@ -51,7 +51,7 @@
     dest: "/tmp/"
     remote_src: yes
   when:
-  - inventory_hostname == groups['kube_control_plane'][0]
+  - inventory_hostname == groups['kube_control_plane']
   tags:
     - base
 
@@ -65,6 +65,6 @@
     remote_src: yes
   become: yes
   when:
-  - inventory_hostname == groups['kube_control_plane'][0]
+  - inventory_hostname == groups['kube_control_plane']
   tags:
     - base