From a46db65216294c0c6a4274ba2a6055a278dcb7ae Mon Sep 17 00:00:00 2001 From: xudong liu Date: Wed, 3 Jul 2024 12:59:23 +0530 Subject: [PATCH] downgrade vm op api to fix ci Signed-off-by: xudong liu --- cluster/images/controller-manager/Dockerfile | 2 +- go.mod | 9 ++++++--- go.sum | 8 ++++---- hack/images/ci/Dockerfile | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cluster/images/controller-manager/Dockerfile b/cluster/images/controller-manager/Dockerfile index a6126dc14..b5499d30b 100644 --- a/cluster/images/controller-manager/Dockerfile +++ b/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.22.4 +ARG GOLANG_IMAGE=golang:1.22 # The distroless image on which the CPI manager image is built. ARG DISTROLESS_IMAGE=gcr.io/distroless/static-debian11:latest diff --git a/go.mod b/go.mod index 61b48e3a9..bca7d4093 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ module k8s.io/cloud-provider-vsphere -go 1.22.4 +go 1.22.0 -replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v1.8.7-0.20240625173706-a93aa9f0bda0 +toolchain go1.22.3 + +replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v1.8.6 require ( github.com/fsnotify/fsnotify v1.7.0 @@ -15,7 +17,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20231227030711-34390278f3cd github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240103020117-417d1d01f14b - github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20240625173706-a93aa9f0bda0 + github.com/vmware-tanzu/vm-operator/api v1.8.6 github.com/vmware/govmomi v0.38.0 github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0 github.com/vmware/vsphere-automation-sdk-go/runtime v0.7.0 @@ -75,6 +77,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo/v2 v2.17.2 // indirect github.com/onsi/gomega v1.33.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect diff --git a/go.sum b/go.sum index 44710c3c3..1b23b08e1 100644 --- a/go.sum +++ b/go.sum @@ -138,8 +138,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= +github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -182,8 +182,8 @@ github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20231227030711-34390278f3cd github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20231227030711-34390278f3cd/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk= github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240103020117-417d1d01f14b h1:QRC2/l0VwKDVpe5bQFYR4oX1Fad6Ch5FlDaQmkgLW1g= github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240103020117-417d1d01f14b/go.mod h1:dzob8tUzpAREQPtbbjQs4b1UyQDR37B2TiIdg8WJSRM= -github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20240625173706-a93aa9f0bda0 h1:PJYsetjTAFskQFjcaY0Kr4oTM1Y2LFSPH7nBl3SKc9o= -github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20240625173706-a93aa9f0bda0/go.mod h1:IrcgSXXeY8eEVPAPMZyMvN4JZRf+VQSmfiuI622WdlM= +github.com/vmware-tanzu/vm-operator/api v1.8.6 h1:NIndORjcnSmIlQsCMIewpIwg/ocRVDh2lYjOroTVLrU= +github.com/vmware-tanzu/vm-operator/api v1.8.6/go.mod h1:HHA2SNI9B5Yqtyp5t+Gt9WTWBi/fIkM6+MukDDSf11A= github.com/vmware/govmomi v0.38.0 h1:UvQpLAOjDpO0JUxoPCXnEzOlEa/9kejO6K58qOFr6cM= github.com/vmware/govmomi v0.38.0/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= github.com/vmware/vsphere-automation-sdk-go/lib v0.7.0 h1:pT+oqJ8FD5eUBQkl+e7LZwwtbwPvW5kDyyGXvt66gOM= diff --git a/hack/images/ci/Dockerfile b/hack/images/ci/Dockerfile index fd40f4bba..4227fe5c5 100644 --- a/hack/images/ci/Dockerfile +++ b/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.22.4 +ARG GOLANG_IMAGE=golang:1.22 # The image from which the Terraform project used to turn up a K8s cluster is # copied, as well as several programs.