C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support deploying kubernetes 1.23 (#8323)

Browse source 
* Ensure entries for 1.23 are added for supported_versions vars

* cri-o: add support for kubernetes 1.23 but still use cri-o 1.22

* kubescheduler-config: diferentiate config versions based on kube_version
This commit is contained in:
Cristian Calin 2021-12-21 11:38:46 +02:00 committed by GitHub
parent b49ae8c21d
commit c1954ff918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/container-engine/cri-o/defaults/main.yml
View file

@ -45,6 +45,7 @@ crio_stream_port: "10010"
crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}" crio_required_version: "{{ kube_version | regex_replace('^v(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)$', '\\g<major>.\\g<minor>') }}"
crio_kubernetes_version_matrix: crio_kubernetes_version_matrix:
"1.23": "1.22"
"1.22": "1.22" "1.22": "1.22"
"1.21": "1.21" "1.21": "1.21"
"1.20": "1.20" "1.20": "1.20"

3
roles/container-engine/cri-o/vars/fedora.yml
View file

@ -4,7 +4,8 @@ crio_packages:
- cri-tools - cri-tools
crio_kubernetes_version_matrix: crio_kubernetes_version_matrix:
"1.23": "1.22"
"1.22": "1.22" "1.22": "1.22"
"1.21": "1.21" "1.21": "1.21"
"1.20": "1.20" "1.20": "1.20"
crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.20') }}" crio_version: "{{ crio_kubernetes_version_matrix[crio_required_version] | default('1.22') }}"

2
roles/download/defaults/main.yml
View file

@ -94,6 +94,7 @@ krew_version: "v0.4.2"
# Get kubernetes major version (i.e. 1.17.4 => 1.17) # Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}" kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
crictl_supported_versions: crictl_supported_versions:
v1.23: "v1.22.0"
v1.22: "v1.22.0" v1.22: "v1.22.0"
v1.21: "v1.21.0" v1.21: "v1.21.0"
v1.20: "v1.20.0" v1.20: "v1.20.0"
@ -745,6 +746,7 @@ csi_livenessprobe_image_repo: "{{ kube_image_repo }}/sig-storage/livenessprobe"
csi_livenessprobe_image_tag: "v2.5.0" csi_livenessprobe_image_tag: "v2.5.0"
snapshot_controller_supported_versions: snapshot_controller_supported_versions:
v1.23: "v4.2.1"
v1.22: "v4.2.1" v1.22: "v4.2.1"
v1.21: "v4.2.1" v1.21: "v4.2.1"
v1.20: "v4.0.0" v1.20: "v4.0.0"

2
roles/kubernetes/control-plane/tasks/main.yml
View file

@ -22,7 +22,7 @@
- name: Create kube-scheduler config - name: Create kube-scheduler config
template: template:
src: kubescheduler-config.v1beta1.yaml.j2 src: kubescheduler-config.yaml.j2
dest: "{{ kube_config_dir }}/kubescheduler-config.yaml" dest: "{{ kube_config_dir }}/kubescheduler-config.yaml"
mode: 0644 mode: 0644

9
roles/kubernetes/control-plane/templates/kubescheduler-config.v1beta1.yaml.j2 → roles/kubernetes/control-plane/templates/kubescheduler-config.yaml.j2
View file

@ -1,4 +1,11 @@
apiVersion: kubescheduler.config.k8s.io/v1beta1 {% if kube_version is version('v1.22.0', '<') %}
{% set kubescheduler_config_api_version = "v1beta1" %}
{% elif kube_version is version('v1.23.0', '<') %}
{% set kubescheduler_config_api_version = "v1beta2" %}
{% else %}
{% set kubescheduler_config_api_version = "v1beta3" %}
{% endif %}
apiVersion: kubescheduler.config.k8s.io/{{ kubescheduler_config_api_version|d('v1') }}
kind: KubeSchedulerConfiguration kind: KubeSchedulerConfiguration
clientConnection: clientConnection:
kubeconfig: "{{ kube_config_dir }}/scheduler.conf" kubeconfig: "{{ kube_config_dir }}/scheduler.conf"