rename kiali_vars to kiali_vars_remove so it is unique to the remove …

…role. (#652) fixes: kiali/kiali#6199
kiali · May 25, 2023 · 33e6f79 · 33e6f79
1 parent 39c7bd7
commit 33e6f79
Show file tree

Hide file tree

Showing 18 changed files with 188 additions and 188 deletions.
diff --git a/roles/default/kiali-remove/defaults/main.yml b/roles/default/kiali-remove/defaults/main.yml
@@ -1,4 +1,4 @@
-kiali_defaults:
+kiali_defaults_remove:
   istio_namespace: ""
 
   deployment:

diff --git a/roles/default/kiali-remove/tasks/clusterroles-to-remove.yml b/roles/default/kiali-remove/tasks/clusterroles-to-remove.yml
@@ -2,14 +2,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ kiali_vars.deployment.instance_name }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ kiali_vars.deployment.instance_name }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ kiali_vars.deployment.instance_name }}-viewer
+  name: {{ kiali_vars_remove.deployment.instance_name }}-viewer
diff --git a/roles/default/kiali-remove/tasks/main.yml b/roles/default/kiali-remove/tasks/main.yml
@@ -47,16 +47,16 @@
     msg: |
         Kiali Variables:
         --------------------------------
-        {{ kiali_vars | to_nice_yaml }}
+        {{ kiali_vars_remove | to_nice_yaml }}
   debug:
     msg: "{{ msg.split('\n') }}"
 
 - name: Set default HPA api_version
   ignore_errors: yes
   set_fact:
-    kiali_vars: "{{ kiali_vars | combine({'deployment': {'hpa': {'api_version': 'autoscaling/v2' if (api_status.apis['autoscaling/v2'] is defined) else 'autoscaling/v2beta2' }}}, recursive=True) }}"
+    kiali_vars_remove: "{{ kiali_vars_remove | combine({'deployment': {'hpa': {'api_version': 'autoscaling/v2' if (api_status.apis['autoscaling/v2'] is defined) else 'autoscaling/v2beta2' }}}, recursive=True) }}"
   when:
-  - kiali_vars.deployment.hpa.api_version == ""
+  - kiali_vars_remove.deployment.hpa.api_version == ""
 
 # There is an edge case where a user installed Kiali with one instance name, then changed the instance name in the CR.
 # This is not allowed. When this happens, the operator will abort with an error message telling the user to uninstall Kiali.
@@ -66,26 +66,26 @@
 - name: Ensure the correct instance_name is used
   ignore_errors: yes
   set_fact:
-    kiali_vars: "{{ kiali_vars | combine({'deployment': {'instance_name': current_cr.status.deployment.instanceName}}, recursive=True) }}"
+    kiali_vars_remove: "{{ kiali_vars_remove | combine({'deployment': {'instance_name': current_cr.status.deployment.instanceName}}, recursive=True) }}"
   when:
   - current_cr.status is defined
   - current_cr.status.deployment is defined
   - current_cr.status.deployment.instanceName is defined
-  - current_cr.status.deployment.instanceName != kiali_vars.deployment.instance_name
+  - current_cr.status.deployment.instanceName != kiali_vars_remove.deployment.instance_name
 
 - name: Set default deployment namespace to the same namespace where the CR lives
   ignore_errors: yes
   set_fact:
-    kiali_vars: "{{ kiali_vars | combine({'deployment': {'namespace': current_cr.metadata.namespace}}, recursive=True) }}"
+    kiali_vars_remove: "{{ kiali_vars_remove | combine({'deployment': {'namespace': current_cr.metadata.namespace}}, recursive=True) }}"
   when:
-  - kiali_vars.deployment.namespace is not defined or kiali_vars.deployment.namespace == ""
+  - kiali_vars_remove.deployment.namespace is not defined or kiali_vars_remove.deployment.namespace == ""
 
 - name: Set default istio namespace
   ignore_errors: yes
   set_fact:
-    kiali_vars: "{{ kiali_vars | combine({'istio_namespace': kiali_vars.deployment.namespace}, recursive=True) }}"
+    kiali_vars_remove: "{{ kiali_vars_remove | combine({'istio_namespace': kiali_vars_remove.deployment.namespace}, recursive=True) }}"
   when:
-  - kiali_vars.istio_namespace == ""
+  - kiali_vars_remove.istio_namespace == ""
 
 - name: Find all namespaces (this is limited to what the operator has permission to see)
   ignore_errors: yes
@@ -101,7 +101,7 @@
 - name: Find current configmap, if it exists
   ignore_errors: yes
   set_fact:
-    current_configmap: "{{ lookup(k8s_plugin, resource_name=kiali_vars.deployment.instance_name, namespace=kiali_vars.deployment.namespace, api_version='v1', kind='ConfigMap') }}"
+    current_configmap: "{{ lookup(k8s_plugin, resource_name=kiali_vars_remove.deployment.instance_name, namespace=kiali_vars_remove.deployment.namespace, api_version='v1', kind='ConfigMap') }}"
 - name: Find currently accessible namespaces
   ignore_errors: yes
   set_fact:
@@ -121,21 +121,21 @@
       apiVersion: rbac.authorization.k8s.io/v1
       kind: RoleBinding
       metadata:
-        name: "{{ kiali_vars.deployment.instance_name }}"
+        name: "{{ kiali_vars_remove.deployment.instance_name }}"
         namespace: "{{ namespace }}"
       ...
       ---
       apiVersion: rbac.authorization.k8s.io/v1
       kind: Role
       metadata:
-        name: "{{ kiali_vars.deployment.instance_name }}"
+        name: "{{ kiali_vars_remove.deployment.instance_name }}"
         namespace: "{{ namespace }}"
       ...
       ---
       apiVersion: rbac.authorization.k8s.io/v1
       kind: Role
       metadata:
-        name: "{{ kiali_vars.deployment.instance_name }}-viewer"
+        name: "{{ kiali_vars_remove.deployment.instance_name }}-viewer"
         namespace: "{{ namespace }}"
       ...
       {% endfor %}
@@ -200,30 +200,30 @@
 - name: Unlabel the signing key secret if it exists to indicate this Kiali instance no longer uses it
   ignore_errors: yes
   vars:
-    doomed_label: "{{ 'kiali.io/' + ((kiali_vars.deployment.instance_name + '.') if kiali_vars.deployment.instance_name != 'kiali' else '') + 'member-of' }}"
+    doomed_label: "{{ 'kiali.io/' + ((kiali_vars_remove.deployment.instance_name + '.') if kiali_vars_remove.deployment.instance_name != 'kiali' else '') + 'member-of' }}"
   k8s:
     state: present
     definition: |
       apiVersion: v1
       kind: Secret
       metadata:
         name: "kiali-signing-key"
-        namespace: "{{ kiali_vars.deployment.namespace }}"
+        namespace: "{{ kiali_vars_remove.deployment.namespace }}"
         labels:
           {{ doomed_label }}: null
 
 - name: Delete the signing key secret if no other Kiali installation is using it
   ignore_errors: yes
   vars:
-    signing_key_secret_labels: "{{ lookup(k8s_plugin, namespace=kiali_vars.deployment.namespace, kind='Secret', resource_name='kiali-signing-key', api_version='v1') | default({}) | json_query('metadata.labels') }}"
+    signing_key_secret_labels: "{{ lookup(k8s_plugin, namespace=kiali_vars_remove.deployment.namespace, kind='Secret', resource_name='kiali-signing-key', api_version='v1') | default({}) | json_query('metadata.labels') }}"
   k8s:
     state: absent
     definition:
       apiVersion: v1
       kind: Secret
       metadata:
         name: kiali-signing-key
-        namespace: "{{ kiali_vars.deployment.namespace }}"
+        namespace: "{{ kiali_vars_remove.deployment.namespace }}"
   when:
   - (signing_key_secret_labels is not defined) or (signing_key_secret_labels | length == 0) or (signing_key_secret_labels | dict2items | selectattr('key', 'match', 'kiali.io/.*member-of') | list | length == 0)
 
@@ -244,7 +244,7 @@
   k8s:
     state: absent
     definition: |
-      {% for cl in lookup(k8s_plugin, kind='ConsoleLink', label_selector='kiali.io/home=' + ((kiali_vars.deployment.instance_name + '.') if kiali_vars.deployment.instance_name != 'kiali' else '') + kiali_vars.deployment.namespace) %}
+      {% for cl in lookup(k8s_plugin, kind='ConsoleLink', label_selector='kiali.io/home=' + ((kiali_vars_remove.deployment.instance_name + '.') if kiali_vars_remove.deployment.instance_name != 'kiali' else '') + kiali_vars_remove.deployment.namespace) %}
       ---
       apiVersion: "{{ cl.apiVersion }}"
       kind: "{{ cl.kind }}"

diff --git a/roles/default/kiali-remove/tasks/os-resources-to-remove.yml b/roles/default/kiali-remove/tasks/os-resources-to-remove.yml
@@ -2,16 +2,16 @@
 apiVersion: oauth.openshift.io/v1
 kind: OAuthClient
 metadata:
-  name: {{ kiali_vars.deployment.instance_name + '-' + kiali_vars.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name + '-' + kiali_vars_remove.deployment.namespace }}
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}-cabundle
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}-cabundle
diff --git a/roles/default/kiali-remove/tasks/resources-to-remove.yml b/roles/default/kiali-remove/tasks/resources-to-remove.yml
@@ -1,78 +1,78 @@
 ---
-apiVersion: {{ kiali_vars.deployment.hpa.api_version }}
+apiVersion: {{ kiali_vars_remove.deployment.hpa.api_version }}
 kind: HorizontalPodAutoscaler
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: networking.k8s.io/{{ 'v1' if (lookup(k8s_plugin, kind='Ingress', api_version='networking.k8s.io/v1', errors='ignore') is iterable) else 'v1beta1' }}
 kind: Ingress
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: v1
 kind: ReplicaSet
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: v1
 kind: Pod
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}-service-account
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}-service-account
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}-viewer
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}-viewer
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ kiali_vars.deployment.namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}
+  namespace: {{ kiali_vars_remove.deployment.namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  namespace: {{ kiali_vars.istio_namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}-controlplane
+  namespace: {{ kiali_vars_remove.istio_namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}-controlplane
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  namespace: {{ kiali_vars.istio_namespace }}
-  name: {{ kiali_vars.deployment.instance_name }}-controlplane
+  namespace: {{ kiali_vars_remove.istio_namespace }}
+  name: {{ kiali_vars_remove.deployment.instance_name }}-controlplane
diff --git a/roles/default/kiali-remove/vars/main.yml b/roles/default/kiali-remove/vars/main.yml
@@ -1,9 +1,9 @@
-kiali_vars:
-  istio_namespace: "{{ istio_namespace | default(kiali_defaults.istio_namespace) }}"
+kiali_vars_remove:
+  istio_namespace: "{{ istio_namespace | default(kiali_defaults_remove.istio_namespace) }}"
 
   deployment: |
     {%- if deployment is defined and deployment is iterable -%}
-    {{ kiali_defaults.deployment | combine((deployment | stripnone), recursive=True) }}
+    {{ kiali_defaults_remove.deployment | combine((deployment | stripnone), recursive=True) }}
     {%- else -%}
-    {{ kiali_defaults.deployment }}
+    {{ kiali_defaults_remove.deployment }}
     {%- endif -%}
diff --git a/roles/v1.48/kiali-remove/defaults/main.yml b/roles/v1.48/kiali-remove/defaults/main.yml
@@ -1,4 +1,4 @@
-kiali_defaults:
+kiali_defaults_remove:
   istio_namespace: ""
 
   deployment: