Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kubespray image to 2.18.1 #8644

Merged
merged 3 commits into from
Mar 25, 2022
Merged

Update kubespray image to 2.18.1 #8644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6951393
Update kubernetes image to 2.18.1
floryut Mar 24, 2022
a0f13e2
Remove k8s module for ns creation
floryut Mar 25, 2022
47866e8
Remove centos7 molecule while opensuse mirror is flaky
floryut Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- deploy-special

variables:
KUBESPRAY_VERSION: v2.18.0
KUBESPRAY_VERSION: v2.18.1
FAILFASTCI_NAMESPACE: 'kargo-ci'
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
ANSIBLE_FORCE_COLOR: "true"
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ A simple way to ensure you get all the correct version of Ansible is to use the
You will then need to use [bind mounts](https://docs.docker.com/storage/bind-mounts/) to get the inventory and ssh key into the container, like this:

```ShellSession
docker pull quay.io/kubespray/kubespray:v2.18.0
docker pull quay.io/kubespray/kubespray:v2.18.1
docker run --rm -it --mount type=bind,source="$(pwd)"/inventory/sample,dst=/inventory \
--mount type=bind,source="${HOME}"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \
quay.io/kubespray/kubespray:v2.18.0 bash
quay.io/kubespray/kubespray:v2.18.1 bash
# Inside the container you may now run the kubespray playbooks:
ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa cluster.yml
```
Expand Down
6 changes: 0 additions & 6 deletions roles/container-engine/cri-o/molecule/default/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ platforms:
memory: 1024
groups:
- kube_control_plane
- name: centos7
box: centos/7
cpus: 2
memory: 1024
groups:
- kube_control_plane
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the reason why here moves centos7 molecule test due to unstable test?
It is fine to drop the molecule test for me, just confirming.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, most pull requests are facing the same issue.
It is fine to drop the test at this time.
If necessary, we just need to revert the test later.

/lgtm

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry didn't see it before, yes my idea was to remove it so test are passing and see later on if we need to add it back 😊

- name: almalinux8
box: almalinux/8
cpus: 2
Expand Down
13 changes: 4 additions & 9 deletions tests/cloud_playbooks/roles/packet-ci/tasks/create-vms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
---

- name: "Create CI namespace {{ test_name }} for test vms"
k8s:
name: "{{ test_name }}"
kind: Namespace
state: present
register: create_ci_ns
failed_when: not create_ci_ns.changed
command: "kubectl create namespace {{ test_name }}"
changed_when: false

- name: "Create temp dir /tmp/{{ test_name }} for CI files"
file:
Expand All @@ -24,9 +20,8 @@
index_var: vm_id

- name: Start vms for CI job
k8s:
state: present
src: "/tmp/{{ test_name }}/instance-{{ vm_id }}.yml"
command: "kubectl apply -f /tmp/{{ test_name }}/instance-{{ vm_id }}.yml"
changed_when: false
loop: "{{ range(1, vm_count|int + 1, 1) | list }}"
loop_control:
index_var: vm_id
Expand Down
6 changes: 2 additions & 4 deletions tests/cloud_playbooks/roles/packet-ci/tasks/delete-vms.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
state: absent

- name: "Cleanup namespace for {{ test_name }}"
k8s:
kind: Namespace
state: absent
name: "{{ test_name }}"
command: "kubectl delete namespace {{ test_name }}"
changed_when: false

- name: Wait for namespace {{ test_name }} to be fully deleted
command: kubectl get ns {{ test_name }}
Expand Down
1 change: 0 additions & 1 deletion tests/requirements-2.10.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ tox==3.11.1
dopy==0.3.7
cryptography==2.8
ansible-lint==5.4.0
openshift==0.8.8
molecule==3.0.6
molecule-vagrant==0.3
testinfra==5.2.2
Expand Down
1 change: 0 additions & 1 deletion tests/requirements-2.11.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ tox==3.11.1
dopy==0.3.7
cryptography==2.8
ansible-lint==5.4.0
openshift==0.8.8
molecule==3.0.6
molecule-vagrant==0.3
testinfra==5.2.2
Expand Down
1 change: 0 additions & 1 deletion tests/requirements-2.9.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dopy==0.3.7
cryptography==2.8
ansible-lint==5.4.0 ; python_version >= '3.0'
ansible-lint==4.2.0 ; python_version < '3.0'
openshift==0.8.8
molecule==3.0.6 ; python_version >= '3.0'
molecule==3.0.2 ; python_version < '3.0'
molecule-vagrant==0.3
Expand Down