diff --git a/builtin/core/roles/defaults/vars/v1.23.yaml b/builtin/core/roles/defaults/vars/v1.23.yaml index c080d884..cfa4e77e 100644 --- a/builtin/core/roles/defaults/vars/v1.23.yaml +++ b/builtin/core/roles/defaults/vars/v1.23.yaml @@ -80,10 +80,10 @@ image_manifests: - docker.io/calico/typha:v3.24.5 - docker.io/kubesphere/coredns:v1.8.6 - docker.io/kubesphere/k8s-dns-node-cache:1.21.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.6 - docker.io/openebs/linux-utils:3.3.0 - docker.io/openebs/provisioner-localpv:3.3.0 diff --git a/builtin/core/roles/defaults/vars/v1.24.yaml b/builtin/core/roles/defaults/vars/v1.24.yaml index 77ef61b4..fbd05bcb 100644 --- a/builtin/core/roles/defaults/vars/v1.24.yaml +++ b/builtin/core/roles/defaults/vars/v1.24.yaml @@ -83,10 +83,10 @@ image_manifests: - docker.io/calico/typha:v3.25.1 - docker.io/kubesphere/coredns:v1.8.6 - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.6 - docker.io/openebs/linux-utils:3.4.0 - docker.io/openebs/provisioner-localpv:3.4.0 diff --git a/builtin/core/roles/defaults/vars/v1.25.yaml b/builtin/core/roles/defaults/vars/v1.25.yaml index 6d1e7791..884c76a8 100644 --- a/builtin/core/roles/defaults/vars/v1.25.yaml +++ b/builtin/core/roles/defaults/vars/v1.25.yaml @@ -83,10 +83,10 @@ image_manifests: - docker.io/calico/typha:v3.25.1 - docker.io/kubesphere/coredns:v1.9.3 - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.6 - docker.io/openebs/linux-utils:3.4.0 - docker.io/openebs/provisioner-localpv:3.4.0 diff --git a/builtin/core/roles/defaults/vars/v1.26.yaml b/builtin/core/roles/defaults/vars/v1.26.yaml index 1aa15018..b5e8d339 100644 --- a/builtin/core/roles/defaults/vars/v1.26.yaml +++ b/builtin/core/roles/defaults/vars/v1.26.yaml @@ -83,10 +83,10 @@ image_manifests: - docker.io/calico/typha:v3.26.1 - docker.io/kubesphere/coredns:v1.9.3 - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.7 - docker.io/openebs/linux-utils:3.4.0 - docker.io/openebs/provisioner-localpv:3.4.0 diff --git a/builtin/core/roles/defaults/vars/v1.27.yaml b/builtin/core/roles/defaults/vars/v1.27.yaml index d9250c31..2b26370f 100644 --- a/builtin/core/roles/defaults/vars/v1.27.yaml +++ b/builtin/core/roles/defaults/vars/v1.27.yaml @@ -80,10 +80,10 @@ image_manifests: - docker.io/calico/typha:v3.26.1 - docker.io/kubesphere/coredns:v1.10.1 - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.7 - docker.io/openebs/linux-utils:3.4.0 - docker.io/openebs/provisioner-localpv:3.4.0 diff --git a/builtin/core/roles/defaults/vars/v1.28.yaml b/builtin/core/roles/defaults/vars/v1.28.yaml index 2328e832..94f7fdca 100644 --- a/builtin/core/roles/defaults/vars/v1.28.yaml +++ b/builtin/core/roles/defaults/vars/v1.28.yaml @@ -81,10 +81,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.10.1 - docker.io/kubesphere/k8s-dns-node-cache:1.22.20 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.8 - docker.io/openebs/linux-utils:3.4.0 - docker.io/openebs/provisioner-localpv:3.4.0 diff --git a/builtin/core/roles/defaults/vars/v1.29.yaml b/builtin/core/roles/defaults/vars/v1.29.yaml index eb1f3f01..27b2bf03 100644 --- a/builtin/core/roles/defaults/vars/v1.29.yaml +++ b/builtin/core/roles/defaults/vars/v1.29.yaml @@ -81,10 +81,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.11.1 - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.8 - docker.io/openebs/linux-utils:3.5.0 - docker.io/openebs/provisioner-localpv:3.5.0 diff --git a/builtin/core/roles/defaults/vars/v1.30.yaml b/builtin/core/roles/defaults/vars/v1.30.yaml index bbecd3ff..6fc15754 100644 --- a/builtin/core/roles/defaults/vars/v1.30.yaml +++ b/builtin/core/roles/defaults/vars/v1.30.yaml @@ -81,10 +81,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.11.1 - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.8 - docker.io/openebs/linux-utils:4.0.0 - docker.io/openebs/provisioner-localpv:4.0.0 diff --git a/builtin/core/roles/defaults/vars/v1.31.yaml b/builtin/core/roles/defaults/vars/v1.31.yaml index f72b235e..711c8002 100644 --- a/builtin/core/roles/defaults/vars/v1.31.yaml +++ b/builtin/core/roles/defaults/vars/v1.31.yaml @@ -81,10 +81,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.11.1 - docker.io/kubesphere/k8s-dns-node-cache:1.23.1 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.8 - docker.io/openebs/linux-utils:4.1.0 - docker.io/openebs/provisioner-localpv:4.1.0 diff --git a/builtin/core/roles/defaults/vars/v1.32.yaml b/builtin/core/roles/defaults/vars/v1.32.yaml index bfd38072..8ba89876 100644 --- a/builtin/core/roles/defaults/vars/v1.32.yaml +++ b/builtin/core/roles/defaults/vars/v1.32.yaml @@ -83,10 +83,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.11.1 - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.8 - docker.io/openebs/linux-utils:4.2.0 - docker.io/openebs/provisioner-localpv:4.2.0 diff --git a/builtin/core/roles/defaults/vars/v1.33.yaml b/builtin/core/roles/defaults/vars/v1.33.yaml index 459dfabe..c7022f05 100644 --- a/builtin/core/roles/defaults/vars/v1.33.yaml +++ b/builtin/core/roles/defaults/vars/v1.33.yaml @@ -83,10 +83,10 @@ image_manifests: - docker.io/calico/typha:v3.28.2 - docker.io/kubesphere/coredns:v1.12.1 - docker.io/kubesphere/k8s-dns-node-cache:1.24.0 - - docker.io/kubesphere/kube-apiserver:{{ .kube_version }} - - docker.io/kubesphere/kube-controller-manager:{{ .kube_version }} - - docker.io/kubesphere/kube-proxy:{{ .kube_version }} - - docker.io/kubesphere/kube-scheduler:{{ .kube_version }} + - docker.io/kubesphere/kube-apiserver:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-controller-manager:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-proxy:{{ .kubernetes.kube_version }} + - docker.io/kubesphere/kube-scheduler:{{ .kubernetes.kube_version }} - docker.io/kubesphere/pause:3.9 - docker.io/openebs/linux-utils:4.2.0 - docker.io/openebs/provisioner-localpv:4.2.0 diff --git a/builtin/core/roles/precheck/kubernetes/tasks/main.yaml b/builtin/core/roles/precheck/kubernetes/tasks/main.yaml index e87617df..df919cff 100644 --- a/builtin/core/roles/precheck/kubernetes/tasks/main.yaml +++ b/builtin/core/roles/precheck/kubernetes/tasks/main.yaml @@ -23,7 +23,7 @@ - .kubernetes.kube_version | empty | not - .kubernetes.kube_version | semverCompare (printf ">=%s" .cluster_require.kube_version_min_required) fail_msg: >- - This version of KubeKey only supports Kubernetes versions greater than or equal to {{ .cluster_require.kube_version_min_required }}. You are attempting to use version {{ .kube_version }}. + This version of KubeKey only supports Kubernetes versions greater than or equal to {{ .cluster_require.kube_version_min_required }}. You are attempting to use version {{ .kubernetes.kube_version }}. - name: Kubernetes | Check if Kubernetes is installed block: