From 32ef0b191cd1624c91cc005c8e0855de625df326 Mon Sep 17 00:00:00 2001 From: AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> Date: Tue, 8 Dec 2020 04:19:39 +0000 Subject: [PATCH] [kOps] Initial integration (#4729) * [teleport] Initial integration * Minor update to run tests again * [Kops] Initial integration * Minor adjustment * Run tests again * Removed comment * --depth'ed cloning of two repositories --- projects/kubernetes/Dockerfile | 10 ++++++---- projects/kubernetes/build.sh | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/projects/kubernetes/Dockerfile b/projects/kubernetes/Dockerfile index e91dc30f0..697bf0255 100644 --- a/projects/kubernetes/Dockerfile +++ b/projects/kubernetes/Dockerfile @@ -17,8 +17,10 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN go get github.com/ianlancetaylor/demangle -RUN git clone --depth 1 https://github.com/kubernetes/kubernetes.git $GOPATH/src/k8s.io/kubernetes +RUN git clone --depth 1 https://github.com/kubernetes/kubernetes.git +RUN git clone --depth 1 https://github.com/google/AFL +RUN git clone --depth 1 https://github.com/dvyukov/go-fuzz-corpus +RUN go get k8s.io/kops +WORKDIR $SRC/ -WORKDIR $GOPATH/src/k8s.io/kubernetes - -COPY build.sh $SRC/build.sh +COPY build.sh $SRC/ diff --git a/projects/kubernetes/build.sh b/projects/kubernetes/build.sh index 3b331ae99..38ae4406e 100755 --- a/projects/kubernetes/build.sh +++ b/projects/kubernetes/build.sh @@ -20,6 +20,13 @@ set -o pipefail set -o errexit set -x +# Compile kOps fuzzers +$GOPATH/src/k8s.io/kops/tests/fuzz/build.sh + + +# Compile Kubernetes fuzzers +mv $SRC/kubernetes $GOPATH/src/k8s.io/ + function compile_fuzzer { local pkg=$1 local function=$2