Compare commits
9 Commits
lean/pre-c
...
reduce-vm-
Author | SHA1 | Date | |
---|---|---|---|
2214071a82 | |||
dedc00661a | |||
0624a3061a | |||
3082fa3d0f | |||
d85b29aae1 | |||
af593465b2 | |||
870049523f | |||
184b1add54 | |||
bd9d90e00c |
@ -43,6 +43,7 @@ repos:
|
|||||||
- jsonschema==4.22.0
|
- jsonschema==4.22.0
|
||||||
- jmespath==1.0.1
|
- jmespath==1.0.1
|
||||||
- netaddr==1.2.1
|
- netaddr==1.2.1
|
||||||
|
- distlib
|
||||||
|
|
||||||
- repo: https://github.com/VannTen/misspell
|
- repo: https://github.com/VannTen/misspell
|
||||||
# Waiting on https://github.com/golangci/misspell/pull/19 to get merged
|
# Waiting on https://github.com/golangci/misspell/pull/19 to get merged
|
||||||
@ -80,6 +81,7 @@ repos:
|
|||||||
language: python
|
language: python
|
||||||
additional_dependencies:
|
additional_dependencies:
|
||||||
- ansible-core>=2.16.4
|
- ansible-core>=2.16.4
|
||||||
|
- distlib
|
||||||
entry: tests/scripts/collection-build-install.sh
|
entry: tests/scripts/collection-build-install.sh
|
||||||
pass_filenames: false
|
pass_filenames: false
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ aliases:
|
|||||||
- mzaian
|
- mzaian
|
||||||
- oomichi
|
- oomichi
|
||||||
- yankay
|
- yankay
|
||||||
|
- ant31
|
||||||
kubespray-reviewers:
|
kubespray-reviewers:
|
||||||
- cyclinder
|
- cyclinder
|
||||||
- erikjiang
|
- erikjiang
|
||||||
@ -14,7 +15,6 @@ aliases:
|
|||||||
- vannten
|
- vannten
|
||||||
- yankay
|
- yankay
|
||||||
kubespray-emeritus_approvers:
|
kubespray-emeritus_approvers:
|
||||||
- ant31
|
|
||||||
- atoms
|
- atoms
|
||||||
- chadswen
|
- chadswen
|
||||||
- luckysb
|
- luckysb
|
||||||
|
@ -231,6 +231,7 @@ The following tags are defined in playbooks:
|
|||||||
| services | Remove services (etcd, kubelet etc...) when resetting |
|
| services | Remove services (etcd, kubelet etc...) when resetting |
|
||||||
| snapshot | Enabling csi snapshot |
|
| snapshot | Enabling csi snapshot |
|
||||||
| snapshot-controller | Configuring csi snapshot controller |
|
| snapshot-controller | Configuring csi snapshot controller |
|
||||||
|
| system-packages | Install packages using OS package manager |
|
||||||
| upgrade | Upgrading, f.e. container images/binaries |
|
| upgrade | Upgrading, f.e. container images/binaries |
|
||||||
| upload | Distributing images/binaries across hosts |
|
| upload | Distributing images/binaries across hosts |
|
||||||
| vsphere-csi-driver | Configuring csi driver: vsphere |
|
| vsphere-csi-driver | Configuring csi driver: vsphere |
|
||||||
|
@ -103,7 +103,9 @@ If you use the settings like the one above, you'll need to define in your invent
|
|||||||
can store them anywhere as long as it's accessible by kubespray. It's recommended to use `*_version` in the path so
|
can store them anywhere as long as it's accessible by kubespray. It's recommended to use `*_version` in the path so
|
||||||
that you don't need to modify this setting everytime kubespray upgrades one of these components.
|
that you don't need to modify this setting everytime kubespray upgrades one of these components.
|
||||||
* `yum_repo`/`debian_repo`/`ubuntu_repo`: OS package repository depending on your OS, should point to your internal
|
* `yum_repo`/`debian_repo`/`ubuntu_repo`: OS package repository depending on your OS, should point to your internal
|
||||||
repository. Adjust the path accordingly.
|
repository. Adjust the path accordingly. Used only for Docker/Containerd packages (if needed); other packages might
|
||||||
|
be installed from other repositories. You might disable installing packages from other repositories by skipping
|
||||||
|
the `system-packages` tag
|
||||||
|
|
||||||
## Install Kubespray Python Packages
|
## Install Kubespray Python Packages
|
||||||
|
|
||||||
|
40
galaxy.yml
40
galaxy.yml
@ -9,42 +9,12 @@ authors:
|
|||||||
tags:
|
tags:
|
||||||
- infrastructure
|
- infrastructure
|
||||||
repository: https://github.com/kubernetes-sigs/kubespray
|
repository: https://github.com/kubernetes-sigs/kubespray
|
||||||
|
issues: https://github.com/kubernetes-sigs/kubespray/issues
|
||||||
|
documentation: https://kubespray.io
|
||||||
license_file: LICENSE
|
license_file: LICENSE
|
||||||
dependencies:
|
dependencies:
|
||||||
ansible.utils: '>=2.5.0'
|
ansible.utils: '>=2.5.0'
|
||||||
community.general: '>=3.0.0'
|
community.general: '>=3.0.0'
|
||||||
build_ignore:
|
manifest:
|
||||||
- .github
|
directives:
|
||||||
- '*.tar.gz'
|
- recursive-exclude tests **
|
||||||
- extra_playbooks
|
|
||||||
- inventory
|
|
||||||
- scripts
|
|
||||||
- test-infra
|
|
||||||
- .ansible-lint
|
|
||||||
- .editorconfig
|
|
||||||
- .gitignore
|
|
||||||
- .gitlab-ci
|
|
||||||
- .gitlab-ci.yml
|
|
||||||
- .gitmodules
|
|
||||||
- .markdownlint.yaml
|
|
||||||
- .nojekyll
|
|
||||||
- .pre-commit-config.yaml
|
|
||||||
- .yamllint
|
|
||||||
- Dockerfile
|
|
||||||
- FILES.json
|
|
||||||
- MANIFEST.json
|
|
||||||
- Makefile
|
|
||||||
- Vagrantfile
|
|
||||||
- _config.yml
|
|
||||||
- ansible.cfg
|
|
||||||
- requirements*txt
|
|
||||||
- setup.cfg
|
|
||||||
- setup.py
|
|
||||||
- index.html
|
|
||||||
- reset.yml
|
|
||||||
- cluster.yml
|
|
||||||
- scale.yml
|
|
||||||
- recover-control-plane.yml
|
|
||||||
- remove-node.yml
|
|
||||||
- upgrade-cluster.yml
|
|
||||||
- library
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
ansible==9.5.1
|
ansible==9.6.0
|
||||||
cryptography==42.0.7
|
cryptography==42.0.7
|
||||||
jinja2==3.1.4
|
jinja2==3.1.4
|
||||||
jmespath==1.0.1
|
jmespath==1.0.1
|
||||||
|
@ -1,10 +1,7 @@
|
|||||||
---
|
---
|
||||||
- name: Stop if either kube_control_plane or kube_node group is empty
|
- name: Stop if either kube_control_plane or kube_node group is empty
|
||||||
assert:
|
assert:
|
||||||
that: "groups.get( item )"
|
that: groups.get( 'kube_control_plane' )
|
||||||
with_items:
|
|
||||||
- kube_control_plane
|
|
||||||
- kube_node
|
|
||||||
run_once: true
|
run_once: true
|
||||||
when: not ignore_assert_errors
|
when: not ignore_assert_errors
|
||||||
|
|
||||||
|
@ -68,6 +68,7 @@
|
|||||||
- not dns_late
|
- not dns_late
|
||||||
tags:
|
tags:
|
||||||
- bootstrap-os
|
- bootstrap-os
|
||||||
|
- system-packages
|
||||||
|
|
||||||
- name: Apply system configurations
|
- name: Apply system configurations
|
||||||
import_tasks: 0080-system-configurations.yml
|
import_tasks: 0080-system-configurations.yml
|
||||||
|
@ -4,15 +4,14 @@
|
|||||||
vm_cpu_cores: 2
|
vm_cpu_cores: 2
|
||||||
vm_cpu_sockets: 1
|
vm_cpu_sockets: 1
|
||||||
vm_cpu_threads: 2
|
vm_cpu_threads: 2
|
||||||
vm_memory: 2048Mi
|
vm_memory: 2048
|
||||||
|
|
||||||
# Replace invalid characters so that we can use the branch name in kubernetes labels
|
# Replace invalid characters so that we can use the branch name in kubernetes labels
|
||||||
branch_name_sane: "{{ branch | regex_replace('/', '-') }}"
|
branch_name_sane: "{{ branch | regex_replace('/', '-') }}"
|
||||||
|
|
||||||
# Request/Limit allocation settings
|
# Request/Limit allocation settings
|
||||||
|
cpu_allocation_ratio: 0.25
|
||||||
cpu_allocation_ratio: 0.5
|
memory_allocation_ratio: 0.5
|
||||||
memory_allocation_ratio: 1
|
|
||||||
|
|
||||||
# Default path for inventory
|
# Default path for inventory
|
||||||
inventory_path: "/tmp/{{ test_name }}/inventory"
|
inventory_path: "/tmp/{{ test_name }}/inventory"
|
||||||
|
@ -4,6 +4,8 @@ kind: VirtualMachine
|
|||||||
metadata:
|
metadata:
|
||||||
name: "instance-{{ vm_id }}"
|
name: "instance-{{ vm_id }}"
|
||||||
namespace: "{{ test_name }}"
|
namespace: "{{ test_name }}"
|
||||||
|
annotations:
|
||||||
|
kubespray.com/ci.template-path: "tests/cloud_playbooks/roles/packet-ci/templates/vm.yml.j2"
|
||||||
labels:
|
labels:
|
||||||
kubevirt.io/os: {{ cloud_image }}
|
kubevirt.io/os: {{ cloud_image }}
|
||||||
spec:
|
spec:
|
||||||
@ -34,10 +36,10 @@ spec:
|
|||||||
threads: {{ vm_cpu_threads }}
|
threads: {{ vm_cpu_threads }}
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: {{ vm_memory * memory_allocation_ratio }}
|
memory: "{{ vm_memory * memory_allocation_ratio }}Mi"
|
||||||
cpu: {{ vm_cpu_cores * cpu_allocation_ratio }}
|
cpu: {{ vm_cpu_cores * cpu_allocation_ratio }}
|
||||||
limits:
|
limits:
|
||||||
memory: {{ vm_memory }}
|
memory: "{{ vm_memory }}Mi"
|
||||||
cpu: {{ vm_cpu_cores }}
|
cpu: {{ vm_cpu_cores }}
|
||||||
networks:
|
networks:
|
||||||
- name: default
|
- name: default
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: almalinux-8
|
cloud_image: almalinux-8
|
||||||
mode: ha
|
mode: ha
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
calico_bpf_enabled: true
|
calico_bpf_enabled: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: almalinux-8
|
cloud_image: almalinux-8
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
enable_nodelocaldns_secondary: true
|
enable_nodelocaldns_secondary: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: almalinux-8
|
cloud_image: almalinux-8
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
metrics_server_enabled: true
|
metrics_server_enabled: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: almalinux-8
|
cloud_image: almalinux-8
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Use docker
|
# Use docker
|
||||||
container_manager: docker
|
container_manager: docker
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: almalinux-8
|
cloud_image: almalinux-8
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
kube_network_plugin: kube-ovn
|
kube_network_plugin: kube-ovn
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: rockylinux-8
|
cloud_image: rockylinux-8
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
metrics_server_enabled: true
|
metrics_server_enabled: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: rockylinux-9
|
cloud_image: rockylinux-9
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
metrics_server_enabled: true
|
metrics_server_enabled: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: rockylinux-9
|
cloud_image: rockylinux-9
|
||||||
mode: default
|
mode: default
|
||||||
vm_memory: 3072Mi
|
vm_memory: 3072
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
kube_network_plugin: cilium
|
kube_network_plugin: cilium
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: ubuntu-2204
|
cloud_image: ubuntu-2204
|
||||||
mode: all-in-one
|
mode: all-in-one
|
||||||
vm_memory: 1600Mi
|
vm_memory: 1600
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: ubuntu-2204
|
cloud_image: ubuntu-2204
|
||||||
mode: all-in-one
|
mode: all-in-one
|
||||||
vm_memory: 1600Mi
|
vm_memory: 1600
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: ubuntu-2404
|
cloud_image: ubuntu-2404
|
||||||
mode: all-in-one
|
mode: all-in-one
|
||||||
vm_memory: 1600Mi
|
vm_memory: 1600
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: ubuntu-2404
|
cloud_image: ubuntu-2404
|
||||||
mode: all-in-one
|
mode: all-in-one
|
||||||
vm_memory: 1600Mi
|
vm_memory: 1600
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Instance settings
|
# Instance settings
|
||||||
cloud_image: ubuntu-2404
|
cloud_image: ubuntu-2404
|
||||||
mode: node-etcd-client
|
mode: node-etcd-client
|
||||||
vm_memory: 1600Mi
|
vm_memory: 1600
|
||||||
|
|
||||||
# Kubespray settings
|
# Kubespray settings
|
||||||
auto_renew_certificates: true
|
auto_renew_certificates: true
|
||||||
|
Reference in New Issue
Block a user