[wip] EBS CSI Driver base utils image update

Makefile

@@ -32,6 +32,8 @@ endif
 
 export GO111MODULE=auto
 
+VERSION = $(shell cat ecs-init/ECSVERSION)
+
 all: docker
 
 # Dynamic go build; useful in that it does not have -a so it won't recompile
@@ -315,6 +317,12 @@ EBS_CSI_DRIVER_DIR=./ecs-agent/daemonimages/csidriver
 ebs-csi-driver:
 	$(MAKE) -C $(EBS_CSI_DRIVER_DIR) $(MFLAGS) bin/ebs-csi-driver
 
+# This is used to build the EBS CSI driver tar files during ECS Init RPM builds via CodeBuild
+ebs-csi-driver-codebuild:
+	$(MAKE) -C $(EBS_CSI_DRIVER_DIR) $(MFLAGS) tarfiles/ebs-csi-driver.tar
+	cp $(EBS_CSI_DRIVER_DIR)/tarfiles/ebs-csi-driver.tar ebs-csi-driver-v${VERSION}.tar
+	cp $(EBS_CSI_DRIVER_DIR)/tarfiles/ebs-csi-driver.tar ebs-csi-driver-arm64-v${VERSION}.tar
+
 # Starts EBS CSI Driver as a background process.
 # The driver uses /tmp/ebs-csi-driver.sock as the socket file.
 start-ebs-csi-driver: ebs-csi-driver
@@ -417,7 +425,7 @@ amazon-linux-sources.tgz:
 amazon-linux-rpm-integrated: .amazon-linux-rpm-integrated-done
 
 # Make target for Amazon Linux Codebuild jobs
-.amazon-linux-rpm-codebuild-done: get-cni-sources
+.amazon-linux-rpm-codebuild-done: get-cni-sources ebs-csi-driver-codebuild
 	./scripts/update-version.sh
 	cp packaging/amazon-linux-ami-integrated/ecs-agent.spec ecs-agent.spec
 	cp packaging/amazon-linux-ami-integrated/ecs.conf ecs.conf
@@ -448,8 +456,6 @@ amazon-linux-rpm-codebuild: .amazon-linux-rpm-codebuild-done
 # Build init rpm
 generic-rpm-integrated: .generic-rpm-integrated-done
 
-VERSION = $(shell cat ecs-init/ECSVERSION)
-
 .generic-deb-integrated-done: get-cni-sources
 	./scripts/update-version.sh
 	mkdir -p BUILDROOT
@@ -513,6 +519,8 @@ clean:
 	-rm -f .generic-rpm-integrated-done
 	-rm -f amazon-ecs-volume-plugin
 	-rm -rf $(EBS_CSI_DRIVER_DIR)/bin
+	-rm -rf $(EBS_CSI_DRIVER_DIR)/tarfiles
+	-rm -f ebs-csi-driver-*.tar
 	-rm -rf /tmp/private-test-registry-htpasswd # private registry credentials cleanup
 
 clean-all: clean

ecs-agent/daemonimages/csidriver/Dockerfile

@@ -20,7 +20,7 @@ ADD . /go/src/
 RUN make bin/ebs-csi-driver
 
 # use minimal eks base for csi driver image to add required mount utils
-FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al2
+FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al23
 
 MAINTAINER Amazon Web Services, Inc.
 COPY --from=build /go/src/bin/ebs-csi-driver /bin/ebs-csi-driver

packaging/amazon-linux-ami-integrated/ecs-agent.spec

@@ -24,6 +24,7 @@
 %global no_exec_perm 644
 %global debug_package %{nil}
 %global agent_image ecs-agent-v%{version}.tar
+%global ebs_csi_driver_dir /var/lib/ecs/deps/daemons/ebs-csi-driver
 
 Name:           ecs-init
 Version:        1.91.0
@@ -38,6 +39,8 @@ Source2:        ecs.service
 Source3:        amazon-ecs-volume-plugin.service
 Source4:        amazon-ecs-volume-plugin.socket
 Source5:        amazon-ecs-volume-plugin.conf
+Source6:        ebs-csi-driver-arm64-v%{version}.tar
+Source7:        ebs-csi-driver-v%{version}.tar
 
 BuildRequires:  golang >= 1.22.0
 %if %{with systemd}
@@ -171,6 +174,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/ecs
 touch %{buildroot}%{_sysconfdir}/ecs/ecs.config
 touch %{buildroot}%{_sysconfdir}/ecs/ecs.config.json
 
+mkdir -p %{buildroot}%{ebs_csi_driver_dir}
+%ifarch aarch64
+install -m %{no_exec_perm} -D %{SOURCE6} %{buildroot}%{ebs_csi_driver_dir}/ebs-csi-driver.tar
+%else
+install -m %{no_exec_perm} -D %{SOURCE7} %{buildroot}%{ebs_csi_driver_dir}/ebs-csi-driver.tar
+%endif
+
 # Configure ecs-init to reload the bundled ECS container agent image.
 mkdir -p %{buildroot}%{_cachedir}/ecs
 echo 2 > %{buildroot}%{_cachedir}/ecs/state
@@ -198,6 +208,8 @@ install -m %{no_exec_perm} -D %{SOURCE5} %{buildroot}%{_sysconfdir}/init/amazon-
 %{_cachedir}/ecs/%{basename:%{agent_image}}
 %{_cachedir}/ecs/state
 %dir %{_sharedstatedir}/ecs/data
+%dir %{ebs_csi_driver_dir}
+%{ebs_csi_driver_dir}/ebs-csi-driver.tar
 
 %if %{with systemd}
 %{_unitdir}/ecs.service