From: Sirisha Gopigiri <sirishagopigiri@gmail.com>
Date: Fri, 18 Jun 2021 04:28:25 +0000 (+0530)
Subject: Fix Sonobuoy systemd-image for k8 1.18
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=HEAD

Fix Sonobuoy systemd-image for k8 1.18

This PS upgrades the sonobuoy version, so that
the systemd-logs pods get launched successfully
on the kubernetes cluster.

Signed-off-by: SirishaGopigiri <sirishagopigiri@gmail.com>
Change-Id: I2f690fef2202528730b760a6a629bb83e6ddc611
---

diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile
index 6b403c9..f9f992b 100644
--- a/docker/k8s/Dockerfile
+++ b/docker/k8s/Dockerfile
@@ -19,7 +19,7 @@ FROM golang:1.16.5-alpine3.13 as build
 
 # Sonobuoy supports 3 Kubernetes minor versions: the current release and 2
 # minor versions before.
-ARG SB_TAG=v0.16.1
+ARG SB_TAG=v0.18.2
 # Determine the latest stable git tag at build time based on stable major version
 ARG K8S_VER=1.18
 
@@ -73,7 +73,6 @@ RUN if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64;
     make WHAT=test/e2e/e2e.test ARCH=$HOST_ARCH
 RUN git clone https://github.com/heptio/sonobuoy /go/src/github.com/heptio/sonobuoy && \
     cd /go/src/github.com/heptio/sonobuoy && \
-    pwd \
     git checkout $SB_TAG && \
     go install
 RUN git clone https://gerrit.akraino.org/r/validation /opt/akraino/validation
diff --git a/tests/k8s/conformance/conformance.robot b/tests/k8s/conformance/conformance.robot
index 8cf83dd..ffffd77 100644
--- a/tests/k8s/conformance/conformance.robot
+++ b/tests/k8s/conformance/conformance.robot
@@ -37,15 +37,12 @@ Test Teardown     Run Keywords
 *** Variables ***
 ${LOG}            ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
-&{SONOBUOY}         path=gcr.io/heptio-images
-...                 name=sonobuoy:v0.16.1
+&{SONOBUOY}         path=sonobuoy
+...                 name=sonobuoy:v0.18.2
 &{E2E}              path=k8s.gcr.io
 ...                 name=Actual value set dynamically
-&{SYSTEMD_LOGS}     path=gcr.io/heptio-images
-...                 name=sonobuoy-plugin-systemd-logs:latest
 &{SONOBUOY_IMGS}    sonobuoy=&{SONOBUOY}
 ...                 e2e=&{E2E}
-...                 systemd_logs=&{SYSTEMD_LOGS}
 
 # Following tests assume DNS domain is "cluster.local"
 ${DNS_DOMAIN_TESTS}  SEPARATOR=
@@ -146,12 +143,7 @@ Define Images
         ${result}=              Run Process  kubectl  version  -o  json
         Should Be Equal As Integers  ${result.rc}  0
         ${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+
-        ${gitVersion}=               Get Regexp Matches  ${gitVersion[0]}  \\d+
         Set To Dictionary       ${SONOBUOY_IMGS['e2e']}  name=conformance:${gitVersion[0]}
 
 Onboard Images
@@ -187,7 +179,4 @@ Create Manifest File
         ...                         ${CURDIR}${/}custom_repos.yaml
         ${result}=              Run Process  sonobuoy  gen  @{flags}
         Should Be Equal As Integers  ${result.rc}  0
-        ${manifest}=            Replace String  ${result.stdout}
-        ...                         image: gcr.io/heptio-images/sonobuoy-plugin-systemd-logs:latest
-        ...                         image: ${SONOBUOY_IMGS.systemd_logs.path}/${SONOBUOY_IMGS.systemd_logs.name}
-        Create File             ${CURDIR}${/}sonobuoy.yaml  ${manifest}
+        Create File             ${CURDIR}${/}sonobuoy.yaml  ${result.stdout}