From fbaeba5374ee22e2e629e116af0c5510db0f5331 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Mon, 13 Jul 2020 15:26:24 +0000 Subject: [PATCH] Bump cni version to v0.8.6 for k8s 1.17 This change brings in the fix for cni version which was missed during refactoring. Depends-On: I6a4bf349508d4a355360154f00b167766de21eb4 Change-Id: I8fd8126c3209b5c8ed97d97aacb2191d906f2ba0 --- playbooks/roles/package/tasks/binaries.yaml | 1 + vars/kubernetes.yaml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/playbooks/roles/package/tasks/binaries.yaml b/playbooks/roles/package/tasks/binaries.yaml index f90ac01..65a36e0 100644 --- a/playbooks/roles/package/tasks/binaries.yaml +++ b/playbooks/roles/package/tasks/binaries.yaml @@ -33,6 +33,7 @@ with_items: - {regexp: "^kube_version:.*", line: "kube_version: {{ kubernetes_version }}"} - {regexp: "^helm_version:.*", line: "helm_version: {{ helm_version }}"} + - {regexp: "^cni_version:.*", line: "cni_version: {{ cni_version }}"} # NOTE (fdegir): order of vars files is significant - name: Include kubespray vars files diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml index 727fff9..160b487 100644 --- a/vars/kubernetes.yaml +++ b/vars/kubernetes.yaml @@ -78,6 +78,12 @@ kubernetes_version: "v1.17.0" # but it would be good to have possibility to override it in case if someone needs it for some reason kubectl_version: "{{ kubernetes_version }}" +# ------------------------------------------------------------------------------- +# Kubernetes: CNI version +# ------------------------------------------------------------------------------- +cni_version: "v0.8.6" +cni_binary_checksum: "994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5" + # ------------------------------------------------------------------------------- # Kubernetes: Versions of rook, ceph and their dependencies # ------------------------------------------------------------------------------- -- 2.25.1