From 53172083dd490444fe22678b299f0491cfa22c5c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 5 Aug 2019 15:18:00 +0200 Subject: [PATCH] [k8s] sonobuoy: Align all images with v0.15.1 tag We previously bumped the sonobuoy and its required tooling (e.g. e2e.test) to the minor version 0.15, but some binaries/images were still pointing to 0.13/0.14 versions; let's align all of them. Change-Id: Ic27aab02fe41d7fed06d5a45796c7bddd0db9940 Signed-off-by: Alexandru Avadanii --- docker/k8s/Dockerfile | 5 +++-- tests/k8s/conformance/sonobuoy.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/k8s/Dockerfile b/docker/k8s/Dockerfile index 06c21c9..925ac3d 100644 --- a/docker/k8s/Dockerfile +++ b/docker/k8s/Dockerfile @@ -17,8 +17,9 @@ # 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 SB_TAG=v0.14.3 +# Sonobuoy supports 3 Kubernetes minor versions: the current release and 2 +# minor versions before. +ARG SB_TAG=v0.15.1 # Determine the latest stable git tag at build time based on stable major version ARG K8S_VER=1.15 diff --git a/tests/k8s/conformance/sonobuoy.yaml b/tests/k8s/conformance/sonobuoy.yaml index 62f3280..76f9e09 100644 --- a/tests/k8s/conformance/sonobuoy.yaml +++ b/tests/k8s/conformance/sonobuoy.yaml @@ -67,7 +67,7 @@ rules: apiVersion: v1 data: config.json: | - {"Description":"DEFAULT","UUID":"376a4ddc-4498-49fc-af2e-999242c4c245","Version":"v0.13.0","ResultsDir":"/tmp/sonobuoy","Resources":["CertificateSigningRequests","ClusterRoleBindings","ClusterRoles","ComponentStatuses","CustomResourceDefinitions","Nodes","PersistentVolumes","PodSecurityPolicies","ServerGroups","ServerVersion","StorageClasses","ConfigMaps","ControllerRevisions","CronJobs","DaemonSets","Deployments","Endpoints","Ingresses","Jobs","LimitRanges","NetworkPolicies","PersistentVolumeClaims","PodDisruptionBudgets","PodTemplates","Pods","ReplicaSets","ReplicationControllers","ResourceQuotas","RoleBindings","Roles","ServiceAccounts","Services","StatefulSets"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"LimitSize":"","LimitTime":""}},"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"},{"name":"systemd-logs"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","LoadedPlugins":null,"WorkerImage":"gcr.io/heptio-images/sonobuoy:latest","ImagePullPolicy":"Always"} + {"Description":"DEFAULT","UUID":"376a4ddc-4498-49fc-af2e-999242c4c245","Version":"v0.15.1","ResultsDir":"/tmp/sonobuoy","Resources":["CertificateSigningRequests","ClusterRoleBindings","ClusterRoles","ComponentStatuses","CustomResourceDefinitions","Nodes","PersistentVolumes","PodSecurityPolicies","ServerGroups","ServerVersion","StorageClasses","ConfigMaps","ControllerRevisions","CronJobs","DaemonSets","Deployments","Endpoints","Ingresses","Jobs","LimitRanges","NetworkPolicies","PersistentVolumeClaims","PodDisruptionBudgets","PodTemplates","Pods","ReplicaSets","ReplicationControllers","ResourceQuotas","RoleBindings","Roles","ServiceAccounts","Services","StatefulSets"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"LimitSize":"","LimitTime":""}},"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"},{"name":"systemd-logs"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","LoadedPlugins":null,"WorkerImage":"gcr.io/heptio-images/sonobuoy:latest","ImagePullPolicy":"Always"} kind: ConfigMap metadata: labels: @@ -155,7 +155,7 @@ spec: valueFrom: fieldRef: fieldPath: status.podIP - image: gcr.io/heptio-images/sonobuoy:v0.13.0 + image: gcr.io/heptio-images/sonobuoy:v0.15.1 imagePullPolicy: Always name: kube-sonobuoy volumeMounts: -- 2.16.6