更换下载地址

variables.yml

@@ -111,36 +111,36 @@ eviction_hard_nodefs_inodes_free: "5%"
 cloud_config_dir: "/etc/kubernetes/cloud-config"
 
 # ----------------------- k8s 二进制文件下载地址 --------------------
-k8s_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/k8s.tar.gz"
-etcd_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-{{ architectures }}.tar.gz"
-cni_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ cni_version }}/cni-plugins-linux-{{ architectures }}-{{ cni_version }}.tgz"
-docker_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/docker/version/{{ docker_version }}/{{ architectures }}/docker-{{ docker_version }}.tgz"
-containerd_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/v{{ containerd_version }}/containerd-{{ containerd_version }}-linux-{{ architectures }}.tar.gz"
-crictl_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ crictl_version }}/crictl-{{ crictl_version }}-linux-{{ architectures }}.tar.gz"
-runc_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ runc_version }}/runc.{{ architectures }}"
-cni_calico_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ cni_calico_version }}/calico-{{ architectures }}"
-cni_calico_ipam_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ cni_calico_version }}/calico-ipam-{{ architectures }}"
+k8s_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/k8s.tar.gz"
+etcd_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/etcd/{{ etcd_version }}/{{ architectures }}/etcd-{{ etcd_version }}-linux-{{ architectures }}.tar.gz"
+cni_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/containernetworking/{{ cni_version }}/{{ architectures }}/cni-plugins-linux-{{ architectures }}-{{ cni_version }}.tgz"
+docker_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/docker/{{ docker_version }}/{{ architectures }}/docker-{{ docker_version }}.tgz"
+containerd_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/containerd/{{ containerd_version }}/{{ architectures }}/containerd-{{ containerd_version }}-linux-{{ architectures }}.tar.gz"
+crictl_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/crictl/{{ crictl_version }}/{{ architectures }}/crictl-{{ crictl_version }}-linux-{{ architectures }}.tar.gz"
+runc_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/runc/{{ runc_version }}/{{ architectures }}/runc.{{ architectures }}"
+cni_calico_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/cni-plugin/{{ cni_calico_version }}/{{ architectures }}/calico-{{ architectures }}"
+cni_calico_ipam_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/cni-plugin/{{ cni_calico_version }}/{{ architectures }}/calico-ipam-{{ architectures }}"
 
 # ----------------------- 离线镜像文件下载地址 ----------------------
-kube_controller_manager_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/kube-controller-manager.tar"
-kube_apiserver_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/kube-apiserver.tar"
-kube_scheduler_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/kube-scheduler.tar"
-kube_proxy_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/kube-proxy.tar"
-pause_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_version }}/{{ architectures }}/pause.tar"
+kube_controller_manager_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/kube-controller-manager.tar"
+kube_apiserver_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/kube-apiserver.tar"
+kube_scheduler_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/kube-scheduler.tar"
+kube_proxy_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/kube-proxy.tar"
+pause_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_version }}/{{ architectures }}/pause.tar"
 
 # ----------------------- k8s 升级二进制文件及镜像下载地址 -------------
-k8s_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/k8s.tar.gz"
-kube_controller_manager_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/kube-controller-manager.tar"
-kube_apiserver_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/kube-apiserver.tar"
-kube_scheduler_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/kube-scheduler.tar"
-kube_proxy_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/kube-proxy.tar"
-pause_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/version/{{ kube_upgrade_version }}/{{ architectures }}/pause.tar"
+k8s_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/k8s.tar.gz"
+kube_controller_manager_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/kube-controller-manager.tar"
+kube_apiserver_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/kube-apiserver.tar"
+kube_scheduler_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/kube-scheduler.tar"
+kube_proxy_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/kube-proxy.tar"
+pause_upgrade_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/k8s/{{ kube_upgrade_version }}/{{ architectures }}/pause.tar"
 
 # ----------------------- 存储所需二进制文件下载地址 --------------------
-govc_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/{{ govc_version }}/govc_linux_{{ architectures }}.gz"
+govc_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/govc/{{ govc_version }}/{{ architectures }}/govc_linux_{{ architectures }}.gz"
 
 # ----------------------- helm 仓库地址 --------------------
-helm2_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/helm/version/{{ helm_binaries_v2_version }}/helm-{{ helm_binaries_v2_version }}-linux-{{ architectures }}.tar.gz"
-helm3_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/helm/version/{{ helm_binaries_v3_version }}/helm-{{ helm_binaries_v3_version }}-linux-{{ architectures }}.tar.gz"
+helm2_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/helm/{{ helm_binaries_v2_version }}/helm-{{ helm_binaries_v2_version }}-linux-{{ architectures }}.tar.gz"
+helm3_download_url: "http://{{ local_hostname }}:{{ repo_port }}/repository/oss-proxy/helm/{{ helm_binaries_v3_version }}/helm-{{ helm_binaries_v3_version }}-linux-{{ architectures }}.tar.gz"
 dns_repository_hostname: "registry.kubeoperator.io"
 dns_registry_hostname: "registry.{{ app_domain }}"