From 9e3249539861ecb37bb83aea9a9a8d9830e353da Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Thu, 11 Apr 2019 16:54:40 +0300 Subject: [PATCH] Add container scripts for k8s conformance test JIRA: VAL-9 Added the Dockerfile that installs - kubectl, e2e.test, ginkgo - sonobuoy - robot framework Makefile that can be used to build the container and push it, including manifest list for both x86_64 and aarch64. Check the README file for usage. Until we have the official build in place, test images are available at cristinapauna/akraino_validation:k8s-latest Manual testing performed on the images: - e2e.test command was verified using: e2e.test -ginkgo.focus "\[Conformance\]" -ginkgo.noColor -ginkgo.skip \ 'Alpha|Disruptive|Feature|Flaky' -kubeconfig /root/.kube/config -provider local - sonobuoy was tested with the command: sonobuoy run --wait - robot framework was tested using https://github.com/robotframework/RobotDemo robot --name Robot --loglevel DEBUG keyword_driven.robot data_driven.robot \ gherkin.robot Change-Id: I9d661895cb85f030993f2205b7ca4115f46ec21b Signed-off-by: Cristina Pauna Signed-off-by: Alexandru Avadanii --- .gitignore | 2 ++ .gitreview | 5 ++++ docker/Makefile | 36 +++++++++++++++++++++++ docker/README.rst | 37 +++++++++++++++++++++++ docker/build.mk | 52 +++++++++++++++++++++++++++++++++ docker/k8s/Dockerfile | 65 +++++++++++++++++++++++++++++++++++++++++ docker/k8s/Makefile | 23 +++++++++++++++ docker/k8s/pip-requirements.txt | 4 +++ 8 files changed, 224 insertions(+) create mode 100644 .gitignore create mode 100644 .gitreview create mode 100644 docker/Makefile create mode 100644 docker/README.rst create mode 100644 docker/build.mk create mode 100644 docker/k8s/Dockerfile create mode 100644 docker/k8s/Makefile create mode 100644 docker/k8s/pip-requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..59230bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +docker/manifest-tool +*.sw? diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..4b0d2fd --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=validation.git +defaultbranch=master diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 0000000..65ad526 --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2019 AT&T, ENEA AB, Nokia and others # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you maynot use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +SUBDIRS := $(wildcard */.) +SUBDIRS_NAME := $(SUBDIRS:/.=) +SUBDIRS_BUILD := $(SUBDIRS:/.=-build) +SUBDIRS_PUSH := $(SUBDIRS:/.=-push) + +.PHONY: all +all: $(SUBDIRS_NAME) + +.PHONY: build-all +build-all: $(SUBDIRS_BUILD) + +.PHONY: $(SUBDIRS_NAME) +$(SUBDIRS_NAME): + $(MAKE) -C $@ + +.PHONY: $(SUBDIRS_BUILD) +$(SUBDIRS_BUILD): $(SUBDIRS) + $(MAKE) -C $< build + +include build.mk diff --git a/docker/README.rst b/docker/README.rst new file mode 100644 index 0000000..8182b73 --- /dev/null +++ b/docker/README.rst @@ -0,0 +1,37 @@ +.. ############################################################################ +.. Copyright (c) 2019 AT&T, ENEA AB, Nokia and others # +.. # +.. Licensed under the Apache License, Version 2.0 (the "License"); # +.. you maynot use this file except in compliance with the License. # +.. # +.. You may obtain a copy of the License at # +.. http://www.apache.org/licenses/LICENSE-2.0 # +.. # +.. Unless required by applicable law or agreed to in writing, software # +.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +.. See the License for the specific language governing permissions and # +.. limitations under the License. # +.. ############################################################################ + + +Overview +======== + +The Makefile in this directory is used to build and push all +the validation containers. The command to do that is: + make all REGISTRY= +To just build the containers, use the command: + make build-all REGISTRY= + +The k8s container +================= + +To build just the k8s container, use the command: + make k8s-build REGISTRY= +To both build and push the container, use the command: + make k8s REGISTRY= + +Container should be started with the admin.conf file mounted: +docker run -ti -v /home/jenkins/admin.conf:/root/.kube/config \ +/akraino_validation:k8s-latest /bin/sh diff --git a/docker/build.mk b/docker/build.mk new file mode 100644 index 0000000..dde61fe --- /dev/null +++ b/docker/build.mk @@ -0,0 +1,52 @@ +############################################################################## +# Copyright (c) 2019 AT&T, ENEA AB, Nokia and others # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you maynot use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + + +# declare the variables +REGISTRY ?= # TBD +NAME ?= akraino_validation +TAG_PRE ?= $(notdir $(CURDIR)) +TAG_VER ?= latest +DOCKERFILE ?= Dockerfile +MTOOL ?= $(dir $(realpath $(lastword $(MAKEFILE_LIST))))/manifest-tool + +# get the architecture of the host +HOST_ARCH = amd64 +ifeq ($(shell uname -m), aarch64) + HOST_ARCH = arm64 +endif + +$(MTOOL): + wget https://github.com/estesp/manifest-tool/releases/download/v0.9.0/manifest-tool-linux-$(HOST_ARCH) -O $@ + sudo chmod +x $@ + +.PHONY: .build +.build: + docker build \ + -t $(REGISTRY)/$(NAME):$(TAG_PRE)-$(HOST_ARCH)-$(TAG_VER) \ + -f $(DOCKERFILE) \ + . + +.PHONY: .push_image +.push_image: .build + docker push $(REGISTRY)/$(NAME):$(TAG_PRE)-$(HOST_ARCH)-$(TAG_VER) + +.PHONY: .push_manifest +.push_manifest: $(MTOOL) + $(MTOOL) push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template $(REGISTRY)/$(NAME):$(TAG_PRE)-ARCH-$(TAG_VER) \ + --target $(REGISTRY)/$(NAME):$(TAG_PRE)-$(TAG_VER) diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile new file mode 100644 index 0000000..1d41d00 --- /dev/null +++ b/docker/k8s/Dockerfile @@ -0,0 +1,65 @@ +############################################################################## +# Copyright (c) 2019 AT&T, ENEA AB, Nokia and others # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you maynot use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +# ref: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#use-multi-stage-builds +FROM golang:alpine3.9 as build + +# Sonobuoy supports Kubernetes versions 1.11, 1.12 and 1.13 +ARG K8S_TAG=v1.13.0 + +# Install dependencies +COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt +RUN apk --no-cache add --update \ + openssl \ + python3 \ + bash \ + findutils \ + gcc \ + git \ + grep \ + libc-dev \ + libffi \ + libffi-dev \ + make \ + openssl-dev \ + python3-dev \ + py3-pip \ + rsync + +# Build binaries; detect the architecture automatically (default is amd64) +RUN git clone https://github.com/kubernetes/kubernetes /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 && \ + make kubectl ginkgo && \ + make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH +RUN go get -u -v github.com/heptio/sonobuoy + +WORKDIR /wheels +RUN pip3 install wheel +RUN pip3 wheel -r /wheels/requirements/pip-requirements.txt + +# Copy binaries in the final contaier and install robot framework +FROM python:3.6-alpine3.9 +COPY --from=build /src/k8s.io/kubernetes/_output/bin /usr/local/bin +COPY --from=build /go/bin/sonobuoy /bin/sonobuoy +COPY --from=build /wheels /wheels + +RUN pip3 install -r /wheels/requirements/pip-requirements.txt \ + -f /wheels && \ + rm -rf /wheels && \ + rm -rf /root/.cache/pip/* diff --git a/docker/k8s/Makefile b/docker/k8s/Makefile new file mode 100644 index 0000000..a5b4099 --- /dev/null +++ b/docker/k8s/Makefile @@ -0,0 +1,23 @@ +############################################################################## +# Copyright (c) 2019 AT&T, ENEA AB, Nokia and others # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you maynot use this file except in compliance with the License. # +# # +# You may obtain a copy of the License at # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +############################################################################## + +.PHONY: all +all: .push_image .push_manifest + +.PHONY: build +build: .build + +include ../build.mk diff --git a/docker/k8s/pip-requirements.txt b/docker/k8s/pip-requirements.txt new file mode 100644 index 0000000..6139a45 --- /dev/null +++ b/docker/k8s/pip-requirements.txt @@ -0,0 +1,4 @@ +robotframework +robotframework-httplibrary +robotframework-requests +robotframework-sshlibrary -- 2.16.6