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

Jump to bottom

Add kubetest2-tester-ginkgo-v1 #382

Merged
merged 4 commits into from
Nov 26, 2023
Merged

Add kubetest2-tester-ginkgo-v1 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7b527d
Add kubetest2-tester-ginkgo-v1
cartermckinnon Nov 25, 2023
9fb13a3
Vendor dependencies to speed up builds and reduce CI flakes
cartermckinnon Nov 26, 2023
7680767
Sync go workspace
cartermckinnon Nov 26, 2023
eab5361
Reorganize Dockerfile.kubetest2
cartermckinnon Nov 26, 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
57 changes: 26 additions & 31 deletions Dockerfile.kubetest2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2
FROM public.ecr.aws/amazonlinux/amazonlinux:2 AS builder
ARG TARGETOS
ARG TARGETARCH
WORKDIR /workdir
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

RUN yum install -y git tar gzip make unzip gcc rsync wget jq
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 All @@ -19,8 +10,25 @@ RUN wget -O go.tar.gz https://go.dev/dl/$(cat go-version.txt).${TARGETOS}-${TAR
ENV GOPATH=/usr/local/go
ENV PATH=$PATH:$GOPATH/bin
ENV GOPROXY=direct
ARG KUBETEST2_VERSION=v0.0.0-20231113220322-d7fcb799ce84
RUN go install sigs.k8s.io/kubetest2/...@${KUBETEST2_VERSION}
WORKDIR $GOPATH/src/github.com/aws/aws-k8s-tester/kubetest2
COPY kubetest2/ .
RUN go install ./...
WORKDIR $GOPATH/github.com/aws/aws-k8s-tester/e2e2
COPY e2e2/ .
RUN go test -c ./test/cases/nvidia -o $GOPATH/bin/nvidia.test

FROM public.ecr.aws/amazonlinux/amazonlinux:2
ARG TARGETOS
ARG TARGETARCH
WORKDIR /workdir
RUN yum install -y tar gzip unzip wget
RUN wget -O awscli.zip https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip && \
unzip awscli.zip && \
./aws/install
# we need gsutil from the gcloud CLI for kubetest-tester-ginkgo
RUN amazon-linux-extras install python3.8
ARG GCLOUD_SDK_URL=https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz
RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
tar xzf google-cloud-sdk.tar.gz -C / && \
Expand All @@ -31,9 +39,14 @@ RUN wget -O google-cloud-sdk.tar.gz -q $GCLOUD_SDK_URL && \
--path-update=false \
--usage-reporting=false
ENV PATH=$PATH:/google-cloud-sdk/bin

ARG EKSCTL_VERSION=latest
RUN wget -O eksctl.tar.gz "https://github.com/eksctl-io/eksctl/releases/${EKSCTL_VERSION}/download/eksctl_Linux_${TARGETARCH}.tar.gz" && \
tar xzf eksctl.tar.gz -C /bin/ && \
rm eksctl.tar.gz
ARG KUBERNETES_MINOR_VERSION
RUN wget -O kubernetes-version.txt https://storage.googleapis.com/kubernetes-release/release/stable-${KUBERNETES_MINOR_VERSION}.txt
RUN mkdir /info
ENV PATH=$PATH:/info
RUN cp kubernetes-version.txt /info/
RUN wget -O kubernetes-client.tar.gz https://storage.googleapis.com/kubernetes-release/release/$(cat kubernetes-version.txt)/kubernetes-client-${TARGETOS}-${TARGETARCH}.tar.gz && \
tar xzf kubernetes-client.tar.gz -C / && \
Expand All @@ -42,23 +55,5 @@ RUN wget -O kubernetes-test.tar.gz https://storage.googleapis.com/kubernetes-rel
tar xzf kubernetes-test.tar.gz -C / && \
rm kubernetes-test.tar.gz
RUN mv /kubernetes/*/bin/* /bin/

ARG EKSCTL_VERSION=latest
RUN wget -O eksctl.tar.gz "https://github.com/eksctl-io/eksctl/releases/${EKSCTL_VERSION}/download/eksctl_Linux_${TARGETARCH}.tar.gz" && \
tar xzf eksctl.tar.gz -C /bin/ && \
rm eksctl.tar.gz

ARG KUBETEST2_VERSION=v0.0.0-20231113220322-d7fcb799ce84
RUN go install sigs.k8s.io/kubetest2/...@${KUBETEST2_VERSION}

COPY kubetest2/ .
RUN ls -la
RUN go install ./kubetest2-eksctl
RUN go install ./kubetest2-eksapi
RUN go install ./kubetest2-eksapi-janitor

RUN rm -rf /workdir

WORKDIR $GOPATH/src/github.com/aws/aws-k8s-tester
COPY . .
RUN go mod download
COPY --from=builder /usr/local/go/bin/* /bin/
32 changes: 10 additions & 22 deletions e2e2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ module github.com/aws/aws-k8s-tester/e2e2
go 1.21

require (
github.com/kubeflow/mpi-operator v0.4.0
github.com/stretchr/testify v1.8.4
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/cli-runtime v0.28.3
Expand All @@ -11,22 +14,9 @@ require (
)

require (
github.com/aws/aws-sdk-go-v2 v1.22.0 // indirect
github.com/aws/aws-sdk-go-v2/config v1.20.0 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.14.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.4.0 // indirect
github.com/aws/aws-sdk-go-v2/service/eks v1.31.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.16.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.24.0 // indirect
github.com/aws/smithy-go v1.16.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.2.4 // indirect
Expand All @@ -37,15 +27,13 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kubeflow/common v0.4.6 // indirect
github.com/kubeflow/mpi-operator v0.4.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -54,26 +42,26 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/vladimirvivien/gexe v0.2.0 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/controller-runtime v0.15.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
Expand Down
Loading