diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0f58e35..658eff1 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -73,6 +73,7 @@ jobs: run: | wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq chmod +x /usr/local/bin/yq + make setup-ecr make -j `nproc` all-image trivy: needs: build-images diff --git a/Makefile b/Makefile index 21fa893..72e688f 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ setup-ecr: aws ecr create-repository --region us-west-2 --repository-name csi-snapshotter || true aws ecr create-repository --region us-west-2 --repository-name livenessprobe || true aws ecr create-repository --region us-west-2 --repository-name snapshot-controller || true + aws ecr create-repository --region us-west-2 --repository-name volume-modifier-for-k8s || true # Helper target to bump all images to the latest version .PHONY: bump-versions @@ -75,7 +76,7 @@ bin/%: $(BUILD_SOURCES) | bin build @BUILD_PLATFORMS="$(BUILD_PLATFORMS)" hack/build-binary.sh $* .PHONY: all -all: bin/csi-snapshotter bin/csi-attacher bin/csi-provisioner bin/csi-resizer bin/csi-node-driver-registrar bin/livenessprobe bin/snapshot-controller +all: bin/csi-snapshotter bin/csi-attacher bin/csi-provisioner bin/csi-resizer bin/csi-node-driver-registrar bin/livenessprobe bin/snapshot-controller bin/volume-modifier-for-k8s ## Container image targets @@ -83,7 +84,7 @@ image/%: $(BUILD_SOURCES) Dockerfile .dockerignore @TAG_PREFIX="$(TAG_PREFIX)" REGISTRY="$(REGISTRY)" hack/build-image.sh $* .PHONY: all-image -all-image: image/csi-snapshotter image/csi-attacher image/csi-provisioner image/csi-resizer image/csi-node-driver-registrar image/livenessprobe image/snapshot-controller +all-image: image/csi-snapshotter image/csi-attacher image/csi-provisioner image/csi-resizer image/csi-node-driver-registrar image/livenessprobe image/snapshot-controller image/volume-modifier-for-k8s ## Trivy (image scanner) targets @@ -91,7 +92,7 @@ trivy/%: output @TAG_PREFIX="$(TAG_PREFIX)" REGISTRY="$(REGISTRY)" OUTPUT_SARIF="$(OUTPUT_SARIF)" hack/trivy.sh $* .PHONY: all-trivy -all-trivy: trivy/csi-snapshotter trivy/csi-attacher trivy/csi-provisioner trivy/csi-resizer trivy/csi-node-driver-registrar trivy/livenessprobe trivy/snapshot-controller +all-trivy: trivy/csi-snapshotter trivy/csi-attacher trivy/csi-provisioner trivy/csi-resizer trivy/csi-node-driver-registrar trivy/livenessprobe trivy/snapshot-controller trivy/volume-modifier-for-k8s ## E2E targets diff --git a/README.md b/README.md index 52c376a..52e9619 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ The released images are hosted on the [`csi-components` ECR Public Registry](htt | [external-snapshotter](https://github.com/kubernetes-csi/external-snapshotter) | v8.5.0-eksbuild.1 | `public.ecr.aws/csi-components/csi-snapshotter:v8.5.0-eksbuild.1` | | [livenessprobe](https://github.com/kubernetes-csi/livenessprobe) | v2.18.0-eksbuild.1 | `public.ecr.aws/csi-components/livenessprobe:v2.18.0-eksbuild.1` | | [snapshot-controller](https://github.com/kubernetes-csi/external-snapshotter) | v8.5.0-eksbuild.1 | `public.ecr.aws/csi-components/snapshot-controller:v8.5.0-eksbuild.1` | +| [volume-modifier-for-k8s](https://github.com/awslabs/volume-modifier-for-k8s) | main-eksbuild.1 | `public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:main-eksbuild.1` | ## Building diff --git a/hack/e2e.sh b/hack/e2e.sh index 64d773a..b20814e 100755 --- a/hack/e2e.sh +++ b/hack/e2e.sh @@ -45,7 +45,7 @@ done # Special case: snapshot-controller is not a sidecar, and is passed to the EBS CSI # E2E tests through the environment variable EBS_INSTALL_SNAPSHOT_CUSTOM_IMAGE SC_EKSBUILD="$(yq ".snapshot-controller.eksbuild" "${BASE_DIR}/release-config.yaml")" -export EBS_INSTALL_SNAPSHOT_CUSTOM_IMAGE="${REGISTRY}/${IMAGE}:${TAG_PREFIX}$(yq ".snapshot-controller.tag" "${BASE_DIR}/release-config.yaml")-eksbuild.${SC_EKSBUILD}" +export EBS_INSTALL_SNAPSHOT_CUSTOM_IMAGE="${REGISTRY}/snapshot-controller:${TAG_PREFIX}$(yq ".snapshot-controller.tag" "${BASE_DIR}/release-config.yaml")-eksbuild.${SC_EKSBUILD}" # Use a KOPS bucket specifically for the CSI components, as to not conflict # with any other clusters or E2E tests export KOPS_BUCKET="$(aws sts get-caller-identity --query Account --output text)-csi-components-e2e" diff --git a/hack/release-config.yaml b/hack/release-config.yaml index b850f52..e21a940 100644 --- a/hack/release-config.yaml +++ b/hack/release-config.yaml @@ -24,3 +24,6 @@ livenessprobe: snapshot-controller: tag: 'v8.5.0' eksbuild: '1' +volume-modifier-for-k8s: + tag: 'main' + eksbuild: '1' diff --git a/hack/static-config.yaml b/hack/static-config.yaml index c1cbc1c..5c0a5dc 100644 --- a/hack/static-config.yaml +++ b/hack/static-config.yaml @@ -29,3 +29,7 @@ livenessprobe: snapshot-controller: repo: https://github.com/kubernetes-csi/external-snapshotter targets: [amd64-linux-al2023, arm64-linux-al2023] +volume-modifier-for-k8s: + repo: https://github.com/ConnorJC3/volume-modifier-for-k8s + targets: [amd64-linux-al2023, arm64-linux-al2023] + e2e-parameter: sidecars.volumemodifier.image diff --git a/patches/dependency-patches.yaml b/patches/dependency-patches.yaml index 11e107f..1236fa0 100644 --- a/patches/dependency-patches.yaml +++ b/patches/dependency-patches.yaml @@ -17,3 +17,4 @@ csi-resizer: {} csi-snapshotter: {} livenessprobe: {} snapshot-controller: {} +volume-modifier-for-k8s: {}