Bump kube-conformance from v1.11 to v1.15 to pick up newer test images,
e.g. nginx-slim only has arm64 support starting with the next version
after the one pinned by e2e tests in kubernetes v1.11.10, while
e2e.test binary only has proper etcd arm64 support starting with 1.15.
- update README;
- bump dockerhub image tag;
- bump git submodule pinned commit from upstream
heptio/kube-conformance;
- bump tag in image referenced by sonobuoy configuration;
While at it, also align related resource versions in K8s image:
- bump kubectl/gingo/e2e.test in K8s image from v1.13.0 to v1.15.x
(latest minor release available for the 1.15 major release);
- pin sonobuoy binary version to v0.14.3 tag;
- bump sonobuoy timeouts to accomodate runs on slower hardware;
Change-Id: Ia0e632219694a63e9cdf06d7e6dad89cff016361
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
- docker run -ti akraino/validation:kube-conformance-v1.11
+ docker run -ti akraino/validation:kube-conformance-v1.15
By default, the container will run the `run_e2e.sh` script. If you want to
enter the container, add */bin/sh* at the end of the command above
By default, the container will run the `run_e2e.sh` script. If you want to
enter the container, add */bin/sh* at the end of the command above
FROM golang:alpine3.9 as build
# Sonobuoy supports Kubernetes versions 1.11, 1.12 and 1.13
FROM golang:alpine3.9 as build
# Sonobuoy supports Kubernetes versions 1.11, 1.12 and 1.13
+ARG SB_TAG=v0.14.3
+# Determine the latest stable git tag at build time based on stable major version
+ARG K8S_VER=1.15
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
RUN apk --no-cache add --update \
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
RUN apk --no-cache add --update \
openssl \
python3 \
bash \
openssl \
python3 \
bash \
RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \
echo "Building docker on $HOST_ARCH" && \
cd /src/k8s.io/kubernetes && \
RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi && \
echo "Building docker on $HOST_ARCH" && \
cd /src/k8s.io/kubernetes && \
- git checkout $K8S_TAG && \
+ git checkout $(curl \
+ https://storage.googleapis.com/kubernetes-release/release/stable-$K8S_VER.txt) && \
make kubectl ginkgo && \
make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
make kubectl ginkgo && \
make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
-RUN go get -u -v github.com/heptio/sonobuoy
+RUN go get -d github.com/heptio/sonobuoy && \
+ cd /go/src/github.com/heptio/sonobuoy && \
+ git checkout $SB_TAG && \
+ go install
RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
RUN cat /opt/akraino/validation/bluval/requirements.txt >> \
/wheels/requirements/pip-requirements.txt
RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
RUN cat /opt/akraino/validation/bluval/requirements.txt >> \
/wheels/requirements/pip-requirements.txt
##############################################################################
export WORK_DIR?=$(TAG_PRE)
##############################################################################
export WORK_DIR?=$(TAG_PRE)
+export KUBE_VERSION=1.15
+export TAG_VER?=v$(KUBE_VERSION)
.PHONY: .build
.build:: .submodules_patched
.PHONY: .build
.build:: .submodules_patched
-Subproject commit 32d9e2a4edd5c354c97da0d1bd308473bf4f0c89
+Subproject commit 9cdcb010918c815a51ac627ce68fa6f3165beaf8
Run Sonobuoy Conformance Test
# Start the test
Run kubectl apply -f ${CURDIR}${/}sonobuoy.yaml
Run Sonobuoy Conformance Test
# Start the test
Run kubectl apply -f ${CURDIR}${/}sonobuoy.yaml
${rc} ${output}= Run And Return Rc And Output
... kubectl describe pod/sonobuoy -n heptio-sonobuoy
Append To File ${LOG} ${output}${\n}
# Wait until the test finishes execution
${rc} ${output}= Run And Return Rc And Output
... kubectl describe pod/sonobuoy -n heptio-sonobuoy
Append To File ${LOG} ${output}${\n}
# Wait until the test finishes execution
- Run while sonobuoy status | grep "Sonobuoy is still running"; do sleep 120; done
+ Run while sonobuoy status | grep "Sonobuoy is still running"; do sleep 180; done
Append To File ${LOG} "Sonobuoy has completed"${\n}
# Get the result and store the sonobuoy logs
Append To File ${LOG} "Sonobuoy has completed"${\n}
# Get the result and store the sonobuoy logs
- name: E2E_PARALLEL
value: '1'
command: ["/run_e2e.sh"]
- name: E2E_PARALLEL
value: '1'
command: ["/run_e2e.sh"]
- image: akraino/validation:kube-conformance-v1.11
+ image: akraino/validation:kube-conformance-v1.15
imagePullPolicy: Always
name: e2e
volumeMounts:
imagePullPolicy: Always
name: e2e
volumeMounts: