Merge pull request #718 from lubronzhan/release_1.24.5

Release 1.24.5

charts/vsphere-cpi/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.24.4
+appVersion: 1.24.5
 description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
 name: vsphere-cpi
-version: 1.24.4
+version: 1.24.5
 keywords:
   - vsphere
   - vmware

charts/vsphere-cpi/README.md

@@ -149,7 +149,7 @@ helm repo add vsphere-cpi https://kubernetes.github.io/cloud-provider-vsphere
 helm repo update
 
 # Package CPI Chart
-VERSION=1.24.4
+VERSION=1.24.5
 cd charts
 helm package vsphere-cpi --version $VERSION --app-version $VERSION
 

charts/vsphere-cpi/values.yaml

@@ -58,7 +58,7 @@ serviceAccount:
 daemonset:
   annotations: {}
   image: gcr.io/cloud-provider-vsphere/cpi/release/manager
-  tag: v1.24.4
+  tag: v1.24.5
   pullPolicy: IfNotPresent
   dnsPolicy: ClusterFirst
   cmdline:

cluster/images/controller-manager/Dockerfile

@@ -14,7 +14,7 @@
 ##                               BUILD ARGS                                   ##
 ################################################################################
 # This build arg allows the specification of a custom Golang image.
-ARG GOLANG_IMAGE=golang:1.17.5
+ARG GOLANG_IMAGE=golang:1.17.13
 
 # The distroless image on which the CPI manager image is built.
 #
@@ -23,7 +23,7 @@ ARG GOLANG_IMAGE=golang:1.17.5
 # the fully-qualified image can be obtained by entering
 # "gcr.io/distroless/static:latest" in a browser and then copying the
 # fully-qualified image from the web page.
-ARG DISTROLESS_IMAGE=gcr.io/distroless/static@sha256:9b60270ec0991bc4f14bda475e8cae75594d8197d0ae58576ace84694aa75d7a
+ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11@sha256:a01d47d4036cae5a67a9619e3d06fa14a6811a2247b4da72b4233ece4efebd57
 
 ################################################################################
 ##                              BUILD STAGE                                   ##
@@ -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=1.24.4
+ARG VERSION=1.24.5
 
 # This build arg controls the GOPROXY setting
 ARG GOPROXY

docs/book/tutorials/disable-node-deletion.yaml

@@ -233,7 +233,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
         - name: vsphere-cloud-controller-manager
-          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.4
+          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.5
           args:
             - --cloud-provider=vsphere
             - --v=2

go.mod

@@ -13,9 +13,9 @@ require (
 	github.com/stretchr/testify v1.7.0
 	github.com/vmware-tanzu/vm-operator-api v0.1.4-0.20201118171008-5ca641b0e126
 	github.com/vmware/govmomi v0.27.3
-	github.com/vmware/vsphere-automation-sdk-go/lib v0.2.0
-	github.com/vmware/vsphere-automation-sdk-go/runtime v0.2.0
-	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.3.0
+	github.com/vmware/vsphere-automation-sdk-go/lib v0.4.0
+	github.com/vmware/vsphere-automation-sdk-go/runtime v0.4.0
+	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.9.0
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.24.1

go.sum

@@ -300,7 +300,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -517,12 +516,12 @@ github.com/vmware-tanzu/vm-operator-api v0.1.4-0.20201118171008-5ca641b0e126/go.
 github.com/vmware/govmomi v0.27.3 h1:gwHHxKbMTNJON/3WPK3EsqZyQznTdHJAyRYPRSLm6R8=
 github.com/vmware/govmomi v0.27.3/go.mod h1:daTuJEcQosNMXYJOeku0qdBJP9SOLLWB3Mqz8THtv6o=
 github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
-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/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/vmware/vsphere-automation-sdk-go/lib v0.4.0 h1:H341o+0k6BfcehXvCK9w+G/Yx8GgjrWam91ANlsVrE4=
+github.com/vmware/vsphere-automation-sdk-go/lib v0.4.0/go.mod h1:o0p10EpvLFXbws63s9vV66+OQwalnXJPNgl+BvPz5PY=
+github.com/vmware/vsphere-automation-sdk-go/runtime v0.4.0 h1:SJI34JDj28bZyTI93kCTdklXHaxJUnR+ebkMQ8eWfgA=
+github.com/vmware/vsphere-automation-sdk-go/runtime v0.4.0/go.mod h1:GqC85noyNzapJN4vIAO9jJ1EKVo3+jCW4/2VTaMvuSg=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.9.0 h1:P3d7ha+DggRzmg8mDRLxHFvG+9fv7Pz8CfVq02EsOMQ=
+github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.9.0/go.mod h1:bRwsoZpMvmP4GZXWvNDEuvlNe1xLfTtGT+pig2vuH38=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -694,6 +693,7 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

hack/images/ci/Dockerfile

@@ -3,7 +3,7 @@
 ################################################################################
 # The golang image is used to create the project's module and build caches
 # and is also the image on which this image is based.
-ARG GOLANG_IMAGE=golang:1.17.5
+ARG GOLANG_IMAGE=golang:1.17.13
 
 # The image from which the Terraform project used to turn up a K8s cluster is
 # copied, as well as several programs.
@@ -77,18 +77,18 @@ ENV LANG=en_US.UTF-8 LC_ALL=C.UTF-8
 #   * https://github.com/kubernetes/test-infra/blob/master/images/bootstrap/Dockerfile
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-      ca-certificates \
-      curl \
-      git \
-      jq \
-      locales \
-      mercurial \
-      python3 \
-      python3-pip \
-      ruby \
-      tar \
-      unzip \
-      zip && \
+    ca-certificates \
+    curl \
+    git \
+    jq \
+    locales \
+    mercurial \
+    python3 \
+    python3-pip \
+    ruby \
+    tar \
+    unzip \
+    zip && \
     rm -rf /var/cache/apt/* /var/lib/apt/lists/* && \
     pip3 install setuptools wheel --upgrade && \
     pip3 install awscli --upgrade && \
@@ -105,20 +105,20 @@ RUN apt-get update && \
 # for another image someday.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-      apt-transport-https \
-      ca-certificates \
-      curl \
-      gnupg2 \
-      software-properties-common \
-      lsb-release && \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg2 \
+    software-properties-common \
+    lsb-release && \
     rm -rf /var/cache/apt/* /var/lib/apt/lists/*
 
 # Add the Docker apt-repository
 RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "${ID}")/gpg | \
     gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
     echo \
-      "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
-      $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+    "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
+    $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 # Install Docker
 # TODO(bentheelder): the `sed` is a bit of a hack, look into alternatives.

index.yaml

@@ -1,9 +1,28 @@
 apiVersion: v1
 entries:
   vsphere-cpi:
+  - apiVersion: v2
+    appVersion: 1.24.5
+    created: "2023-04-28T16:01:31.672879-07:00"
+    description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
+    digest: 955f83d0d761f9e6df661d1b0041e0766219ac0bb7d0003a28e0f9e39e5bf932
+    home: https://github.com/kubernetes/cloud-provider-vsphere
+    icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png
+    keywords:
+    - vsphere
+    - vmware
+    - cloud
+    - provider
+    - cpi
+    name: vsphere-cpi
+    sources:
+    - https://github.com/kubernetes/cloud-provider-vsphere
+    urls:
+    - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.24.5.tgz
+    version: 1.24.5
   - apiVersion: v2
     appVersion: 1.24.4
-    created: "2023-03-03T13:36:45.853773-08:00"
+    created: "2023-04-28T16:01:31.671891-07:00"
     description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
     digest: cb07593cddfb431a5beaac9bcdc77c90f286c7875ce51d9b04b9a5d74e558653
     home: https://github.com/kubernetes/cloud-provider-vsphere
@@ -22,7 +41,7 @@ entries:
     version: 1.24.4
   - apiVersion: v2
     appVersion: 1.24.2
-    created: "2023-03-03T13:36:45.852473-08:00"
+    created: "2023-04-28T16:01:31.670967-07:00"
     description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
     digest: d0bfaf8a081128f9477b8d8ff00079f8506d4aa2ea899f55511d06400179b159
     home: https://github.com/kubernetes/cloud-provider-vsphere
@@ -41,7 +60,7 @@ entries:
     version: 1.24.2
   - apiVersion: v2
     appVersion: 1.24.1
-    created: "2023-03-03T13:36:45.85138-08:00"
+    created: "2023-04-28T16:01:31.670068-07:00"
     description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
     digest: 6e9dec3e4c6aaeed0d7f95aa2beade986d5a0a2261509b11479ceb1a51312096
     home: https://github.com/kubernetes/cloud-provider-vsphere
@@ -58,4 +77,4 @@ entries:
     urls:
     - https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.24.1.tgz
     version: 1.24.1
-generated: "2023-03-03T13:36:45.848893-08:00"
+generated: "2023-04-28T16:01:31.668966-07:00"

pkg/cloudprovider/vsphere/loadbalancer/nsxt_broker.go

@@ -78,7 +78,7 @@ type nsxtBroker struct {
 // NewNsxtBroker creates a new NsxtBroker using the configuration
 func NewNsxtBroker(connector client.Connector) (NsxtBroker, error) {
 	// perform API call to check connector
-	_, err := infra.NewDefaultLbMonitorProfilesClient(connector).List(nil, nil, nil, nil, nil, nil)
+	_, err := infra.NewLbMonitorProfilesClient(connector).List(nil, nil, nil, nil, nil, nil)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Connection to NSX-T API failed. Please check your connection settings.")
 	}
@@ -88,14 +88,14 @@ func NewNsxtBroker(connector client.Connector) (NsxtBroker, error) {
 // NewNsxtBrokerFromConnector creates a new NsxtBroker to the real API
 func NewNsxtBrokerFromConnector(connector client.Connector) NsxtBroker {
 	return &nsxtBroker{
-		lbServicesClient:        infra.NewDefaultLbServicesClient(connector),
-		lbVirtServersClient:     infra.NewDefaultLbVirtualServersClient(connector),
-		lbPoolsClient:           infra.NewDefaultLbPoolsClient(connector),
-		ipPoolsClient:           infra.NewDefaultIpPoolsClient(connector),
-		ipAllocationsClient:     ip_pools.NewDefaultIpAllocationsClient(connector),
-		lbAppProfilesClient:     infra.NewDefaultLbAppProfilesClient(connector),
-		lbMonitorProfilesClient: infra.NewDefaultLbMonitorProfilesClient(connector),
-		realizedEntitiesClient:  realized_state.NewDefaultRealizedEntitiesClient(connector),
+		lbServicesClient:        infra.NewLbServicesClient(connector),
+		lbVirtServersClient:     infra.NewLbVirtualServersClient(connector),
+		lbPoolsClient:           infra.NewLbPoolsClient(connector),
+		ipPoolsClient:           infra.NewIpPoolsClient(connector),
+		ipAllocationsClient:     ip_pools.NewIpAllocationsClient(connector),
+		lbAppProfilesClient:     infra.NewLbAppProfilesClient(connector),
+		lbMonitorProfilesClient: infra.NewLbMonitorProfilesClient(connector),
+		realizedEntitiesClient:  realized_state.NewRealizedEntitiesClient(connector),
 	}
 }
 

pkg/cloudprovider/vsphere/route/nsxtbroker.go

@@ -39,15 +39,15 @@ type nsxtBroker struct {
 	// TODO: will add tier0 static routes client
 	tier1StaticRoutesClient tier_1s.StaticRoutesClient
 	realizedEntitiesClient  realized_state.RealizedEntitiesClient
-	queryClient             *search.DefaultQueryClient
+	queryClient             search.QueryClient
 }
 
 // NewNsxtBroker creates a new NsxtBroker to the NSXT API
 func NewNsxtBroker(connector client.Connector) (NsxtBroker, error) {
 	return &nsxtBroker{
-		tier1StaticRoutesClient: tier_1s.NewDefaultStaticRoutesClient(connector),
-		realizedEntitiesClient:  realized_state.NewDefaultRealizedEntitiesClient(connector),
-		queryClient:             search.NewDefaultQueryClient(connector),
+		tier1StaticRoutesClient: tier_1s.NewStaticRoutesClient(connector),
+		realizedEntitiesClient:  realized_state.NewRealizedEntitiesClient(connector),
+		queryClient:             search.NewQueryClient(connector),
 	}, nil
 }
 

releases/v1.24/vsphere-cloud-controller-manager.yaml

@@ -236,7 +236,7 @@ spec:
       priorityClassName: system-node-critical
       containers:
         - name: vsphere-cloud-controller-manager
-          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.4
+          image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.5
           args:
             - --cloud-provider=vsphere
             - --v=2