From 21a1d0733a72893a408ac35be7d391d165ad7253 Mon Sep 17 00:00:00 2001
From: Michael Fritch <mfritch@suse.com>
Date: Thu, 13 Jul 2023 10:08:08 -0600
Subject: [PATCH] Update to whereabouts v0.6.2

Also update to Go v1.20.6b2

Signed-off-by: Michael Fritch <mfritch@suse.com>
---
 .drone.yml | 14 +++++++-------
 Dockerfile |  4 ++--
 Makefile   |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 063f062..a5a1ae7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
@@ -18,7 +18,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -35,7 +35,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
@@ -59,7 +59,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
@@ -67,7 +67,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -84,7 +84,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.20.4b11
+  image: rancher/hardened-build-base:v1.20.6b2
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
@@ -119,4 +119,4 @@ steps:
 depends_on:
 - linux-amd64
 - linux-arm64
-...
\ No newline at end of file
+...
diff --git a/Dockerfile b/Dockerfile
index 7c1a7ab..165ad2b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 ARG BCI_IMAGE=registry.suse.com/bci/bci-base
-ARG GO_IMAGE=rancher/hardened-build-base:v1.20.4b11
+ARG GO_IMAGE=rancher/hardened-build-base:v1.20.6b2
 FROM ${BCI_IMAGE} as bci
 
 FROM ${GO_IMAGE} as builder
 ARG ARCH="amd64"
-ARG TAG="v0.6.1"
+ARG TAG="v0.6.2"
 ARG PKG="github.com/k8snetworkplumbingwg/whereabouts"
 ARG SRC="github.com/k8snetworkplumbingwg/whereabouts"
 RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
diff --git a/Makefile b/Makefile
index cfc7d62..db25a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
 PKG ?= github.com/k8snetworkplumbingwg/whereabouts
 SRC ?= github.com/k8snetworkplumbingwg/whereabouts
-TAG ?= v0.6.1$(BUILD_META)
+TAG ?= v0.6.2$(BUILD_META)
 
 ifneq ($(DRONE_TAG),)
 	TAG := $(DRONE_TAG)
@@ -50,4 +50,4 @@ image-manifest:
 
 .PHONY: image-scan
 image-scan:
-	trivy --severity $(SEVERITIES) --no-progress --ignore-unfixed $(ORG)/hardened-whereabouts:$(TAG)
+	trivy --severity $(SEVERITIES) --no-progress --ignore-unfixed image $(ORG)/hardened-whereabouts:$(TAG)