Skip to content

Commit 6e0516f

Browse files
committed
Refactor the Makefile and hack/ scripts
See the description of PR 1856 for more information about this change Signed-off-by: Connor Catlett <conncatl@amazon.com>
1 parent e0fdc58 commit 6e0516f

48 files changed

Lines changed: 1171 additions & 1006 deletions

Some content is hidden

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

.dockerignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.github/
2+
.idea/
3+
bin/
4+
hack/
5+
charts/
6+
deploy/
7+
docs/
8+
examples/

.github/workflows/publish-ecr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
4040
4141
- name: Build, tag, and push manifest to Amazon ECR
42-
run: make -j `nproc` all-push
42+
run: make -j `nproc` all-push-with-a1compat
4343

4444
ecr-public:
4545
name: Push to ECR Public

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ vendor/
3333

3434
# Files used by Makefile when upgrading sidecars
3535
hack/release-scripts/image-digests.yaml
36+
37+
# E2E artifacts
38+
_rundir/
39+
_artifacts/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ COPY . .
2424
ARG TARGETOS
2525
ARG TARGETARCH
2626
ARG VERSION
27-
RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
27+
RUN OS=$TARGETOS ARCH=$TARGETARCH make
2828

2929
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest-al23 AS linux-al2023
3030
COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver

0 commit comments

Comments
 (0)