Remove tar build rules

aws · Jun 28, 2023 · 3892d49 · 3892d49
1 parent 3b06de6
commit 3892d49
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 38 deletions.
diff --git a/ecs-agent/daemon_images/csi-driver/Dockerfile.csi_driver b/ecs-agent/daemon_images/csi-driver/Dockerfile.csi_driver
diff --git a/ecs-agent/daemon_images/csi-driver/build-image-as-tar b/ecs-agent/daemon_images/csi-driver/build-image-as-tar
diff --git a/ecs-agent/daemon_images/csi-driver/tarfiles/csi-driver-linux-amd64.tar b/ecs-agent/daemon_images/csi-driver/tarfiles/csi-driver-linux-amd64.tar
diff --git a/ecs-agent/daemon_images/csi-driver/Makefile → ecs-agent/daemonimages/csidriver/Makefile b/ecs-agent/daemon_images/csi-driver/Makefile → ecs-agent/daemonimages/csidriver/Makefile
@@ -8,9 +8,6 @@ CSI_DRIVER_SOURCES=$(shell find $(SOURCEDIR) -name '*.go')
 
 OS?=linux
 ARCH?=amd64
-.PHONY: build-image
-build-image: bin/csi-driver
-	OS=$(OS) ARCH=$(ARCH) ./build-image-as-tar
 
 # Build binary for linux only
 .PHONY: bin/csi-driver
@@ -22,7 +19,7 @@ bin/csi-driver: $(CSI_DRIVER_SOURCES)
 
 .PHONY: test
 test:
-	go test -v -race -tags unit -timeout=120s ./...
+	go test -v -race -tags unit -timeout=60s ./...
 
 # please include this `mockgen` into PATH
 bin/mockgen: | bin
@@ -34,4 +31,4 @@ mockgen: bin/mockgen
 
 .PHONY: clean
 clean:
-	rm -rf bin/*
+	rm -rf bin/
diff --git a/...daemon_images/csi-driver/driver/driver.go → ...t/daemonimages/csidriver/driver/driver.go b/...daemon_images/csi-driver/driver/driver.go → ...t/daemonimages/csidriver/driver/driver.go
@@ -21,8 +21,8 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/util"
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/version"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/util"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/version"
 )
 
 type Driver struct {

diff --git a/...n_images/csi-driver/driver/driver_test.go → ...monimages/csidriver/driver/driver_test.go b/...n_images/csi-driver/driver/driver_test.go → ...monimages/csidriver/driver/driver_test.go
diff --git a/...on_images/csi-driver/driver/mock_mount.go → ...emonimages/csidriver/driver/mock_mount.go b/...on_images/csi-driver/driver/mock_mount.go → ...emonimages/csidriver/driver/mock_mount.go
diff --git a/.../daemon_images/csi-driver/driver/mount.go → ...nt/daemonimages/csidriver/driver/mount.go b/.../daemon_images/csi-driver/driver/mount.go → ...nt/daemonimages/csidriver/driver/mount.go
@@ -16,7 +16,7 @@ package driver
 import (
 	mountutils "k8s.io/mount-utils"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/mounter"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
 )
 
 // Mounter is the interface implemented by NodeMounter.

diff --git a/...n_images/csi-driver/driver/mount_linux.go → ...monimages/csidriver/driver/mount_linux.go b/...n_images/csi-driver/driver/mount_linux.go → ...monimages/csidriver/driver/mount_linux.go
diff --git a/...ges/csi-driver/driver/mount_linux_test.go → ...ages/csidriver/driver/mount_linux_test.go b/...ges/csi-driver/driver/mount_linux_test.go → ...ages/csidriver/driver/mount_linux_test.go
diff --git a/...images/csi-driver/driver/mount_windows.go → ...nimages/csidriver/driver/mount_windows.go b/...images/csi-driver/driver/mount_windows.go → ...nimages/csidriver/driver/mount_windows.go
@@ -19,7 +19,7 @@ package driver
 import (
 	"fmt"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/mounter"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
 )
 
 func (m *NodeMounter) PathExists(path string) (bool, error) {

diff --git a/...t/daemon_images/csi-driver/driver/node.go → ...ent/daemonimages/csidriver/driver/node.go b/...t/daemon_images/csi-driver/driver/node.go → ...ent/daemonimages/csidriver/driver/node.go
@@ -21,7 +21,7 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/klog/v2"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/volume"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/volume"
 )
 
 // nodeService represents the node service of CSI driver

diff --git a/...on_images/csi-driver/driver/node_linux.go → ...emonimages/csidriver/driver/node_linux.go b/...on_images/csi-driver/driver/node_linux.go → ...emonimages/csidriver/driver/node_linux.go
diff --git a/...mon_images/csi-driver/driver/node_test.go → ...aemonimages/csidriver/driver/node_test.go b/...mon_images/csi-driver/driver/node_test.go → ...aemonimages/csidriver/driver/node_test.go
diff --git a/..._images/csi-driver/driver/node_windows.go → ...onimages/csidriver/driver/node_windows.go b/..._images/csi-driver/driver/node_windows.go → ...onimages/csidriver/driver/node_windows.go
@@ -19,7 +19,7 @@ package driver
 import (
 	"fmt"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/mounter"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/mounter"
 )
 
 // IsBlockDevice checks if the given path is a block device

diff --git a/ecs-agent/daemon_images/csi-driver/main.go → ecs-agent/daemonimages/csidriver/main.go b/ecs-agent/daemon_images/csi-driver/main.go → ecs-agent/daemonimages/csidriver/main.go
@@ -18,7 +18,7 @@ import (
 
 	"k8s.io/klog/v2"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/driver"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/driver"
 )
 
 func main() {

diff --git a/.../csi-driver/mounter/mock_mount_windows.go → ...s/csidriver/mounter/mock_mount_windows.go b/.../csi-driver/mounter/mock_mount_windows.go → ...s/csidriver/mounter/mock_mount_windows.go
diff --git a/...s/csi-driver/mounter/safe_mounter_unix.go → ...es/csidriver/mounter/safe_mounter_unix.go b/...s/csi-driver/mounter/safe_mounter_unix.go → ...es/csidriver/mounter/safe_mounter_unix.go
diff --git a/...-driver/mounter/safe_mounter_unix_test.go → ...idriver/mounter/safe_mounter_unix_test.go b/...-driver/mounter/safe_mounter_unix_test.go → ...idriver/mounter/safe_mounter_unix_test.go
diff --git a/...si-driver/mounter/safe_mounter_windows.go → ...csidriver/mounter/safe_mounter_windows.go b/...si-driver/mounter/safe_mounter_windows.go → ...csidriver/mounter/safe_mounter_windows.go
diff --git a/...agent/daemon_images/csi-driver/options.go → ecs-agent/daemonimages/csidriver/options.go b/...agent/daemon_images/csi-driver/options.go → ecs-agent/daemonimages/csidriver/options.go
diff --git a/.../daemon_images/csi-driver/options_test.go → ...nt/daemonimages/csidriver/options_test.go b/.../daemon_images/csi-driver/options_test.go → ...nt/daemonimages/csidriver/options_test.go
diff --git a/...nt/daemon_images/csi-driver/update-gomock → ...gent/daemonimages/csidriver/update-gomock b/...nt/daemon_images/csi-driver/update-gomock → ...gent/daemonimages/csidriver/update-gomock
diff --git a/...nt/daemon_images/csi-driver/util/fs/fs.go → ...gent/daemonimages/csidriver/util/fs/fs.go b/...nt/daemon_images/csi-driver/util/fs/fs.go → ...gent/daemonimages/csidriver/util/fs/fs.go
diff --git a/...ages/csi-driver/util/fs/fs_unsupported.go → ...mages/csidriver/util/fs/fs_unsupported.go b/...ages/csi-driver/util/fs/fs_unsupported.go → ...mages/csidriver/util/fs/fs_unsupported.go
diff --git a/...n_images/csi-driver/util/fs/fs_windows.go → ...monimages/csidriver/util/fs/fs_windows.go b/...n_images/csi-driver/util/fs/fs_windows.go → ...monimages/csidriver/util/fs/fs_windows.go
diff --git a/...nt/daemon_images/csi-driver/util/utils.go → ...gent/daemonimages/csidriver/util/utils.go b/...nt/daemon_images/csi-driver/util/utils.go → ...gent/daemonimages/csidriver/util/utils.go
diff --git a/...emon_images/csi-driver/version/version.go → ...daemonimages/csidriver/version/version.go b/...emon_images/csi-driver/version/version.go → ...daemonimages/csidriver/version/version.go
diff --git a/...aemon_images/csi-driver/volume/metrics.go → .../daemonimages/csidriver/volume/metrics.go b/...aemon_images/csi-driver/volume/metrics.go → .../daemonimages/csidriver/volume/metrics.go
@@ -16,7 +16,7 @@ package volume
 import (
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	"github.com/aws/amazon-ecs-agent/ecs-agent/daemon_images/csi-driver/util/fs"
+	"github.com/aws/amazon-ecs-agent/ecs-agent/daemonimages/csidriver/util/fs"
 )
 
 // MetricsProvider exposes metrics (e.g. used,available space) related to a

diff --git a/...mages/csi-driver/volume/metrics_errors.go → ...images/csidriver/volume/metrics_errors.go b/...mages/csi-driver/volume/metrics_errors.go → ...images/csidriver/volume/metrics_errors.go