From 8f2390a120bc067aaf7fca073806fbb795ec33be Mon Sep 17 00:00:00 2001 From: Louis Tu <92532497+tu1h@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:47:27 +0800 Subject: [PATCH] Fix the path of download.yml (#10711) Signed-off-by: tu1h --- contrib/offline/README.md | 2 +- contrib/offline/generate_list.sh | 4 ++-- docs/offline-environment.md | 2 +- scripts/download_hash.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/offline/README.md b/contrib/offline/README.md index ecf5ffc36..a7a87d8f0 100644 --- a/contrib/offline/README.md +++ b/contrib/offline/README.md @@ -27,7 +27,7 @@ manage-offline-container-images.sh register ## generate_list.sh -This script generates the list of downloaded files and the list of container images by `roles/kubespray-defaults/main/download.yml` file. +This script generates the list of downloaded files and the list of container images by `roles/kubespray-defaults/defaults/main/download.yml` file. Run this script will execute `generate_list.yml` playbook in kubespray root directory and generate four files, all downloaded files url in files.list, all container images in images.list, jinja2 templates in *.template. diff --git a/contrib/offline/generate_list.sh b/contrib/offline/generate_list.sh index e298c8e85..158ceb98a 100755 --- a/contrib/offline/generate_list.sh +++ b/contrib/offline/generate_list.sh @@ -5,7 +5,7 @@ CURRENT_DIR=$(cd $(dirname $0); pwd) TEMP_DIR="${CURRENT_DIR}/temp" REPO_ROOT_DIR="${CURRENT_DIR%/contrib/offline}" -: ${DOWNLOAD_YML:="roles/kubespray-defaults/main/download.yml"} +: ${DOWNLOAD_YML:="roles/kubespray-defaults/defaults/main/download.yml"} mkdir -p ${TEMP_DIR} @@ -19,7 +19,7 @@ sed -n '/^downloads:/,/download_defaults:/p' ${REPO_ROOT_DIR}/${DOWNLOAD_YML} \ | sed 'N;s#\n# #g' | tr ' ' ':' | sed 's/\"//g' > ${TEMP_DIR}/images.list.template # add kube-* images to images list template -# Those container images are downloaded by kubeadm, then roles/kubespray-defaults/main/download.yml +# Those container images are downloaded by kubeadm, then roles/kubespray-defaults/defaults/main/download.yml # doesn't contain those images. That is reason why here needs to put those images into the # list separately. KUBE_IMAGES="kube-apiserver kube-controller-manager kube-scheduler kube-proxy" diff --git a/docs/offline-environment.md b/docs/offline-environment.md index 33748a58c..bbd412c53 100644 --- a/docs/offline-environment.md +++ b/docs/offline-environment.md @@ -95,7 +95,7 @@ If you use the settings like the one above, you'll need to define in your invent * `registry_host`: Container image registry. If you _don't_ use the same repository path for the container images that the ones defined - in [kubesprays-defaults's role defaults](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/main/download.yml) + in [kubesprays-defaults's role defaults](https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/defaults/main/download.yml) , you need to override the `*_image_repo` for these container images. If you want to make your life easier, use the same repository path, you won't have to override anything else. * `registry_addr`: Container image registry, but only have [domain or ip]:[port]. diff --git a/scripts/download_hash.py b/scripts/download_hash.py index 6b76f21cc..86365e333 100644 --- a/scripts/download_hash.py +++ b/scripts/download_hash.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # After a new version of Kubernetes has been released, -# run this script to update roles/kubespray-defaults/main/download.yml +# run this script to update roles/kubespray-defaults/defaults/main/download.yml # with new hashes. import hashlib @@ -10,7 +10,7 @@ import sys import requests from ruamel.yaml import YAML -MAIN_YML = "../roles/kubespray-defaults/main/download.yml" +MAIN_YML = "../roles/kubespray-defaults/defaults/main/download.yml" def open_main_yaml(): yaml = YAML()