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

scheduler changes - Release 1.7 #2329

Merged
merged 2 commits into from
Sep 25, 2024
Merged

scheduler changes - Release 1.7 #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f512605
scheduler changes - Release 1.7
abhishek-sa1 Sep 24, 2024
7997099
copyright fixes
abhishek-sa1 Sep 24, 2024
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
3 changes: 2 additions & 1 deletion scheduler/ansible.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ forks = 5
timeout = 180
executable = /bin/bash
display_skipped_hosts = false
collections_path = $VIRTUAL_ENV

[persistent_connection]
command_timeout = 180
connect_timeout = 180

[ssh_connection]
retries = 3
ssh_args = -o ControlMaster=auto -o ControlPersist=180
ssh_args = -o ControlMaster=auto -o ControlPersist=180
66 changes: 40 additions & 26 deletions scheduler/playbooks/k8s_add_node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,15 @@
kube_network_plugin: "{{ hostvars['localhost']['k8s_cni'] }}"
kube_service_addresses: "{{ hostvars['localhost']['k8s_service_addresses'] }}"
kube_pods_subnet: "{{ hostvars['localhost']['k8s_pod_network_cidr'] }}"
metallb_enabled: true
metallb_speaker_enabled: true
kube_proxy_strict_arp: true
kube_proxy_mode: 'iptables'
kubelet_custom_flags: "{% if hostvars['localhost']['topology_manager_policy'] != 'none' %}
--topology-manager-policy={{ hostvars['localhost']['topology_manager_policy'] }}
--topology-manager-scope={{ hostvars['localhost']['topology_manager_scope'] }}
{% endif %}"
metallb_enabled: true
metallb_speaker_enabled: true
metallb_namespace: "metallb-system"
metallb_config:
address_pools:
primary:
Expand All @@ -54,23 +59,25 @@
- host: https://mirror.gcr.io
capabilities: ["pull", "resolve"]
skip_verify: false
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl.tar.gz"
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.26.1.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.25.2.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.25.2.tar.gz"
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
priti-parate marked this conversation as resolved.
Show resolved Hide resolved
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.29.0.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.27.3.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.27.3.tar.gz"
cni_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cni-plugins-v1.3.0.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.5.0.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.7.4.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.v1.1.12.tar.gz"
docker_rh_repo_base_url: ""
docker_rh_repo_gpgkey: ""
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.10.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.5.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.12.3.tar.gz"
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.12.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.16.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.14.2.tar.gz"
http_proxy: "{{ hostvars['localhost']['http_proxy'] }}"
https_proxy: "{{ hostvars['localhost']['https_proxy'] }}"

no_proxy: "localhost,127.0.0.1,{{ hostvars['localhost']['admin_nic_ip'] }},{{ hostvars['localhost']['k8s_service_addresses'] }},{{ hostvars['localhost']['k8s_pod_network_cidr'] }},{{ hostvars['localhost']['k8s_cni'] }},{{ hostvars['localhost']['control_plane_hostname'] }},{{ hostvars['localhost']['domain_name'] }}" # noqa: yaml[line-length]
additional_no_proxy: "{{ hostvars['localhost']['user_no_proxy'] if hostvars['localhost']['no_proxy_input_status'] else '' }}" # noqa: yaml[line-length]

- name: Initiate add node
when:
- hostvars['127.0.0.1']['k8s_support']
Expand All @@ -85,9 +92,14 @@
kube_network_plugin: "{{ hostvars['localhost']['k8s_cni'] }}"
kube_service_addresses: "{{ hostvars['localhost']['k8s_service_addresses'] }}"
kube_pods_subnet: "{{ hostvars['localhost']['k8s_pod_network_cidr'] }}"
kubelet_custom_flags: "{% if hostvars['localhost']['topology_manager_policy'] != 'none' %}
--topology-manager-policy={{ hostvars['localhost']['topology_manager_policy'] }}
--topology-manager-scope={{ hostvars['localhost']['topology_manager_scope'] }}
{% endif %}"
kube_proxy_strict_arp: true
metallb_enabled: true
metallb_speaker_enabled: true
kube_proxy_strict_arp: true
metallb_namespace: "metallb-system"
metallb_config:
address_pools:
primary:
Expand All @@ -111,19 +123,21 @@
- host: https://mirror.gcr.io
capabilities: ["pull", "resolve"]
skip_verify: false
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl.tar.gz"
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.26.1.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.25.2.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.25.2.tar.gz"
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.29.0.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.27.3.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.27.3.tar.gz"
cni_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cni-plugins-v1.3.0.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.5.0.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.7.4.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.v1.1.12.tar.gz"
docker_rh_repo_base_url: ""
docker_rh_repo_gpgkey: ""
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.10.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.5.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.12.3.tar.gz"
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.12.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.16.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.14.2.tar.gz"
http_proxy: "{{ hostvars['localhost']['http_proxy'] }}"
https_proxy: "{{ hostvars['localhost']['https_proxy'] }}"
no_proxy: "localhost,127.0.0.1,{{ hostvars['localhost']['admin_nic_ip'] }},{{ hostvars['localhost']['k8s_service_addresses'] }},{{ hostvars['localhost']['k8s_pod_network_cidr'] }},{{ hostvars['localhost']['control_plane_hostname'] }},{{ hostvars['localhost']['domain_name'] }}" # noqa: yaml[line-length]
additional_no_proxy: "{{ hostvars['localhost']['user_no_proxy'] if hostvars['localhost']['no_proxy_input_status'] else '' }}" # noqa: yaml[line-length]
33 changes: 20 additions & 13 deletions scheduler/playbooks/k8s_start_setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@
kube_network_plugin: "{{ hostvars['localhost']['k8s_cni'] }}"
kube_service_addresses: "{{ hostvars['localhost']['k8s_service_addresses'] }}"
kube_pods_subnet: "{{ hostvars['localhost']['k8s_pod_network_cidr'] }}"
metallb_enabled: true
metallb_speaker_enabled: true
kubelet_custom_flags: "{% if hostvars['localhost']['topology_manager_policy'] != 'none' %}
--topology-manager-policy={{ hostvars['localhost']['topology_manager_policy'] }}
--topology-manager-scope={{ hostvars['localhost']['topology_manager_scope'] }}
{% endif %}"
kube_proxy_strict_arp: true
kube_proxy_mode: 'iptables'
metallb_enabled: true
metallb_speaker_enabled: true
metallb_namespace: "metallb-system"
metallb_config:
address_pools:
primary:
Expand All @@ -53,19 +58,21 @@
- host: https://mirror.gcr.io
capabilities: ["pull", "resolve"]
skip_verify: false
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl.tar.gz"
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.26.1.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.25.2.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.25.2.tar.gz"
kubeadm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubeadm-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
kubectl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubectl-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
kubelet_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/kubelet-{{ hostvars['localhost']['k8s_version'] }}.tar.gz"
crictl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cri-tools-v1.29.0.tar.gz"
calicoctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicoctl-v3.27.3.tar.gz"
calico_crds_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/calicocrds-v3.27.3.tar.gz"
cni_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/cni-plugins-v1.3.0.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.5.0.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.tar.gz"
nerdctl_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/nerdctl-v1.7.4.tar.gz"
runc_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/runc.amd64.v1.1.12.tar.gz"
docker_rh_repo_base_url: ""
docker_rh_repo_gpgkey: ""
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.10.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.5.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.12.3.tar.gz"
etcd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/etcd-v3.5.12.tar.gz"
containerd_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/containerd-1.7.16.tar.gz"
helm_download_url: "{{ hostvars['localhost']['offline_tarball_path'] }}/helm-v3.14.2.tar.gz"
http_proxy: "{{ hostvars['localhost']['http_proxy'] }}"
https_proxy: "{{ hostvars['localhost']['https_proxy'] }}"
no_proxy: "localhost,127.0.0.1,{{ hostvars['localhost']['admin_nic_ip'] }},{{ hostvars['localhost']['k8s_service_addresses'] }},{{ hostvars['localhost']['k8s_pod_network_cidr'] }},{{ hostvars['localhost']['control_plane_hostname'] }},{{ hostvars['localhost']['domain_name'] }}" # noqa: yaml[line-length]
additional_no_proxy: "{{ hostvars['localhost']['user_no_proxy'] if hostvars['localhost']['no_proxy_input_status'] else '' }}" # noqa: yaml[line-length]
Loading