.git/**,
.gitignore,
.gitreview,
- .gitmodules,
**.sw?,
**.orig
+++ /dev/null
-[submodule "sonobuoy-plugin-systemd-logs"]
- path = docker/sonobuoy-plugin-systemd-logs/sonobuoy-plugin-systemd-logs
- url = https://github.com/heptio/sonobuoy-plugin-systemd-logs
- branch = master
-[submodule "kube-conformance"]
- path = docker/kube-conformance/kube-conformance
- url = https://github.com/heptio/kube-conformance
- branch = master
The kube-conformance container
==============================
-Building and pushing the container
-----------------------------------
-
-To build just the kube-conformance container, use the command:
-
-.. code-block:: console
-
- make kube-conformance-build [ REGISTRY=<dockerhub_registry> NAME=<image_name>]
-
-To both build and push the container, use the command:
-
-.. code-block:: console
-
- make kube-conformance [ REGISTRY=<dockerhub_registry> NAME=<image_name>]
+The current kube-conformance image used is being pulled from k8s.gcr.io
+based on the kubernetes version the cluster is running on.
-Using the container
--------------------
-
-This is a standalone container able to launch Kubernetes end-to-end tests,
-for the purposes of conformance testing.
-
-It is a thin wrapper around the `e2e.test` binary in the upstream Kubernetes
-distribution, which drops results in a predetermined location for use as a
-[Heptio Sonobuoy](https://github.com/heptio/sonobuoy) plugin.
-
-To learn more about conformance testing and its Sonobuoy integration, read the
-[conformance guide](https://github.com/heptio/sonobuoy/blob/master/docs/conformance-testing.md).
-
-Example:
-
-.. code-block:: console
-
- docker run -ti akraino/validation:kube-conformance-v1.16
-
-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
-
-Normally, this conainer is not used directly, but instead leveraged via
-sonobuoy.
+For more information refer to https://sonobuoy.io/docs/v0.50.0/
The sonobuoy-plugin-systemd-logs container
==========================================
-Building and pushing the container
-----------------------------------
-
-To build just the sonobuoy-plugin-systemd-logs container, use the command:
-
-.. code-block:: console
-
- make sonobuoy-plugin-systemd-logs-build [ REGISTRY=<dockerhub_registry> NAME=<image_name>]
-
-To both build and push the container, use the command:
-
-.. code-block:: console
-
- make sonobuoy-plugin-systemd-logs [ REGISTRY=<dockerhub_registry> NAME=<image_name>]
-
-Using the container
--------------------
-
-This is a simple standalone container that gathers log information from
-systemd, by chrooting into the node's filesystem and running `journalctl`.
-
-This container is used by [Heptio Sonobuoy](https://github.com/heptio/sonobuoy)
-for gathering host logs in a Kubernetes cluster.
-
-Example:
-
-.. code-block:: console
-
- docker run -ti akraino/validation:sonobuoy-plugin-systemd-logs-latest
+The current sonobuoy-plugin-systemd-logs image used is being pulled from
+gcr.io/heptio-images repo with latest tag.
-By default, the container will run the `get_systemd_logs.sh` script. If you
-want to enter the container, add */bin/sh* at the end of the command above.
+For more information refer to https://sonobuoy.io/docs/v0.50.0/
-Normally, this conainer is not used directly, but instead leveraged via
-sonobuoy.
The openstack container
=======================
# minor versions before.
ARG SB_TAG=v0.16.1
# Determine the latest stable git tag at build time based on stable major version
-ARG K8S_VER=1.16
+ARG K8S_VER=1.18
# Install dependencies
COPY pip-requirements.txt /wheels/requirements/pip-requirements.txt
+++ /dev/null
-##############################################################################
-# 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. #
-##############################################################################
-
-export WORK_DIR?=$(TAG_PRE)
-export KUBE_VERSION=1.16
-export TAG_VER=v$(KUBE_VERSION)
-
-.PHONY: .build
-.build:: .submodules_patched
- $(MAKE) -C $(TAG_PRE) e2e.test kubectl ginkgo
-
-.PHONY: all
-all: push-image .push_manifest
-
-.PHONY: build
-build: .build
-
-.PHONY: push-image
-push-image: .push_image
-
-include ../build.mk
+++ /dev/null
-Subproject commit 9cdcb010918c815a51ac627ce68fa6f3165beaf8
+++ /dev/null
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 25 Jun 2019 17:59:13 +0200
-Subject: [PATCH] Dockerfile, Makefile: Add AArch64 support
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- Dockerfile | 6 ++++--
- Makefile | 8 +++++---
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Dockerfile b/Dockerfile
-index 289ac88..102685d 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -13,10 +13,12 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--FROM buildpack-deps:jessie-scm
-+FROM arm64v8/buildpack-deps:jessie-scm
- MAINTAINER Timothy St. Clair "tstclair@heptio.com"
-
--RUN apt-get update && apt-get -y --no-install-recommends install \
-+RUN echo 'Acquire::Check-Valid-Until "0";' > /etc/apt/apt.conf.d/10no--check-valid-until \
-+ && sed -i -e '/security/s/^/#/g' -e 's|deb.debian.org/debian|snapshot.debian.org/archive/debian/20190301T035241Z|g' /etc/apt/sources.list \
-+ && apt-get update && apt-get -y --no-install-recommends install \
- ca-certificates \
- && rm -rf /var/cache/apt/* \
- && rm -rf /var/lib/apt/lists/*
-diff --git a/Makefile b/Makefile
-index 4335cfd..bdaa52c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -29,6 +29,8 @@ is_root=$(filter 0,$(shell id -u))
- DOCKER?=$(if $(or $(in_docker_group),$(is_root)),docker,sudo docker)
- DIR := ${CURDIR}
-
-+export KUBERNETES_SERVER_ARCH=arm64
-+
- .PHONY: all container getbins clean
-
- all: container
-@@ -47,9 +49,9 @@ _cache/.getbins.$(kube_version_full).timestamp:
- KUBERNETES_DOWNLOAD_TESTS=true \
- KUBERNETES_SKIP_CONFIRM=true ./kubernetes/cluster/get-kube-binaries.sh
- mv _cache/$(kube_version_full)/kubernetes/cluster ./
-- mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/e2e.test ./
-- mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/ginkgo ./
-- mv _cache/$(kube_version_full)/kubernetes/platforms/linux/amd64/kubectl ./
-+ mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/e2e.test ./
-+ mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/ginkgo ./
-+ mv _cache/$(kube_version_full)/kubernetes/platforms/linux/arm64/kubectl ./
- touch $@
-
- container: e2e.test kubectl ginkgo
+++ /dev/null
-##############################################################################
-# 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. #
-##############################################################################
-
-export WORK_DIR?=$(TAG_PRE)
-
-.PHONY: .build
-.build:: .submodules_patched
-
-.PHONY: all
-all: push-image .push_manifest
-
-.PHONY: build
-build: .build
-
-.PHONY: push-image
-push-image: .push_image
-
-include ../build.mk
+++ /dev/null
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 25 Jun 2019 17:45:29 +0200
-Subject: [PATCH] Dockerfile: AArch64 support
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- Dockerfile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Dockerfile b/Dockerfile
-index 06d872c..687d541 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -13,10 +13,12 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--FROM buildpack-deps:jessie-scm
-+FROM arm64v8/buildpack-deps:jessie-scm
- MAINTAINER Ken Simon "ken@heptio.com"
-
--RUN apt-get update && apt-get -y --no-install-recommends install \
-+RUN echo 'Acquire::Check-Valid-Until "0";' > /etc/apt/apt.conf.d/10no--check-valid-until \
-+ && sed -i -e '/security/s/^/#/g' -e 's|deb.debian.org/debian|snapshot.debian.org/archive/debian/20190301T035241Z|g' /etc/apt/sources.list \
-+ && apt-get update && apt-get -y --no-install-recommends install \
- ca-certificates \
- && rm -rf /var/cache/apt/* \
- && rm -rf /var/lib/apt/lists/*
+++ /dev/null
-Subproject commit f49e35d220772879aa057da7d103af35a21439b6
&{SONOBUOY} path=gcr.io/heptio-images
... name=sonobuoy:v0.16.1
-&{E2E} path=akraino
+&{E2E} path=k8s.gcr.io
... name=Actual value set dynamically
-&{SYSTEMD_LOGS} path=akraino
-... name=validation:sonobuoy-plugin-systemd-logs-latest
+&{SYSTEMD_LOGS} path=gcr.io/heptio-images
+... name=sonobuoy-plugin-systemd-logs:latest
&{SONOBUOY_IMGS} sonobuoy=&{SONOBUOY}
... e2e=&{E2E}
... systemd_logs=&{SYSTEMD_LOGS}
${versions}= Convert String To JSON ${result.stdout}
${major}= Get Value From Json ${versions} $.serverVersion.major
${minor}= Get Value From Json ${versions} $.serverVersion.minor
+ ${gitVersion}= Get Value From Json ${versions} $.serverVersion.gitVersion
${major}= Get Regexp Matches ${major[0]} \\d+
${minor}= Get Regexp Matches ${minor[0]} \\d+
- Set To Dictionary ${SONOBUOY_IMGS['e2e']} name=validation:kube-conformance-v${major[0]}.${minor[0]}
+ ${gitVersion}= Get Regexp Matches ${gitVersion[0]} \\d+
+ Set To Dictionary ${SONOBUOY_IMGS['e2e']} name=conformance:${gitVersion[0]}
Onboard Images
${INT_REG}= Get Variable Value ${INTERNAL_REGISTRY} ${EMPTY}
requests~=2.21.0
nodeenv
commands =
- rm -rf docker/kube-conformance/kube-conformance docker/sonobuoy-plugin-systemd-logs/sonobuoy-plugin-systemd-logs
nodeenv -p
npm install --global write-good eslint complexity-report@2.0.0-alpha
wget --timeout=120 -q https://github.com/pmd/pmd/releases/download/pmd_releases/6.15.0/pmd-bin-6.15.0.zip
Code Review / validation.git / commitdiff