Skip to content

Commit a4a1ab0

Browse files
author
Alan Christie
committed
style: Fix lint errors
1 parent f98ef60 commit a4a1ab0

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

roles/operator/tasks/main.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
ansible.builtin.include_tasks: prep.yaml
55

66
- name: Deploy (with k8s kubeconfig)
7+
when: jo_kubeconfig != 'SetMe'
8+
module_defaults:
9+
group/k8s:
10+
kubeconfig: "{{ jo_kubeconfig }}"
711
block:
812

913
- name: Deploy (k8s kubeconfig)
@@ -13,12 +17,8 @@
1317
ansible.builtin.include_tasks: undeploy.yaml
1418
when: jo_state|string == 'absent'
1519

16-
module_defaults:
17-
group/k8s:
18-
kubeconfig: "{{ jo_kubeconfig }}"
19-
when: jo_kubeconfig != 'SetMe'
20-
2120
- name: Deploy (with k8s host and API key)
21+
when: jo_kubeconfig == 'SetMe'
2222
block:
2323

2424
- name: Deploy (k8s API key)
@@ -27,5 +27,3 @@
2727
- name: Undeploy (k8s API key)
2828
ansible.builtin.include_tasks: undeploy.yaml
2929
when: jo_state|string == 'absent'
30-
31-
when: jo_kubeconfig == 'SetMe'

roles/operator/tasks/prep.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# expected environment variables so that we can assert they've been set.
3232

3333
- name: Set initial authentication facts
34-
set_fact:
34+
ansible.builtin.set_fact:
3535
k8s_auth_host: "{{ lookup('env', 'K8S_AUTH_HOST') }}"
3636
k8s_auth_api_key: "{{ lookup('env', 'K8S_AUTH_API_KEY') }}"
3737

@@ -41,7 +41,7 @@
4141
# Either way the variables 'k8s_auth_host' and
4242
# 'k8s_auth_api_key' must have been set.
4343
- name: Assert kubernetes authentication (no kubeconfig)
44-
assert:
44+
ansible.builtin.assert:
4545
that:
4646
- k8s_auth_host|string|length > 0
4747
- k8s_auth_api_key|string|length > 0

0 commit comments

Comments
 (0)