Skip to content

Commit 0e55942

Browse files
authored
Merge branch 'main' into feature/capo_0.12.2
2 parents 63fb608 + 819ec44 commit 0e55942

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

.ansible-lint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
exclude_paths:
3+
- .ansible
34
- .github
45
- molecule
56
- roles/cluster_api/files/providers

.github/workflows/ansible-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v3
2929

3030
- name: Setup Python
31-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v5
3232
with:
3333
python-version: "3.10"
3434
cache: pip
@@ -40,7 +40,7 @@ jobs:
4040
run: ansible-galaxy collection install .
4141

4242
- name: Run "ansible-test"
43-
run: ansible-test units
43+
run: ansible-test units --python 3.10
4444
working-directory: /home/runner/.ansible/collections/ansible_collections/vexxhost/kubernetes
4545

4646
- name: Publish Test Report

.github/workflows/molecule.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v3
4545

4646
- name: Setup Python
47-
uses: actions/setup-python@v2
47+
uses: actions/setup-python@v5
4848
with:
4949
python-version: "3.10"
5050
cache: pip
@@ -83,7 +83,7 @@ jobs:
8383
uses: actions/checkout@v3
8484

8585
- name: Setup Python
86-
uses: actions/setup-python@v2
86+
uses: actions/setup-python@v5
8787
with:
8888
python-version: "3.10"
8989
cache: pip

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exclude: '^(roles/cluster_api/files/providers|roles/(cilium|cert_manager)/files/chart)'
1+
exclude: '^(roles/cluster_api/files/providers|roles/(cilium|cert_manager)/files/chart|.ansible)'
22

33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks

molecule/kubernetes/prepare.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
- name: Prepare
1616
hosts: all
17-
become: true
1817
pre_tasks:
1918
- name: Wait for systemd to complete initialization
2019
ansible.builtin.command: systemctl is-system-running
@@ -53,6 +52,12 @@
5352
- iproute
5453
when: ansible_facts['os_family'] == "RedHat"
5554

55+
- name: fix rocky9 sudo issue
56+
ansible.builtin.shell:
57+
cmd: |
58+
chmod 0400 /etc/shadow
59+
when: ansible_facts['distribution'] == "Rocky"
60+
5661
- name: Uninstall RHEL packages
5762
ansible.builtin.package:
5863
name:

roles/kube_vip/tasks/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,16 @@
7373
dest: /etc/kubernetes/manifests/kube-vip.yaml
7474
owner: root
7575
group: root
76-
mode: "0644"
76+
mode: "0640"
7777
changed_when: false
7878

7979
- name: Ensure kube-vip configuration file
8080
ansible.builtin.file:
8181
path: /etc/kubernetes/manifests/kube-vip.yaml
8282
state: "{{ kube_vip_enabled | ternary('file', 'absent') }}"
83+
owner: root
84+
group: root
85+
mode: "0640"
8386

8487
- name: Flush handlers
8588
ansible.builtin.meta: flush_handlers

0 commit comments

Comments
 (0)