Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
role-session-name: GithubActionsSetup

- name: Login to Amazon ECR
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7

- name: Login to Amazon ECR Public
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7
env:
AWS_REGION: us-east-1
with:
Expand All @@ -73,12 +73,12 @@ jobs:
image: public.ecr.aws/eks-distro-build-tooling/binfmt-misc:qemu-v7.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0

# yq isn't pre-installed on the CodeBuild runners, so install it here
- name: Build Images
run: |
wget https://github.com/mikefarah/yq/releases/download/v4.53.3/yq_linux_amd64 -O /usr/local/bin/yq
wget https://github.com/mikefarah/yq/releases/download/v4.53.6/yq_linux_amd64 -O /usr/local/bin/yq
chmod +x /usr/local/bin/yq
make setup-ecr
make -j `nproc` all-image
Expand All @@ -97,12 +97,12 @@ jobs:
role-session-name: GithubActionsTrivy

- name: Login to Amazon ECR
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7

# ECR Public has a per-IP ratelist for unauthenticated users, which is often hit on
# GitHub actions due to jobs sharing IPs - this ensures we don't get rate limited
- name: Login to Amazon ECR Public
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7
env:
AWS_REGION: us-east-1
with:
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
role-session-name: GithubActionsE2E

- name: Login to Amazon ECR Public
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7
env:
AWS_REGION: us-east-1
with:
Expand All @@ -180,11 +180,11 @@ jobs:
image: public.ecr.aws/eks-distro-build-tooling/binfmt-misc:qemu-v7.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0

# yq isn't pre-installed on the CodeBuild runners, so install it here
- name: Run Tests
run: |
wget https://github.com/mikefarah/yq/releases/download/v4.53.3/yq_linux_amd64 -O /usr/local/bin/yq
wget https://github.com/mikefarah/yq/releases/download/v4.53.6/yq_linux_amd64 -O /usr/local/bin/yq
chmod +x /usr/local/bin/yq
make e2e/${{ matrix.test }}
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
role-session-name: GithubActionsRelease

- name: Login to Amazon ECR
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7

- name: Login to Amazon ECR Public
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7
env:
AWS_REGION: us-east-1
with:
Expand All @@ -62,11 +62,11 @@ jobs:
image: public.ecr.aws/eks-distro-build-tooling/binfmt-misc:qemu-v7.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0

# yq isn't pre-installed on the CodeBuild runners, so install it here
- name: Build Images
run: |
wget https://github.com/mikefarah/yq/releases/download/v4.53.3/yq_linux_amd64 -O /usr/local/bin/yq
wget https://github.com/mikefarah/yq/releases/download/v4.53.6/yq_linux_amd64 -O /usr/local/bin/yq
chmod +x /usr/local/bin/yq
make -j `nproc` all-image
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

- name: Self-hosted Renovate
uses: renovatebot/github-action@e09d604f8f803bb527bd8321ed5be06c460b8682 # v46.2.2
uses: renovatebot/github-action@5402b206248e5a8c8427a15102702eb9c1793efc # v46.2.4
with:
token: ${{ secrets.RENOVATE_TOKEN }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy-published.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
# This also allows us to easily scan all images in a single place as some images (e.g.
# the volume-modifier-for-k8s image) are promoted to separate registries
- name: Login to Amazon ECR
uses: aws-actions/amazon-ecr-login@d539f0932e70871a027e9d5a9d8fc38589180a64 # v2.1.6
uses: aws-actions/amazon-ecr-login@03f1aad4c6c7ffd436567f42f9384779290529bd # v2.1.7

- name: Run Trivy (SARIF Output)
env:
OUTPUT_SARIF: 'true'
run: make all-trivy

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
uses: github/codeql-action/upload-sarif@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
with:
sarif_file: output/
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.26@sha256:0d1d3a794be25f809dd2cb3160d8c73276c4056a9f8242a138e908ddeee7b6b6 AS builder
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/golang:1.27@sha256:65b6f280bf050ec5af12716857e8ea8439d694dbba8f31ceeb7630670071f2bb AS builder
RUN go env -w GOCACHE=/gocache GOMODCACHE=/gomodcache
ARG GOPROXY
# Dependencies not in builder image: yq and go-licenses
RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache go install github.com/mikefarah/yq/v4@v4.53.3
RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache go install github.com/mikefarah/yq/v4@v4.53.6
RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache go install github.com/google/go-licenses/v2@v2.0.1

WORKDIR /app/
Expand All @@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/gomodcache --mount=type=cache,target=/gocache cd
export GOFLAGS=-mod=mod && \
go-licenses save $(go list ./...) --save_path /app/licenses/

FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base:latest-al23@sha256:d5579df2a52118ac22a20a98a47399f7802e50ac833ae922424e388f2edb4ba0 AS linux-al2023
FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base:latest-al23@sha256:e659c829d1c18dd8937ce9e7a598cefe9bd5190879359bc1959655edf67b495c AS linux-al2023
COPY --from=builder /app/bin/$ENTRYPOINT /$ENTRYPOINT
COPY --from=builder /app/licenses/ /licenses/
ENTRYPOINT ["/$ENTRYPOINT"]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ REGISTRY?=$(shell aws sts get-caller-identity --query Account --output text).dkr
BUILD_PLATFORMS?=linux amd64
# Version of EBS CSI Driver to use for E2E testing
# This should be a git tag or branch
E2E_EBS_CSI_VERSION?=release-1.63
E2E_EBS_CSI_VERSION?=release-1.64
# Tag prefix (used for CI)
TAG_PREFIX?=
# Files to rebuild when changed
Expand Down
Loading