Skip to content

Commit

Permalink
Refactor the Makefile and hack/ scripts
Browse files Browse the repository at this point in the history
See the description of PR 1856 for more information about this change

Signed-off-by: Connor Catlett <[email protected]>
  • Loading branch information
ConnorJC3 committed Dec 7, 2023
1 parent a83fbd1 commit 9caebab
Show file tree
Hide file tree
Showing 48 changed files with 1,175 additions and 1,005 deletions.
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.github/
.idea/
bin/
hack/
charts/
deploy/
docs/
examples/
2 changes: 1 addition & 1 deletion .github/workflows/publish-ecr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
- name: Build, tag, and push manifest to Amazon ECR
run: make -j `nproc` all-push
run: make -j `nproc` all-push-with-a1compat

ecr-public:
name: Push to ECR Public
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ vendor/

# Files used by Makefile when upgrading sidecars
hack/release-scripts/image-digests.yaml

# E2E artifacts
_rundir/
_artifacts/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY . .
ARG TARGETOS
ARG TARGETARCH
ARG VERSION
RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH
RUN OS=$TARGETOS ARCH=$TARGETARCH make

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

0 comments on commit 9caebab

Please sign in to comment.