From 523c67d7bc9b57c43754926c537e7d28ebc69ca5 Mon Sep 17 00:00:00 2001 From: Mugdha Adhav Date: Mon, 22 Jan 2024 15:24:21 +0530 Subject: [PATCH] chore: update image name refs --- .github/workflows/images-build-and-push.yaml | 2 +- README.md | 6 +++--- charts/warm-metal-csi-driver/values-crio.yaml | 2 +- charts/warm-metal-csi-driver/values.yaml | 2 +- hack/ci/build.sh | 4 ++-- hack/ci/install_driver.sh | 2 +- hack/ci/setup_docker_cluster.sh | 4 ++-- hack/ci/setup_private_registry.sh | 4 ++-- hack/helper/prepare_containerd_cluster.sh | 6 +++--- hack/lib/cluster.sh | 4 ++-- sample/ephemeral-volume.yaml | 4 ++-- sample/install/cri-o.yaml | 4 ++-- sample/install/k3s-containerd.yaml | 4 ++-- sample/install/minikube-containerd.yaml | 4 ++-- sample/install/snap-microk8s-containerd.yaml | 4 ++-- sample/pre-provisioned-pv.yaml | 4 ++-- test/e2e/driver.go | 12 +++++------- .../compatible-manifests/ephemeral-volume.yaml | 6 +++--- .../compatible-manifests/pre-provisioned-pv.yaml | 2 +- test/integration/containerd-helm-values.yaml | 2 +- test/integration/crio-helm-values.yaml | 2 +- .../ephemeral-volume-private-with-daemon-secret.yaml | 2 +- ...re-provisioned-pv-private-with-daemon-secret.yaml | 2 +- test/integration/failed-manifests/rwo-pv.yaml | 6 +++--- test/integration/failed-manifests/rwx-pv.yaml | 6 +++--- .../ephemeral-volume-docker-library-image.yaml | 2 +- .../ephemeral-volume-private-with-given-secret.yaml | 2 +- test/integration/manifests/ephemeral-volume.yaml | 4 ++-- ...pre-provisioned-pv-private-with-given-secret.yaml | 2 +- test/integration/manifests/pre-provisioned-pv.yaml | 4 ++-- .../manifests/readonly-ephemeral-volume.yaml | 4 ++-- .../manifests/readonly-mount-ephemeral-volume.yaml | 4 ++-- .../integration/manifests/readonly-mount-pre-pv.yaml | 4 ++-- .../manifests/two-readonly-ephemeral-volume.yaml | 6 +++--- test/integration/manifests/two-readonly-pv.yaml | 6 +++--- .../manifests/two-readonly-single-pv.yaml | 8 ++++---- test/integration/manual-manifests/write-check.yaml | 6 +++--- .../metrics-manifests/error-ephemeral-volume.yaml | 6 +++--- .../metrics-manifests/no-error-ephemeral-volume.yaml | 6 +++--- test/integration/test-in-minikube-cri-o.sh | 6 +++--- test/integration/test-in-minikube-docker.sh | 6 +++--- 41 files changed, 87 insertions(+), 89 deletions(-) diff --git a/.github/workflows/images-build-and-push.yaml b/.github/workflows/images-build-and-push.yaml index a6123fc..bc857ea 100644 --- a/.github/workflows/images-build-and-push.yaml +++ b/.github/workflows/images-build-and-push.yaml @@ -10,7 +10,7 @@ on: env: BASE_REPOSITORY: warm-metal/container-image-csi-driver BASE_DEFAULT_BRANCH: main - BASE_IMAGE_NAME: warmmetal/csi-image + BASE_IMAGE_NAME: warmmetal/container-image-csi-driver FORK_IMAGE_NAME: ghcr.io/${{ github.repository }} permissions: diff --git a/README.md b/README.md index df343d7..1005aee 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ spec: spec: containers: - name: ephemeral-volume - image: docker.io/warmmetal/csi-image-test:check-fs + image: docker.io/warmmetal/container-image-csi-driver-test:check-fs env: - name: TARGET value: /target @@ -120,7 +120,7 @@ spec: # nodePublishSecretRef: # name: "ImagePullSecret name in the same namespace" volumeAttributes: - image: "docker.io/warmmetal/csi-image-test:simple-fs" + image: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs" # # set pullAlways if you want to ignore local images # pullAlways: "true" backoffLimit: 0 @@ -143,7 +143,7 @@ spec: persistentVolumeReclaimPolicy: Retain csi: driver: csi-image.warm-metal.tech - volumeHandle: "docker.io/warmmetal/csi-image-test:simple-fs" + volumeHandle: "docker.io/warmmetal/container-image-csi-driver-test:simple-fs" # nodePublishSecretRef: # name: "name of the ImagePullSecret" # namespace: "namespace of the secret" diff --git a/charts/warm-metal-csi-driver/values-crio.yaml b/charts/warm-metal-csi-driver/values-crio.yaml index 1cdf403..b306f65 100644 --- a/charts/warm-metal-csi-driver/values-crio.yaml +++ b/charts/warm-metal-csi-driver/values-crio.yaml @@ -13,7 +13,7 @@ csiPlugin: resources: {} image: tag: "" - repository: docker.io/warmmetal/csi-image + repository: docker.io/warmmetal/container-image-csi-driver pullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/warm-metal-csi-driver/values.yaml b/charts/warm-metal-csi-driver/values.yaml index cf577ff..38196ab 100644 --- a/charts/warm-metal-csi-driver/values.yaml +++ b/charts/warm-metal-csi-driver/values.yaml @@ -13,7 +13,7 @@ csiPlugin: resources: {} image: tag: "" - repository: docker.io/warmmetal/csi-image + repository: docker.io/warmmetal/container-image-csi-driver pullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/hack/ci/build.sh b/hack/ci/build.sh index cf3177d..1dfcd8e 100755 --- a/hack/ci/build.sh +++ b/hack/ci/build.sh @@ -3,7 +3,7 @@ set -e set -x VERSION=$(git rev-parse --short HEAD) -IMG=docker.io/warmmetal/csi-image:${VERSION} +IMG=docker.io/warmmetal/container-image-csi-driver:${VERSION} BUILDER=$(docker buildx ls | grep ci-builderx || true) [ "${BUILDER}" != "" ] || docker buildx create \ --name ci-builderx --driver docker-container \ @@ -13,4 +13,4 @@ docker buildx use ci-builderx docker buildx build -t ${IMG} -o "type=oci,dest=csi-image.tar" . kind load image-archive csi-image.tar -n kind-${GITHUB_RUN_ID} docker buildx build --target install-util -o "type=local,dest=_output/" . -set +e \ No newline at end of file +set +e diff --git a/hack/ci/install_driver.sh b/hack/ci/install_driver.sh index e01a1e4..cfe175f 100755 --- a/hack/ci/install_driver.sh +++ b/hack/ci/install_driver.sh @@ -4,7 +4,7 @@ source $(dirname "$0")/../lib/cluster.sh set -e -IMG=docker.io/warmmetal/csi-image:$(git rev-parse --short HEAD) +IMG=docker.io/warmmetal/container-image-csi-driver:$(git rev-parse --short HEAD) lib::install_driver ${IMG} set +e diff --git a/hack/ci/setup_docker_cluster.sh b/hack/ci/setup_docker_cluster.sh index 916a8ec..d2775a5 100755 --- a/hack/ci/setup_docker_cluster.sh +++ b/hack/ci/setup_docker_cluster.sh @@ -7,7 +7,7 @@ lib::start_cluster_docker $@ set -e echo "Install a private registry" lib::install_private_registry -minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/csi-image-test:simple-fs -minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/csi-image-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs +minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs +minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/csi-image-test:simple-fs --plain-http --user warmmetal:warmmetal set +e diff --git a/hack/ci/setup_private_registry.sh b/hack/ci/setup_private_registry.sh index 138e21c..863cd53 100755 --- a/hack/ci/setup_private_registry.sh +++ b/hack/ci/setup_private_registry.sh @@ -5,8 +5,8 @@ source $(dirname "$0")/../lib/cluster.sh set -e echo "Install a private registry" lib::install_private_registry -docker pull docker.io/warmmetal/csi-image-test:simple-fs -docker tag docker.io/warmmetal/csi-image-test:simple-fs localhost:5000/warmmetal/csi-image-test:simple-fs +docker pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs +docker tag docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:5000/warmmetal/csi-image-test:simple-fs docker login -u warmmetal -p warmmetal localhost:5000 docker push localhost:5000/warmmetal/csi-image-test:simple-fs set +e diff --git a/hack/helper/prepare_containerd_cluster.sh b/hack/helper/prepare_containerd_cluster.sh index 7a4cc2e..e8be61a 100755 --- a/hack/helper/prepare_containerd_cluster.sh +++ b/hack/helper/prepare_containerd_cluster.sh @@ -11,9 +11,9 @@ lib::install_driver echo "Install a private registry" lib::install_private_registry -minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/csi-image-test:simple-fs -minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/csi-image-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs +minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs +minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/csi-image-test:simple-fs minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/csi-image-test:simple-fs --plain-http --user warmmetal:warmmetal set +x -set +e \ No newline at end of file +set +e diff --git a/hack/lib/cluster.sh b/hack/lib/cluster.sh index f8ecbea..59c61a8 100755 --- a/hack/lib/cluster.sh +++ b/hack/lib/cluster.sh @@ -80,7 +80,7 @@ function lib::install_driver() { local manifest=$(lib::gen_manifests $2) echo "${manifest}" | kubectl delete --ignore-not-found -f - if [ "${image}" != "" ]; then - echo "${manifest}" | sed "s|image: docker.io/warmmetal/csi-image.*|image: ${image}|" | kubectl apply -f - + echo "${manifest}" | sed "s|image: docker.io/warmmetal/container-image-csi-driver.*|image: ${image}|" | kubectl apply -f - else echo "${manifest}" | kubectl apply -f - fi @@ -101,7 +101,7 @@ function lib::install_private_registry() { if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' 'private-registry')" = 'null' ]; then docker network connect "kind" "private-registry" fi - + cat <