Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add src to Dockerfile.kubetest2, use AWS CLI v2 #372

Merged
merged 6 commits into from
Nov 13, 2023
Merged

Add src to Dockerfile.kubetest2, use AWS CLI v2 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb800ec
Add src to Dockerfile.kubetest2, use AWS CLI v2
cartermckinnon Nov 12, 2023
753a386
Fix build script
cartermckinnon Nov 12, 2023
035dbec
Add root to go.work
cartermckinnon Nov 12, 2023
66244ac
Remove go.work.sum
cartermckinnon Nov 12, 2023
a19d74c
Disable workspace mode in hack/build.sh
cartermckinnon Nov 12, 2023
5a933c9
Add build-kubetest2 to CI workflow
cartermckinnon Nov 12, 2023
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
12 changes: 11 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: make build
- run: make build
build-kubetest2:
runs-on: ubuntu-latest
strategy:
# don't bail out of all sub-tasks if one fails
fail-fast: false
matrix:
k8s_version: ["1.23", "1.24", "1.25", "1.26", "1.27", "1.28"]
steps:
- uses: actions/checkout@v3
- run: docker build --build-arg=KUBERNETES_MINOR_VERSION=${{ matrix.k8s_version }} --file Dockerfile.kubetest2 .
9 changes: 8 additions & 1 deletion Dockerfile.kubetest2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:2
ARG TARGETOS
ARG TARGETARCH
WORKDIR /workdir
RUN yum install -y git tar gzip make unzip gcc rsync wget jq aws-cli && amazon-linux-extras install python3.8
RUN yum install -y git tar gzip make unzip gcc rsync wget jq && amazon-linux-extras install python3.8

RUN mkdir /info
ENV PATH=$PATH:/info

RUN wget -O awscli.zip https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip && \
unzip awscli.zip && \
./aws/install

ARG GO_MINOR_VERSION="1.21"
RUN curl https://go.dev/dl/?mode=json | jq -r .[].version | grep "^go${GO_MINOR_VERSION}" | head -n1 > go-version.txt
RUN wget -O go.tar.gz https://go.dev/dl/$(cat go-version.txt).${TARGETOS}-${TARGETARCH}.tar.gz && \
Expand Down Expand Up @@ -53,4 +57,7 @@ RUN go install ./kubetest2-eksctl

RUN rm -rf /workdir

WORKDIR $GOPATH/src/github.com/aws/aws-k8s-tester
COPY . .

ENTRYPOINT ["kubetest2"]
4 changes: 3 additions & 1 deletion e2e2/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
_bin/
_bin/
bin/
_rundir/
1 change: 1 addition & 0 deletions go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
go 1.21

use (
.
./e2e2
./kubetest2
)
3 changes: 2 additions & 1 deletion hack/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ for arch in ${ARCHS}; do
CGO_ENABLED=0 \
GOARCH=${arch} \
GOOS=${os} \
GOWORK=off \
go build \
-mod=mod -v \
-v \
-ldflags "-s -w \
-X ${PACKAGE_NAME}/version.GitCommit=${GIT_COMMIT} \
-X ${PACKAGE_NAME}/version.ReleaseVersion=${RELEASE_VERSION} \
Expand Down
Loading