Skip to content

Commit 301cb5c

Browse files
mugdha-adhavmugdha-adhav
committed
chore!: update helm chart name
* Update docker images for tests * Fix make targets for test-deps
1 parent 523c67d commit 301cb5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+99
-98
lines changed

‎Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,18 @@ integration:
3535

3636
.PHONY: image
3737
image:
38-
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build -t $(REGISTRY)/csi-image:$(VERSION) --push .
38+
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver:$(VERSION) --push .
3939

4040
.PHONY: local
4141
local:
4242
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build -t $(REGISTRY)/csi-image:$(VERSION) --load .
4343

4444
.PHONY: test-deps
4545
test-deps:
46-
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:stat-fs -f csi-image-test:stat-fs.dockerfile hack/integration-test-image
47-
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:check-fs -f csi-image-test:check-fs.dockerfile hack/integration-test-image
48-
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --push -t $(REGISTRY)/csi-image-test:write-check -f csi-image-test:write-check.dockerfile hack/integration-test-image
46+
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:simple-fs -f hack/integration-test-image/container-image-csi-driver-test:simple-fs.dockerfile --push hack/integration-test-image
47+
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:stat-fs -f hack/integration-test-image/container-image-csi-driver-test:stat-fs.dockerfile --push hack/integration-test-image
48+
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:check-fs -f hack/integration-test-image/container-image-csi-driver-test:check-fs.dockerfile --push hack/integration-test-image
49+
$(IMAGE_BUILDER) $(IMAGE_BUILD_CMD) build --platform=linux/amd64 -t $(REGISTRY)/container-image-csi-driver-test:write-check -f hack/integration-test-image/container-image-csi-driver-test:write-check.dockerfile --push hack/integration-test-image
4950

5051
.PHONY: install-util
5152
install-util:

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ For pre-provisioned PVs, `volumeHandle` instead of the attribute **image**, spec
133133
apiVersion: v1
134134
kind: PersistentVolume
135135
metadata:
136-
name: pv-test-csi-image-test-simple-fs
136+
name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
137137
spec:
138138
storageClassName: csi-image.warm-metal.tech
139139
capacity:

‎charts/warm-metal-csi-driver/Chart.yaml ‎charts/container-image-csi-driver/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
name: warm-metal-csi-driver
2+
name: container-image-csi-driver
33
description: A Helm chart for warm meta driver
44

55
# A chart can be either an 'application' or a 'library' chart.

‎charts/warm-metal-csi-driver/templates/_helpers.tpl ‎charts/container-image-csi-driver/templates/_helpers.tpl

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/controller-rbac.yaml ‎charts/container-image-csi-driver/templates/controller-rbac.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/controller.yaml ‎charts/container-image-csi-driver/templates/controller.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/csi-driver.yaml ‎charts/container-image-csi-driver/templates/csi-driver.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/nodeplugin-rbac.yaml ‎charts/container-image-csi-driver/templates/nodeplugin-rbac.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/nodeplugin.yaml ‎charts/container-image-csi-driver/templates/nodeplugin.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/templates/podmonitor.yaml ‎charts/container-image-csi-driver/templates/podmonitor.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/values-crio.yaml ‎charts/container-image-csi-driver/values-crio.yaml

File renamed without changes.

‎charts/warm-metal-csi-driver/values.yaml ‎charts/container-image-csi-driver/values.yaml

File renamed without changes.

‎hack/ci/setup_docker_cluster.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ lib::start_cluster_docker $@
77
set -e
88
echo "Install a private registry"
99
lib::install_private_registry
10-
minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
11-
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
12-
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
10+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
11+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/container-image-csi-driver-test:simple-fs
12+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/container-image-csi-driver-test:simple-fs --plain-http --user warmmetal:warmmetal
1313
set +e

‎hack/ci/setup_private_registry.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66
echo "Install a private registry"
77
lib::install_private_registry
88
docker pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
9-
docker tag docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:5000/warmmetal/csi-image-test:simple-fs
9+
docker tag docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs
1010
docker login -u warmmetal -p warmmetal localhost:5000
11-
docker push localhost:5000/warmmetal/csi-image-test:simple-fs
11+
docker push localhost:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs
1212
set +e

‎hack/helper/prepare_containerd_cluster.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ lib::install_driver
1111

1212
echo "Install a private registry"
1313
lib::install_private_registry
14-
minikube ssh -p csi-image-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
15-
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
16-
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
14+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i pull docker.io/warmmetal/container-image-csi-driver-test:simple-fs
15+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i tag --force docker.io/warmmetal/container-image-csi-driver-test:simple-fs localhost:31000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs
16+
minikube ssh -p docker.io/warmmetal/container-image-csi-driver-test -- sudo ctr -n k8s.io i push localhost:31000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs --plain-http --user warmmetal:warmmetal
1717

1818
set +x
1919
set +e

‎hack/integration-test-image/csi-image-test:check-fs.dockerfile ‎hack/integration-test-image/container-image-csi-driver-test:check-fs.dockerfile

File renamed without changes.

‎hack/integration-test-image/csi-image-test:simple-fs.dockerfile ‎hack/integration-test-image/container-image-csi-driver-test:simple-fs.dockerfile

File renamed without changes.

‎hack/integration-test-image/csi-image-test:stat-fs.dockerfile ‎hack/integration-test-image/container-image-csi-driver-test:stat-fs.dockerfile

File renamed without changes.

‎hack/integration-test-image/csi-image-test:write-check.dockerfile ‎hack/integration-test-image/container-image-csi-driver-test:write-check.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM docker.io/library/golang:1.16-alpine as builder
2-
WORKDIR /go/src/csi-image-test
2+
WORKDIR /go/src/docker.io/warmmetal/container-image-csi-driver-test
33
COPY write_check.go .
44
RUN GO111MODULE=off go build -o write_check
55

66
FROM alpine:3
77
ENV TARGET=""
88
WORKDIR /
9-
COPY --from=builder /go/src/csi-image-test/write_check .
9+
COPY --from=builder /go/src/docker.io/warmmetal/container-image-csi-driver-test/write_check .
1010
ENTRYPOINT ["/write_check"]

‎hack/lib/cluster.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ source $(dirname "${BASH_SOURCE[0]}")/utils.sh
44

55
function lib::start_cluster_containerd() {
66
local version=${1:-stable}
7-
minikube start -p csi-image-test \
7+
minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
88
--kubernetes-version=${version} \
99
--container-runtime=containerd \
1010
--insecure-registry=localhost:31000
1111
}
1212

1313
function lib::start_cluster_crio() {
1414
local version=${1:-stable}
15-
minikube start -p csi-image-test \
15+
minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
1616
--kubernetes-version=${version} \
1717
--container-runtime=cri-o \
1818
--insecure-registry=localhost:31000
1919
}
2020

2121
function lib::start_cluster_docker() {
2222
local version=${1:-stable}
23-
minikube start -p csi-image-test \
23+
minikube start -p docker.io/warmmetal/container-image-csi-driver-test \
2424
--kubernetes-version=${version} \
2525
--container-runtime=docker \
2626
--insecure-registry=localhost:31000

‎sample/pre-provisioned-pv.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
77
apiVersion: v1
88
kind: PersistentVolume
99
metadata:
10-
name: pv-test-csi-image-test-simple-fs
10+
name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
1111
spec:
1212
storageClassName: csi-image.warm-metal.tech
1313
capacity:
@@ -28,15 +28,15 @@ spec:
2828
apiVersion: v1
2929
kind: PersistentVolumeClaim
3030
metadata:
31-
name: pvc-test-csi-image-test-simple-fs
31+
name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
3232
spec:
3333
storageClassName: csi-image.warm-metal.tech
3434
accessModes:
3535
- ReadOnlyMany
3636
resources:
3737
requests:
3838
storage: 5Gi
39-
volumeName: pv-test-csi-image-test-simple-fs
39+
volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
4040
---
4141
apiVersion: batch/v1
4242
kind: Job
@@ -60,5 +60,5 @@ spec:
6060
volumes:
6161
- name: target
6262
persistentVolumeClaim:
63-
claimName: pvc-test-csi-image-test-simple-fs
63+
claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
6464
backoffLimit: 0

‎test/integration/compatible-manifests/pre-provisioned-pv.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
77
apiVersion: v1
88
kind: PersistentVolume
99
metadata:
10-
name: compatible-pv-test-csi-image-test-simple-fs
10+
name: compatible-pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
1111
spec:
1212
storageClassName: csi-image.warm-metal.tech
1313
capacity:
@@ -22,15 +22,15 @@ spec:
2222
apiVersion: v1
2323
kind: PersistentVolumeClaim
2424
metadata:
25-
name: compatible-pvc-test-csi-image-test-simple-fs
25+
name: compatible-pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
2626
spec:
2727
storageClassName: csi-image.warm-metal.tech
2828
accessModes:
2929
- ReadOnlyMany
3030
resources:
3131
requests:
3232
storage: 5Gi
33-
volumeName: compatible-pv-test-csi-image-test-simple-fs
33+
volumeName: compatible-pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
3434
---
3535
apiVersion: v1
3636
kind: Pod
@@ -50,4 +50,4 @@ spec:
5050
volumes:
5151
- name: target
5252
persistentVolumeClaim:
53-
claimName: compatible-pvc-test-csi-image-test-simple-fs
53+
claimName: compatible-pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs

‎test/integration/daemon-dependent-manifests/ephemeral-volume-private-with-daemon-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ spec:
2222
csi:
2323
driver: csi-image.warm-metal.tech
2424
volumeAttributes:
25-
image: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
25+
image: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
2626
pullAlways: "true"
2727
backoffLimit: 0

‎test/integration/daemon-dependent-manifests/pre-provisioned-pv-private-with-daemon-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
persistentVolumeReclaimPolicy: Retain
1818
csi:
1919
driver: csi-image.warm-metal.tech
20-
volumeHandle: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
20+
volumeHandle: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
2121
---
2222
apiVersion: v1
2323
kind: PersistentVolumeClaim

‎test/integration/manifests/ephemeral-volume-docker-library-image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ spec:
2222
csi:
2323
driver: csi-image.warm-metal.tech
2424
volumeAttributes:
25-
image: "warmmetal/csi-image-test:simple-fs"
25+
image: "warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
2626
pullAlways: "true"
2727
backoffLimit: 0

‎test/integration/manifests/ephemeral-volume-private-with-given-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ spec:
2424
nodePublishSecretRef:
2525
name: warmmetal
2626
volumeAttributes:
27-
image: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
27+
image: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
2828
pullAlways: "true"
2929
backoffLimit: 0

‎test/integration/manifests/pre-provisioned-pv-private-with-given-secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
nodePublishSecretRef:
2121
name: warmmetal
2222
namespace: default
23-
volumeHandle: "private-registry:5000/warmmetal/csi-image-test:simple-fs"
23+
volumeHandle: "private-registry:5000/warmmetal/docker.io/warmmetal/container-image-csi-driver-test:simple-fs"
2424
volumeAttributes:
2525
pullAlways: "true"
2626
---

‎test/integration/manifests/pre-provisioned-pv.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
77
apiVersion: v1
88
kind: PersistentVolume
99
metadata:
10-
name: pv-test-csi-image-test-simple-fs
10+
name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
1111
spec:
1212
storageClassName: csi-image.warm-metal.tech
1313
capacity:
@@ -24,15 +24,15 @@ spec:
2424
apiVersion: v1
2525
kind: PersistentVolumeClaim
2626
metadata:
27-
name: pvc-test-csi-image-test-simple-fs
27+
name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
2828
spec:
2929
storageClassName: csi-image.warm-metal.tech
3030
accessModes:
3131
- ReadOnlyMany
3232
resources:
3333
requests:
3434
storage: 5Gi
35-
volumeName: pv-test-csi-image-test-simple-fs
35+
volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
3636
---
3737
apiVersion: batch/v1
3838
kind: Job
@@ -56,5 +56,5 @@ spec:
5656
volumes:
5757
- name: target
5858
persistentVolumeClaim:
59-
claimName: pvc-test-csi-image-test-simple-fs
59+
claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
6060
backoffLimit: 0

‎test/integration/manifests/readonly-mount-pre-pv.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
77
apiVersion: v1
88
kind: PersistentVolume
99
metadata:
10-
name: pv-test-csi-image-test-simple-fs
10+
name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
1111
spec:
1212
storageClassName: csi-image.warm-metal.tech
1313
capacity:
@@ -24,15 +24,15 @@ spec:
2424
apiVersion: v1
2525
kind: PersistentVolumeClaim
2626
metadata:
27-
name: pvc-test-csi-image-test-simple-fs
27+
name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
2828
spec:
2929
storageClassName: csi-image.warm-metal.tech
3030
accessModes:
3131
- ReadOnlyMany
3232
resources:
3333
requests:
3434
storage: 5Gi
35-
volumeName: pv-test-csi-image-test-simple-fs
35+
volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
3636
---
3737
apiVersion: batch/v1
3838
kind: Job
@@ -59,5 +59,5 @@ spec:
5959
volumes:
6060
- name: target
6161
persistentVolumeClaim:
62-
claimName: pvc-test-csi-image-test-simple-fs
62+
claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs
6363
backoffLimit: 0

‎test/integration/manifests/two-readonly-pv.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ provisioner: csi-image.warm-metal.tech
77
apiVersion: v1
88
kind: PersistentVolume
99
metadata:
10-
name: pv-test-csi-image-test-simple-fs-1
10+
name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
1111
spec:
1212
storageClassName: csi-image.warm-metal.tech
1313
capacity:
@@ -24,20 +24,20 @@ spec:
2424
apiVersion: v1
2525
kind: PersistentVolumeClaim
2626
metadata:
27-
name: pvc-test-csi-image-test-simple-fs-1
27+
name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
2828
spec:
2929
storageClassName: csi-image.warm-metal.tech
3030
accessModes:
3131
- ReadOnlyMany
3232
resources:
3333
requests:
3434
storage: 5Gi
35-
volumeName: pv-test-csi-image-test-simple-fs-1
35+
volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
3636
---
3737
# apiVersion: v1
3838
# kind: PersistentVolume
3939
# metadata:
40-
# name: pv-test-csi-image-test-simple-fs-2
40+
# name: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
4141
# spec:
4242
# storageClassName: csi-image.warm-metal.tech
4343
# capacity:
@@ -54,15 +54,15 @@ spec:
5454
# apiVersion: v1
5555
# kind: PersistentVolumeClaim
5656
# metadata:
57-
# name: pvc-test-csi-image-test-simple-fs-2
57+
# name: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
5858
# spec:
5959
# storageClassName: csi-image.warm-metal.tech
6060
# accessModes:
6161
# - ReadOnlyMany
6262
# resources:
6363
# requests:
6464
# storage: 5Gi
65-
# volumeName: pv-test-csi-image-test-simple-fs-2
65+
# volumeName: pv-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
6666
---
6767
apiVersion: batch/v1
6868
kind: Job
@@ -94,8 +94,8 @@ spec:
9494
volumes:
9595
- name: target1
9696
persistentVolumeClaim:
97-
claimName: pvc-test-csi-image-test-simple-fs-1
97+
claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-1
9898
# - name: target2
9999
# persistentVolumeClaim:
100-
# claimName: pvc-test-csi-image-test-simple-fs-2
100+
# claimName: pvc-test-docker.io/warmmetal/container-image-csi-driver-test-simple-fs-2
101101
backoffLimit: 0

‎test/integration/manual-manifests/write-check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
metadata:
88
name: write-check
99
spec:
10-
nodeName: csi-image-test-m02
10+
nodeName: docker.io/warmmetal/container-image-csi-driver-test-m02
1111
containers:
1212
- name: write-check
1313
image: docker.io/warmmetal/container-image-csi-driver-test:write-check

0 commit comments

Comments
 (0)