diff --git a/setup/roles/k8s/defaults/main.yaml b/setup/roles/k8s/defaults/main.yaml index d633a78..18988bf 100644 --- a/setup/roles/k8s/defaults/main.yaml +++ b/setup/roles/k8s/defaults/main.yaml @@ -9,9 +9,9 @@ k8s_prometheus: false k8s_postgresql_operator: none k8s_postgresql_operator_namespace: default -k8s_version: 1.23.4 -calico_version: 3.22 -k8s_longhorn_version: 1.2.4 -metrics_server_version: 3.8.2 -ingress_version: 1.1.1 +k8s_version: 1.28.0 +calico_version: 3.27.2 +k8s_longhorn_version: 1.6.0 +metrics_server_version: 0.7.0 +ingress_version: 1.10.0 k8s_prometheus_version: "0.10" diff --git a/setup/roles/k8s/tasks/install.yaml b/setup/roles/k8s/tasks/install.yaml index ec7f026..9fdb4c5 100644 --- a/setup/roles/k8s/tasks/install.yaml +++ b/setup/roles/k8s/tasks/install.yaml @@ -38,12 +38,12 @@ - name: gpg key ansible.builtin.apt_key: - url: https://packages.cloud.google.com/apt/doc/apt-key.gpg + url: https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key state: present - name: repository ansible.builtin.apt_repository: - repo: deb https://apt.kubernetes.io/ kubernetes-xenial main + repo: deb https://pkgs.k8s.io/core:/stable:/v1.28/deb/ / state: present filename: kubernetes @@ -104,7 +104,7 @@ - name: download calico operator ansible.builtin.get_url: - url: https://projectcalico.docs.tigera.io/archive/v{{ calico_version }}/manifests/tigera-operator.yaml + url: https://raw.githubusercontent.com/projectcalico/calico/v{{ calico_version }}/manifests/tigera-operator.yaml dest: /etc/kubernetes/components/tigera-operator.yaml mode: '0644' when: @@ -163,7 +163,7 @@ - name: download metrics server ansible.builtin.get_url: - url: https://github.com/kubernetes-sigs/metrics-server/releases/download/metrics-server-helm-chart-{{ metrics_server_version }}/components.yaml + url: https://github.com/kubernetes-sigs/metrics-server/releases/download/v{{ metrics_server_version }}/components.yaml dest: /etc/kubernetes/components/metrics-server.yaml mode: '0644' when: k8s_initial_master in ansible_facts['all_ipv4_addresses'] diff --git a/setup/roles/k8s/templates/k8s-ver.j2 b/setup/roles/k8s/templates/k8s-ver.j2 index 01233df..e667056 100644 --- a/setup/roles/k8s/templates/k8s-ver.j2 +++ b/setup/roles/k8s/templates/k8s-ver.j2 @@ -1,6 +1,6 @@ export K8SV="{{ k8s_version }}-*" -export calico_url="https://projectcalico.docs.tigera.io/archive/v{{ calico_version }}/manifests/tigera-operator.yaml" -export longhorn_url="https://raw.githubusercontent.com/longhorn/longhorn/v{{ k8s_longhorn_version }}/deploy/longhorn.yaml" -export metrics_url="https://github.com/kubernetes-sigs/metrics-server/releases/download/metrics-server-helm-chart-{{ metrics_server_version }}/components.yaml" -export ingress_url="https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v{{ ingress_version }}/deploy/static/provider/cloud/deploy.yaml" +export calico_url="https://raw.githubusercontent.com/projectcalico/calico/v{{ calico_version }}/manifests/tigera-operator.yaml" +export longhorn_url="https://raw.githubusercontent.com/longhorn/longhorn/v{{ k8s_longhorn_version }}/deploy/longhorn.yaml" +export metrics_url="https://github.com/kubernetes-sigs/metrics-server/releases/download/v{{ metrics_server_version }}/components.yaml" +export ingress_url="https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v{{ ingress_version }}/deploy/static/provider/cloud/deploy.yaml" export prometheus_url="https://github.com/prometheus-operator/kube-prometheus/archive/refs/heads/release-{{ k8s_prometheus_version }}.zip"