From e365579edb6cedb280716611d517d07e967cf1a7 Mon Sep 17 00:00:00 2001
From: Lubron <lzhan@vmware.com>
Date: Wed, 23 Mar 2022 23:47:43 -0700
Subject: [PATCH] * disable node registration when UUID is empty (#607)

* show vsphere-cloud-controller-manager version in the log correctly

* Remove cache based on UUID when unregister node

* do not use the cached node addresses when NodeAddresses is invoked.

* Return error when VM's info returned from VC doesn't contains IP address

* Update chart

* Fix golang syntax

Co-authored-by: Nicole Han <nicoleh@vmware.com>
---
 .github/workflows/release.yml                 |   6 +-
 Makefile                                      |   3 +-
 charts/vsphere-cpi-1.0.0.tgz                  | Bin 7617 -> 0 bytes
 charts/vsphere-cpi-1.21.3.tgz                 | Bin 0 -> 7628 bytes
 charts/vsphere-cpi/Chart.yaml                 |   4 +-
 charts/vsphere-cpi/values.yaml                |   2 +-
 cluster/images/controller-manager/Dockerfile  |   4 +-
 docs/book/tutorials/deploying-cpi-with-k3s.md |   2 +-
 go.sum                                        | 101 ++----------------
 hack/check-format.sh                          |   2 +-
 hack/check-lint.sh                            |   3 +-
 hack/check-staticcheck.sh                     |   1 +
 index.yaml                                    |  12 +--
 pkg/cloudprovider/vsphere/instances.go        |  15 +--
 pkg/cloudprovider/vsphere/instances_test.go   |   2 +-
 pkg/cloudprovider/vsphere/nodemanager.go      |  37 ++++++-
 pkg/cloudprovider/vsphere/nodemanager_test.go |   8 +-
 .../ippool/ippool_controller_test.go          |   6 +-
 .../routablepod/node/node_controller_test.go  |   8 +-
 .../vsphere-cloud-controller-manager.yaml     |   2 +-
 test/vcsim/Dockerfile                         |   4 +-
 21 files changed, 79 insertions(+), 143 deletions(-)
 delete mode 100644 charts/vsphere-cpi-1.0.0.tgz
 create mode 100644 charts/vsphere-cpi-1.21.3.tgz

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46f33a1d1..3f84b29e9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,3 @@
-name: Release Charts
-
 name: Release Helm Charts
 
 on:
@@ -18,13 +16,13 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      
+
       # Configure Git for helm release
       - name: Configure Git
         run: |
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-      
+
       # Install Helm
       - name: Install Helm
         uses: azure/setup-helm@v1
diff --git a/Makefile b/Makefile
index 36abc8fe5..a004d4375 100644
--- a/Makefile
+++ b/Makefile
@@ -334,4 +334,5 @@ squash:
 docker-image:
 	docker build \
 	-f cluster/images/controller-manager/Dockerfile \
-	-t "$(IMAGE):$(BRANCH_NAME)" . \
+	-t "$(IMAGE):$(BRANCH_NAME)" \
+	--build-arg "VERSION=${VERSION}" . \
diff --git a/charts/vsphere-cpi-1.0.0.tgz b/charts/vsphere-cpi-1.0.0.tgz
deleted file mode 100644
index e2c420d079c2c9d080a1494f2dabcfa805438e0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7617
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

diff --git a/charts/vsphere-cpi-1.21.3.tgz b/charts/vsphere-cpi-1.21.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..54f23504d8d66a8bf8221b0c0b94b23bde3b4a78
GIT binary patch
literal 7628
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

literal 0
HcmV?d00001

diff --git a/charts/vsphere-cpi/Chart.yaml b/charts/vsphere-cpi/Chart.yaml
index 42674cf32..8c35f6e54 100644
--- a/charts/vsphere-cpi/Chart.yaml
+++ b/charts/vsphere-cpi/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.21.2
+appVersion: 1.21.3
 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
 name: vsphere-cpi
-version: 1.0.0
+version: 1.21.3
 keywords:
   - vsphere
   - vmware
diff --git a/charts/vsphere-cpi/values.yaml b/charts/vsphere-cpi/values.yaml
index b06642b09..3ef0abfcc 100644
--- a/charts/vsphere-cpi/values.yaml
+++ b/charts/vsphere-cpi/values.yaml
@@ -50,7 +50,7 @@ serviceAccount:
 daemonset:
   annotations: {}
   image: gcr.io/cloud-provider-vsphere/cpi/release/manager
-  tag: v1.21.2
+  tag: v1.21.3
   pullPolicy: IfNotPresent
   dnsPolicy: ClusterFirst
   cmdline:
diff --git a/cluster/images/controller-manager/Dockerfile b/cluster/images/controller-manager/Dockerfile
index 0994b3f8c..48ae39316 100644
--- a/cluster/images/controller-manager/Dockerfile
+++ b/cluster/images/controller-manager/Dockerfile
@@ -33,7 +33,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static@sha256:9b60270ec0991bc4f14bda475e8
 FROM ${GOLANG_IMAGE} as builder
 
 # This build arg is the version to embed in the CPI binary
-ARG VERSION=unknown
+ARG VERSION=1.21.3
 
 # This build arg controls the GOPROXY setting
 ARG GOPROXY
@@ -44,7 +44,7 @@ COPY pkg/    pkg/
 COPY cmd/    cmd/
 ENV CGO_ENABLED=0
 ENV GOPROXY ${GOPROXY:-https://proxy.golang.org}
-RUN go build -a -ldflags='-w -s -extldflags=static -X main.version=${VERSION}' -o vsphere-cloud-controller-manager ./cmd/vsphere-cloud-controller-manager
+RUN go build -a -ldflags="-w -s -extldflags=static -X main.version=${VERSION}" -o vsphere-cloud-controller-manager ./cmd/vsphere-cloud-controller-manager
 
 ################################################################################
 ##                               MAIN STAGE                                   ##
diff --git a/docs/book/tutorials/deploying-cpi-with-k3s.md b/docs/book/tutorials/deploying-cpi-with-k3s.md
index c3585cd86..a96f76deb 100644
--- a/docs/book/tutorials/deploying-cpi-with-k3s.md
+++ b/docs/book/tutorials/deploying-cpi-with-k3s.md
@@ -4,7 +4,7 @@ This document is designed to show you how to integrate k3s with cloud provider v
 
 When running with a cloud-controller-manager, it is expected to pass the node provider ID to a CCM as `<provider>://<id>`, in our case, `vsphere://1234567`. However, k3s passes it as `k3s://<hostname>`, which makes vsphere CCM not be able to find the node.
 
-We only support `vsphere` as the provider name that is used for constructing **providerID** for both [vsphere](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.2/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.2/pkg/cloudprovider/vsphereparavirtual/cloud.go#L42).
+We only support `vsphere` as the provider name that is used for constructing **providerID** for both [vsphere](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.3/pkg/cloudprovider/vsphere/cloud.go#L51) and [vsphere-paravirtual](https://github.com/kubernetes/cloud-provider-vsphere/blob/v1.21.3/pkg/cloudprovider/vsphereparavirtual/cloud.go#L42).
 
 ## How to integrate k3s with cloud provider vsphere
 
diff --git a/go.sum b/go.sum
index 522069273..3b01ec656 100644
--- a/go.sum
+++ b/go.sum
@@ -6,7 +6,6 @@ cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxK
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
@@ -23,24 +22,18 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-sdk-for-go v43.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
 github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
-github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
@@ -48,8 +41,6 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod h1:DF8FZRxMHMGv/vP2lQP6h+dYzzjpuRn24VeRiYn3qjQ=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
@@ -72,10 +63,7 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
-github.com/aws/aws-sdk-go v1.38.21/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
 github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -117,6 +105,7 @@ github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwc
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -126,7 +115,6 @@ github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVz
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -174,11 +162,9 @@ github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70t
 github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
-github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI=
 github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
 github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
@@ -196,24 +182,20 @@ github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf
 github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
 github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.4 h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY=
 github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk=
 github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
 github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-github.com/go-openapi/runtime v0.19.4 h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI=
 github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc=
 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/spec v0.19.5 h1:Xm0Ao53uqnk9QE/LlYV5DEU09UAgpliA85QoT9LzqPw=
 github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
 github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA=
 github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
@@ -223,9 +205,7 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
 github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.5 h1:QhCBKRYqZR+SKo4gl1lPhPahope8/RLt6EVgY8X80w0=
 github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -341,8 +321,6 @@ github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -360,18 +338,14 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubernetes/cloud-provider v0.21.1 h1:3+ELZjYWMmrNVT0j+OagfE62QPzO9jIRw9wwZ0IM6U4=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -396,11 +370,8 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
-github.com/moby/term v0.0.0-20200312100748-672ec06f55cd h1:aY7OQNf2XqY/JQ6qREWamhI/81os/agb2BAGpcx5yWI=
-github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 h1:rzf0wL0CHVc8CEsgyygG0Mn9CNCCPZqOPaz8RiiHYQk=
 github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -415,6 +386,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -469,18 +441,15 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -520,19 +489,15 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vmware-tanzu/vm-operator-api v0.1.3 h1:4vxewu0jAN3fSoCBI6FhjmRGJ7ci0R2WNu/I6hacTYs=
 github.com/vmware-tanzu/vm-operator-api v0.1.4-0.20201118171008-5ca641b0e126 h1:kDAAVFnTW9YHGuUTMGQoWz9AV7aZo3+wCbtzyenVktI=
 github.com/vmware-tanzu/vm-operator-api v0.1.4-0.20201118171008-5ca641b0e126/go.mod h1:mubK0QMyaA2TbeAmGsu2GVfiqDFppNUAUqoMPoKFgzM=
-github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
 github.com/vmware/govmomi v0.22.1 h1:ZIEYmBdAS2i+s7RctapqdHfbeGiUcL8LRN05uS4TfPc=
 github.com/vmware/govmomi v0.22.1/go.mod h1:Y+Wq4lst78L85Ge/F8+ORXIWiKYqaro1vhAulACy9Lc=
 github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
-github.com/vmware/vsphere-automation-sdk-go v0.0.0-20210518150924-eeeec91a01c2 h1:wxPeKAvsleD9oRwh8rCceA5GlGd7sHidg4Jb3hox3Ag=
 github.com/vmware/vsphere-automation-sdk-go/lib v0.2.0 h1:noiASkafwxvCmmCtZK0f1pt06R8c+Fkt9TcZW7xpYy0=
 github.com/vmware/vsphere-automation-sdk-go/lib v0.2.0/go.mod h1://FsAiCrr+T/Eq2Uxtq8UPVPbZWV7iLIvvXK17rsIxE=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.2.0 h1:AM5AK9cyiJWFIfxrh1U/kuRFh+A2pymCEGiXqAkPzzw=
 github.com/vmware/vsphere-automation-sdk-go/runtime v0.2.0/go.mod h1:M6pTKDrJrPlVG++lboLRf0bDYc3TJ2fsR+KOoWXfCns=
-github.com/vmware/vsphere-automation-sdk-go/runtime v0.4.0 h1:SJI34JDj28bZyTI93kCTdklXHaxJUnR+ebkMQ8eWfgA=
 github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.3.0 h1:Ekf0/umhKdr4N0oURDFlkhZHVm6w0eXzbsn6yc/vL+4=
 github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.3.0/go.mod h1:k9tf91B5Ah7gkaM2s+Z6nATmn6gKmgt8AqJ8RUiKLfo=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
@@ -550,7 +515,6 @@ go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1Zt
 go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -576,7 +540,6 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
@@ -602,8 +565,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -612,7 +573,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -648,9 +608,6 @@ golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM=
 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
@@ -666,7 +623,6 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -702,7 +658,6 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -711,13 +666,9 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
@@ -738,8 +689,6 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -784,9 +733,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -804,7 +751,6 @@ google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
 google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.1-0.20200106000736-b8fc810ca6b5/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
@@ -858,13 +804,12 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
@@ -876,7 +821,6 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
@@ -885,7 +829,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
@@ -894,6 +837,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -903,56 +847,35 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.17.4/go.mod h1:5qxx6vjmwUVG2nHQTKGlLts8Tbok8PzHl4vHtVFuZCA=
 k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
-k8s.io/api v0.20.6 h1:bgdZrW++LqgrLikWYNruIKAtltXbSCX2l5mJu11hrVE=
-k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
 k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
 k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
-k8s.io/apiextensions-apiserver v0.18.6 h1:vDlk7cyFsDyfwn2rNAO2DbmUbvXy5yT5GE3rrqOzaMo=
 k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M=
 k8s.io/apiextensions-apiserver v0.21.0 h1:Nd4uBuweg6ImzbxkC1W7xUNZcCV/8Vt10iTdTIVF3hw=
 k8s.io/apiextensions-apiserver v0.21.0/go.mod h1:gsQGNtGkc/YoDG9loKI0V+oLZM4ljRPjc/sql5tmvzc=
-k8s.io/apiextensions-apiserver v0.21.1 h1:AA+cnsb6w7SZ1vD32Z+zdgfXdXY8X9uGX5bN6EoPEIo=
 k8s.io/apimachinery v0.17.4/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
 k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
-k8s.io/apimachinery v0.20.6 h1:R5p3SlhaABYShQSO6LpPsYHjV05Q+79eBUR0Ut/f4tk=
-k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
 k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=
 k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
-k8s.io/apimachinery v0.21.1 h1:Q6XuHGlj2xc+hlMCvqyYfbv3H7SRGn2c8NycxJquDVs=
 k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg=
-k8s.io/apiserver v0.20.6 h1:NnVriMMOpqQX+dshbDoZixqmBhfgrPk2uOh2fzp9vHE=
-k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
 k8s.io/apiserver v0.21.0 h1:1hWMfsz+cXxB77k6/y0XxWxwl6l9OF26PC9QneUVn1Q=
 k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg=
 k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
-k8s.io/client-go v0.20.6 h1:nJZOfolnsVtDtbGJNCxzOtKUAu7zvXjB8+pMo9UNxZo=
-k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
 k8s.io/client-go v0.21.0 h1:n0zzzJsAQmJngpC0IhgFcApZyoGXPrDIAD601HD09ag=
 k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
-k8s.io/client-go v1.5.2 h1:JOxmv4FxrCIOS54kAABbN8/hA9jqGpns+Zc6soNgd8U=
-k8s.io/client-go v1.5.2/go.mod h1:OmM68YRko3DQ0sjlnWxzjQF9lcSLHJXuGMTo23rc7wI=
-k8s.io/cloud-provider v0.20.6 h1:OAxcMIbVpG6Q4ZTi7zvJT4G+jji1WoEICt/TZVIc/sg=
-k8s.io/cloud-provider v0.20.6/go.mod h1:M8hFlHPlu6x7LvKbqwJf5ScH9vbwHBoxEDyGzbLHrnU=
 k8s.io/cloud-provider v0.21.0 h1:NSTS+czpv6LQAaIpY/VUghsT4oj62hYmQPErkDKTzKU=
 k8s.io/cloud-provider v0.21.0/go.mod h1:z17TQgu3JgUFjcgby8sj5X86YdVK5Pbt+jm/eYMZU9M=
-k8s.io/cloud-provider-aws v1.21.0-alpha.0 h1:XmOHYbBMCmlChYfsAsWoY+5LK21jE29A7IB+cNQE0VI=
-k8s.io/cloud-provider-aws v1.21.0-alpha.0/go.mod h1:56zJYGImC4TuDAmdUgaaTnC2Dzb7zY7Bx7/OHKHKRQw=
 k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/code-generator v0.21.0 h1:LGWJOvkbBNpuRBqBRXUjzfvymUh7F/iR2KDpwLnqCM4=
 k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
 k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=
-k8s.io/component-base v0.20.6 h1:G0inASS5vAqCpzs7M4Sp9dv9d0aElpz39zDHbSB4f4g=
-k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM=
 k8s.io/component-base v0.21.0 h1:tLLGp4BBjQaCpS/KiuWh7m2xqvAdsxLm4ATxHSe5Zpg=
 k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
-k8s.io/controller-manager v0.20.6 h1:ERs/6uIARxAaja6OdN99EehLKgqx/IPP+Lq8NZW/GrM=
-k8s.io/controller-manager v0.20.6/go.mod h1:LscIZ8hfSSUPoilAHPXufL142dxa6+o/mmhUcKkY/9w=
 k8s.io/controller-manager v0.21.0 h1:60kaloHJ815CDLohPmoa0n5/WbW7J0PXHX+y+dOBSWc=
 k8s.io/controller-manager v0.21.0/go.mod h1:Ohy0GRNRKPVjB8C8G+dV+4aPn26m8HYUI6ejloUBvUA=
-k8s.io/csi-translation-lib v0.21.0/go.mod h1:edq+UMpgqEx3roTuGF/03uIuSOsI986jtu65+ytLlkA=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
@@ -960,24 +883,16 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
 k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
-k8s.io/kubelet v0.21.0/go.mod h1:G5ZxMTVev9t4bhmsSxDAWhH6wXDYEVHVVFyYsw4laR4=
-k8s.io/legacy-cloud-providers v0.21.0/go.mod h1:bNxo7gDg+PGkBmT/MFZswLTWdSWK9kAlS1s8DJca5q4=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 h1:u5rPykqiCpL+LBfjRkXvnK71gOgIdmq3eHUEkPrbeTI=
-k8s.io/utils v0.0.0-20210305010621-2afb4311ab10/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
@@ -991,8 +906,6 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:w
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.3 h1:4oyYo8NREp49LBBhKxEqCulFjg26rawYKrnCmg+Sr6c=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/hack/check-format.sh b/hack/check-format.sh
index fc932f452..1cc9fcd5f 100755
--- a/hack/check-format.sh
+++ b/hack/check-format.sh
@@ -41,7 +41,7 @@ goformat_exit_code=0; test -z "$(head -n 1 "${out}")" || goformat_exit_code=1
 rm -f "${out}" && touch "${out}"
 
 # Run goimports on all the sources.
-go get golang.org/x/tools/cmd/goimports
+go install golang.org/x/tools/cmd/goimports
 cmd=$(go list -f \{\{\.Target\}\} golang.org/x/tools/cmd/goimports)
 flags="-e -w"
 [ -z "${PROW_JOB_ID-}" ] || flags="-d ${flags}"
diff --git a/hack/check-lint.sh b/hack/check-lint.sh
index a1c9a5e74..d6434e754 100755
--- a/hack/check-lint.sh
+++ b/hack/check-lint.sh
@@ -22,7 +22,8 @@ set -o pipefail
 # script is located.
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
-go get golang.org/x/lint/golint
+go mod download golang.org/x/lint
+go install golang.org/x/lint/golint
 
 CMD=$(go list -f \{\{\.Target\}\} golang.org/x/lint/golint)
 
diff --git a/hack/check-staticcheck.sh b/hack/check-staticcheck.sh
index 67d283cd8..35c6598dd 100755
--- a/hack/check-staticcheck.sh
+++ b/hack/check-staticcheck.sh
@@ -23,6 +23,7 @@ set -o pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 go get honnef.co/go/tools/cmd/staticcheck
+go install honnef.co/go/tools/cmd/staticcheck
 CMD=$(go list -f \{\{\.Target\}\} honnef.co/go/tools/cmd/staticcheck)
 
 # re-enable SA1019 when we upgrade to Go 1.14
diff --git a/index.yaml b/index.yaml
index ebf39d6eb..47166f632 100644
--- a/index.yaml
+++ b/index.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 entries:
   vsphere-cpi:
   - apiVersion: v2
-    appVersion: 1.21.2
-    created: "2021-07-28T14:36:52.229812-07:00"
+    appVersion: 1.21.3
+    created: "2022-03-22T12:05:19.700473-07:00"
     description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
-    digest: db24dcbcbdb250809c313912ea7bfc50fbf5b2a99ee0cc3bbd799cdf0db726ac
+    digest: aee171bf111b38f76a046a203fd9c7e571d4a888d48f965f93991e268f7f36d1
     home: https://github.com/kubernetes/cloud-provider-vsphere
     icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png
     keywords:
@@ -18,6 +18,6 @@ entries:
     sources:
     - https://github.com/kubernetes/cloud-provider-vsphere
     urls:
-    - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.0.0.tgz
-    version: 1.0.0
-generated: "2021-07-28T14:36:52.22876-07:00"
+    - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.21.3.tgz
+    version: 1.21.3
+generated: "2022-03-22T12:05:19.699567-07:00"
diff --git a/pkg/cloudprovider/vsphere/instances.go b/pkg/cloudprovider/vsphere/instances.go
index bc9cfff3c..fe4a8675c 100644
--- a/pkg/cloudprovider/vsphere/instances.go
+++ b/pkg/cloudprovider/vsphere/instances.go
@@ -35,7 +35,7 @@ import (
 var (
 	// ErrNotFound is returned by NodeAddresses, NodeAddressesByProviderID,
 	// and InstanceID when a node cannot be found.
-	ErrNodeNotFound = errors.New("Node not found")
+	ErrNodeNotFound = errors.New("node not found")
 )
 
 func newInstances(nodeManager *NodeManager) cloudprovider.Instances {
@@ -52,12 +52,6 @@ var _ cloudprovider.Instances = &instances{}
 func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName) ([]v1.NodeAddress, error) {
 	klog.V(4).Info("instances.NodeAddresses() called with ", string(nodeName))
 
-	// Check if node has been discovered already
-	if node, ok := i.nodeManager.nodeNameMap[string(nodeName)]; ok {
-		klog.V(2).Info("instances.NodeAddresses() CACHED with ", string(nodeName))
-		return node.NodeAddresses, nil
-	}
-
 	if err := i.nodeManager.DiscoverNode(string(nodeName), cm.FindVMByName); err == nil {
 		if i.nodeManager.nodeNameMap[string(nodeName)] == nil {
 			klog.Errorf("DiscoverNode succeeded, but CACHE missed for node=%s. If this is a Linux VM, hostnames are case sensitive. Make sure they match.", string(nodeName))
@@ -77,12 +71,7 @@ func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName)
 func (i *instances) NodeAddressesByProviderID(ctx context.Context, providerID string) ([]v1.NodeAddress, error) {
 	klog.V(4).Info("instances.NodeAddressesByProviderID() called with ", providerID)
 
-	// Check if node has been discovered already
 	uid := GetUUIDFromProviderID(providerID)
-	if node, ok := i.nodeManager.nodeUUIDMap[uid]; ok {
-		klog.V(2).Info("instances.NodeAddressesByProviderID() CACHED with ", uid)
-		return node.NodeAddresses, nil
-	}
 
 	if err := i.nodeManager.DiscoverNode(uid, cm.FindVMByUUID); err == nil {
 		klog.V(2).Info("instances.NodeAddressesByProviderID() FOUND with ", uid)
@@ -194,7 +183,7 @@ func (i *instances) InstanceShutdownByProviderID(ctx context.Context, providerID
 	// Check if node has been discovered already
 	uid := GetUUIDFromProviderID(providerID)
 	if _, ok := i.nodeManager.nodeUUIDMap[uid]; !ok {
-		// IF the uuid is not cached, we end up here
+		// if the uuid is not cached, we end up here
 		klog.V(2).Info("instances.InstanceShutdownByProviderID() NOT CACHED")
 		if err := i.nodeManager.DiscoverNode(uid, cm.FindVMByUUID); err != nil {
 			klog.V(4).Info("instances.InstanceShutdownByProviderID() NOT FOUND with ", uid)
diff --git a/pkg/cloudprovider/vsphere/instances_test.go b/pkg/cloudprovider/vsphere/instances_test.go
index 2ebbc25a5..dfcddc913 100644
--- a/pkg/cloudprovider/vsphere/instances_test.go
+++ b/pkg/cloudprovider/vsphere/instances_test.go
@@ -80,7 +80,7 @@ func TestInstance(t *testing.T) {
 	instances := newInstances(&nm.NodeManager)
 
 	vm := simulator.Map.Any("VirtualMachine").(*simulator.VirtualMachine)
-	name := vm.Name
+	name := strings.ToLower(vm.Name)
 	vm.Guest.HostName = name
 	vm.Guest.Net = []vimtypes.GuestNicInfo{
 		{
diff --git a/pkg/cloudprovider/vsphere/nodemanager.go b/pkg/cloudprovider/vsphere/nodemanager.go
index cfd1422c2..ab6de5f5f 100644
--- a/pkg/cloudprovider/vsphere/nodemanager.go
+++ b/pkg/cloudprovider/vsphere/nodemanager.go
@@ -43,7 +43,7 @@ var (
 
 	// ErrDatacenterNotFound is returned when the configured datacenter cannot
 	// be found.
-	ErrDatacenterNotFound = errors.New("Datacenter not found")
+	ErrDatacenterNotFound = errors.New("datacenter not found")
 
 	// ErrVMNotFound is returned when the specified VM cannot be found.
 	ErrVMNotFound = errors.New("VM not found")
@@ -103,6 +103,19 @@ func (nm *NodeManager) removeNode(uuid string, node *v1.Node) {
 	klog.V(4).Info("removeNode NodeName: ", node.GetName(), ", UID: ", uuid)
 	delete(nm.nodeRegUUIDMap, uuid)
 	nm.nodeRegInfoLock.Unlock()
+
+	nm.nodeInfoLock.Lock()
+	klog.V(4).Info("removeNode from UUID and Name cache. NodeName: ", node.GetName(), ", UID: ", uuid)
+	// in case of a race condition that node with same name create happens before delete event,
+	// delete the node based on uuid
+	name := nm.getNodeNameByUUID(uuid)
+	if name != "" {
+		delete(nm.nodeNameMap, name)
+	} else {
+		klog.V(4).Info("node name: ", node.GetName(), " has a different uuid. Skip deleting this node from cache.")
+	}
+	delete(nm.nodeUUIDMap, uuid)
+	nm.nodeInfoLock.Unlock()
 }
 
 func (nm *NodeManager) shakeOutNodeIDLookup(ctx context.Context, nodeID string, searchBy cm.FindVM) (*cm.VMDiscoveryInfo, error) {
@@ -183,6 +196,10 @@ func (nm *NodeManager) DiscoverNode(nodeID string, searchBy cm.FindVM) error {
 		return err
 	}
 
+	if vmDI.UUID == "" {
+		return errors.New("discovered VM UUID is empty")
+	}
+
 	var oVM mo.VirtualMachine
 	err = vmDI.VM.Properties(ctx, vmDI.VM.Reference(), []string{"guest", "summary"}, &oVM)
 	if err != nil {
@@ -199,6 +216,11 @@ func (nm *NodeManager) DiscoverNode(nodeID string, searchBy cm.FindVM) error {
 		return errors.New("VM Guest hostname is empty")
 	}
 
+	if len(oVM.Guest.Net) == 0 {
+		klog.V(4).Infof("oVM.Guest.Net is empty, skipping node discovery. This could be cauesd by vmtool not reporting correct IP address")
+		return errors.New("VM GuestNicInfo is empty")
+	}
+
 	tenantRef := vmDI.VcServer
 	if vmDI.TenantRef != "" {
 		tenantRef = vmDI.TenantRef
@@ -359,13 +381,14 @@ func (nm *NodeManager) DiscoverNode(nodeID string, searchBy cm.FindVM) error {
 
 	if len(oVM.Guest.Net) > 0 {
 		if !foundInternal && !foundExternal {
+			klog.V(4).Infof("oVM.Guest.Net=%v", oVM.Guest.Net)
 			return fmt.Errorf("unable to find suitable IP address for node %s with IP family %s", nodeID, ipFamily)
 		}
 	}
 
 	klog.V(2).Infof("Found node %s as vm=%+v in vc=%s and datacenter=%s",
 		nodeID, vmDI.VM, vmDI.VcServer, vmDI.DataCenter.Name())
-	klog.V(2).Info("Hostname: ", oVM.Guest.HostName, " UUID: ", oVM.Summary.Config.Uuid)
+	klog.V(2).Info("Hostname: ", oVM.Guest.HostName, " UUID: ", vmDI.UUID)
 
 	os := "unknown"
 	if g, ok := GuestOSLookup[oVM.Summary.Config.GuestId]; ok {
@@ -535,3 +558,13 @@ func (nm *NodeManager) FindNodeInfo(UUID string) (*NodeInfo, error) {
 	klog.V(4).Infof("FindNodeInfo( %s ) FOUND", UUIDlower)
 	return nodeInfo, nil
 }
+
+func (nm *NodeManager) getNodeNameByUUID(UUID string) string {
+	for k, v := range nm.nodeNameMap {
+		if v.UUID == UUID {
+			return k
+		}
+
+	}
+	return ""
+}
diff --git a/pkg/cloudprovider/vsphere/nodemanager_test.go b/pkg/cloudprovider/vsphere/nodemanager_test.go
index e58993054..94d5356ea 100644
--- a/pkg/cloudprovider/vsphere/nodemanager_test.go
+++ b/pkg/cloudprovider/vsphere/nodemanager_test.go
@@ -79,11 +79,11 @@ func TestRegUnregNode(t *testing.T) {
 
 	nm.UnregisterNode(node)
 
-	if len(nm.nodeNameMap) != 1 {
-		t.Errorf("Failed: nodeNameMap should be a length of  1")
+	if len(nm.nodeNameMap) != 0 {
+		t.Errorf("Failed: nodeNameMap should be a length of  0")
 	}
-	if len(nm.nodeUUIDMap) != 1 {
-		t.Errorf("Failed: nodeUUIDMap should be a length of  1")
+	if len(nm.nodeUUIDMap) != 0 {
+		t.Errorf("Failed: nodeUUIDMap should be a length of  0")
 	}
 	if len(nm.nodeRegUUIDMap) != 0 {
 		t.Errorf("Failed: nodeRegUUIDMap should be a length of 0")
diff --git a/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/ippool/ippool_controller_test.go b/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/ippool/ippool_controller_test.go
index 1f9a3d32f..a848086db 100644
--- a/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/ippool/ippool_controller_test.go
+++ b/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/ippool/ippool_controller_test.go
@@ -148,16 +148,16 @@ func TestProcessIPPoolCreateOrUpdate(t *testing.T) {
 			c, cs := newController()
 
 			if _, err := c.ippoolclientset.NsxV1alpha1().IPPools(testClusterNS).Create(context.Background(), &testIPPool, metav1.CreateOptions{}); err != nil {
-				t.Errorf("failed to create test ippool %s: %w", testIPPool.Name, err)
+				t.Errorf("failed to create test ippool %s: %v", testIPPool.Name, err)
 			}
 
 			if err := c.processIPPoolCreateOrUpdate(&testIPPool); err != nil {
-				t.Errorf("failed to processIPPoolCreateOrUpdate %v: %w", testIPPool, err)
+				t.Errorf("failed to processIPPoolCreateOrUpdate %v: %v", testIPPool, err)
 			}
 
 			for _, n := range tc.nodes {
 				if _, err := c.kubeclientset.CoreV1().Nodes().Create(context.Background(), &n, metav1.CreateOptions{}); err != nil {
-					t.Errorf("failed to create test node %s: %w", n.Name, err)
+					t.Errorf("failed to create test node %s: %v", n.Name, err)
 				}
 			}
 
diff --git a/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller_test.go b/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller_test.go
index 53d30ccf3..1ccbff73e 100644
--- a/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller_test.go
+++ b/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller_test.go
@@ -131,12 +131,12 @@ func TestProcessNodeCreateOrUpdate(t *testing.T) {
 			// create nodes and run process processNodeCreateOrUpdate
 			for _, n := range tc.nodes {
 				if err := ippc.processNodeCreateOrUpdate(&n); err != nil {
-					t.Errorf("failed to create test node %s: %w", n.Name, err)
+					t.Errorf("failed to create test node %s: %v", n.Name, err)
 				}
 			}
 			for _, n := range tc.nodesUpdate {
 				if err := ippc.processNodeCreateOrUpdate(&n); err != nil {
-					t.Errorf("failed to create test node %s: %w", n.Name, err)
+					t.Errorf("failed to create test node %s: %v", n.Name, err)
 				}
 			}
 
@@ -231,14 +231,14 @@ func TestProcessNodeDelete(t *testing.T) {
 			if tc.ippoolExist {
 				// pre create test nodes
 				if _, err := createIPPool(ippcs, tc.nodes); err != nil {
-					t.Errorf("failed to create ippool %w", err)
+					t.Errorf("failed to create ippool %v", err)
 				}
 			}
 
 			// delete node
 			for _, n := range tc.nodesToBeDeleted {
 				if err := ippc.processNodeDelete(n.Name); err != nil {
-					t.Errorf("failed to create test node %s: %w", n.Name, err)
+					t.Errorf("failed to create test node %s: %v", n.Name, err)
 				}
 			}
 
diff --git a/releases/v1.21/vsphere-cloud-controller-manager.yaml b/releases/v1.21/vsphere-cloud-controller-manager.yaml
index 85a3a5d40..4f4e7b530 100644
--- a/releases/v1.21/vsphere-cloud-controller-manager.yaml
+++ b/releases/v1.21/vsphere-cloud-controller-manager.yaml
@@ -234,7 +234,7 @@ spec:
       serviceAccountName: cloud-controller-manager
       containers:
         - name: vsphere-cloud-controller-manager
-          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.21.2
+          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.21.3
           args:
             - --cloud-provider=vsphere
             - --v=2
diff --git a/test/vcsim/Dockerfile b/test/vcsim/Dockerfile
index 1aa37ad81..a8022e2e7 100644
--- a/test/vcsim/Dockerfile
+++ b/test/vcsim/Dockerfile
@@ -22,8 +22,8 @@ ENV LC_ALL=C.UTF-8
 
 # Copy the vCenter simulator and govc binaries.
 COPY --from=builder /go/src/github.com/vmware/govmomi/govc/govc \
-                    /go/src/github.com/vmware/govmomi/vcsim/vcsim \
-                    /usr/local/bin/
+    /go/src/github.com/vmware/govmomi/vcsim/vcsim \
+    /usr/local/bin/
 
 # Set the working directory.
 WORKDIR /