Skip to content

Commit 37f5944

Browse files
authored
Caymanize Velero vSphere Plugin images (#605)
Signed-off-by: Nikhil Barge <[email protected]>
1 parent 09219c5 commit 37f5944

File tree

18 files changed

+72
-45
lines changed

18 files changed

+72
-45
lines changed

Dockerfile-backup-driver

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ FROM photon:5.0
1616
RUN tdnf -y upgrade && tdnf clean all
1717
COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /vddkLibs/
1818
ADD /bin/linux/amd64/backup-driver* /backup-driver
19+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/vddkLibs
1920
ENTRYPOINT ["/backup-driver"]

Dockerfile-datamgr

+1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ FROM photon:5.0
1717
RUN tdnf -y upgrade && tdnf clean all
1818
ADD /bin/linux/amd64/data-* /datamgr
1919
COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /vddkLibs/
20+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/vddkLibs
2021
ENTRYPOINT ["/datamgr"]

Dockerfile-plugin

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ ADD /bin/linux/amd64/data-* /
2020
ADD /bin/linux/amd64/backup-driver* /
2121
COPY /bin/linux/amd64/install.sh /scripts/
2222
COPY /bin/linux/amd64/lib/vmware-vix-disklib/lib64/* /plugins/
23-
ENV LD_LIBRARY_PATH=/plugins
23+
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/plugins
2424
RUN ["chmod", "+x", "/scripts/install.sh"]
2525
ENTRYPOINT ["/bin/sh","/scripts/install.sh"]

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ GIT_DIRTY = $(shell git status --porcelain 2> /dev/null)
6060
platform_temp = $(subst -, ,$(ARCH))
6161
GOOS = $(word 1, $(platform_temp))
6262
GOARCH = $(word 2, $(platform_temp))
63-
64-
BUILDER_IMAGE := golang:1.18
63+
SOURCE_PHOTON_IMAGE ?= golang:1.23
64+
BUILDER_IMAGE := $(SOURCE_PHOTON_IMAGE)
6565
PLUGIN_DOCKERFILE ?= Dockerfile-plugin
6666
DATAMGR_DOCKERFILE ?= Dockerfile-datamgr
6767
BACKUPDRIVER_DOCKERFILE ?= Dockerfile-backup-driver
@@ -137,7 +137,7 @@ shell: build-dirs
137137
-v "$$(pwd)/_output/bin:/output:delegated" \
138138
-v $$(pwd)/.go/std/$(GOOS)/$(GOARCH):/usr/local/go/pkg/$(GOOS)/$(GOARCH)_static:delegated \
139139
-v "$$(pwd)/.go/go-build:/.cache/go-build:delegated" \
140-
-e CGO_ENABLED=1 \
140+
-e CGO_ENABLED=1 -e GOEXPERIMENT=boringcrypto \
141141
-e GOPATH=/go \
142142
-w /go/src/$(PKG) \
143143
$(BUILDER_IMAGE) \

cmd/backup-driver/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import (
2222

2323
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/cmd"
2424
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/cmd/backupdriver"
25+
26+
// enable fips only mode
27+
_ "crypto/tls/fipsonly"
2528
)
2629

2730
func main() {

cmd/data-manager-for-plugin/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ import (
2424
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/cmd/datamgr"
2525

2626
"k8s.io/klog"
27+
28+
// enable fips only mode
29+
_ "crypto/tls/fipsonly"
2730
)
2831

2932
func main() {

cmd/velero-plugin-for-vsphere/main.go

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ import (
2525
plugins_pkg "github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/plugin"
2626
"github.com/vmware-tanzu/velero/pkg/features"
2727
veleroplugin "github.com/vmware-tanzu/velero/pkg/plugin/framework"
28+
29+
// enable fips only mode
30+
_ "crypto/tls/fipsonly"
2831
)
2932

3033
func main() {

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/vmware-tanzu/velero-plugin-for-vsphere
22

3-
go 1.18
3+
go 1.23
44

55
require (
6-
github.com/agiledragon/gomonkey v2.0.1+incompatible
6+
github.com/agiledragon/gomonkey v2.0.2+incompatible
77
github.com/aws/aws-sdk-go v1.44.207
88
github.com/evanphx/json-patch v5.6.0+incompatible
99
github.com/google/uuid v1.3.0
@@ -12,7 +12,7 @@ require (
1212
github.com/sirupsen/logrus v1.8.1
1313
github.com/spf13/cobra v1.4.0
1414
github.com/spf13/pflag v1.0.5
15-
github.com/stretchr/testify v1.8.1
15+
github.com/stretchr/testify v1.10.0
1616
github.com/vmware-tanzu/astrolabe v0.6.0
1717
github.com/vmware-tanzu/velero v1.10.2
1818
github.com/vmware/govmomi v0.22.2-0.20200329013745-f2eef8fc745f

go.sum

+17
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl
3737
cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
3838
cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
3939
cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM=
40+
cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
4041
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
4142
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
4243
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -50,6 +51,7 @@ cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcb
5051
cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y=
5152
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
5253
github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U=
54+
github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k=
5355
github.com/Azure/azure-sdk-for-go v61.4.0+incompatible h1:BF2Pm3aQWIa6q9KmxyF1JYKYXtVw67vtvu2Wd54NGuY=
5456
github.com/Azure/azure-sdk-for-go v61.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
5557
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA=
@@ -59,6 +61,7 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSu
5961
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 h1:Px2UA+2RvSSvv+RvJNuUB6n7rs5Wsel4dXLe90Um2n4=
6062
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo=
6163
github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM=
64+
github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck=
6265
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
6366
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
6467
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
@@ -112,6 +115,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
112115
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
113116
github.com/agiledragon/gomonkey v2.0.1+incompatible h1:DIQT3ZshgGz9pTwBddRSZWDutIRPx2d7UzmjzgWo9q0=
114117
github.com/agiledragon/gomonkey v2.0.1+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
118+
github.com/agiledragon/gomonkey v2.0.2+incompatible h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=
119+
github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
115120
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
116121
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
117122
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -226,6 +231,7 @@ github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM
226231
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
227232
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
228233
github.com/frankban/quicktest v1.13.1 h1:xVm/f9seEhZFL9+n5kv5XLrGwy6elc4V9v/XFY2vmd8=
234+
github.com/frankban/quicktest v1.13.1/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
229235
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
230236
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
231237
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
@@ -466,6 +472,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi
466472
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
467473
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
468474
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
475+
github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
469476
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
470477
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
471478
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -593,6 +600,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
593600
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
594601
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
595602
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
603+
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
596604
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
597605
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
598606
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -601,6 +609,7 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
601609
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyPlUHk/ofpgvBcNcawJLtf4PYHORLjAA=
602610
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
603611
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
612+
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
604613
github.com/labstack/echo/v4 v4.9.1 h1:GliPYSpzGKlyOhqIbG8nmHBo3i1saKWFOgh41AN3b+Y=
605614
github.com/labstack/echo/v4 v4.9.1/go.mod h1:Pop5HLc+xoc4qhTZ1ip6C0RtP7Z+4VzRLWZZFKqbbjo=
606615
github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
@@ -628,6 +637,7 @@ github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb
628637
github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
629638
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
630639
github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI=
640+
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
631641
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
632642
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
633643
github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
@@ -684,6 +694,7 @@ github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjH
684694
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
685695
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
686696
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
697+
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
687698
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
688699
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
689700
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -694,11 +705,13 @@ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
694705
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
695706
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
696707
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
708+
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
697709
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
698710
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
699711
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
700712
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
701713
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
714+
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
702715
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
703716
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
704717
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -815,6 +828,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
815828
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
816829
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
817830
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
831+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
832+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
818833
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
819834
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
820835
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -912,6 +927,7 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
912927
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
913928
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
914929
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
930+
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
915931
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
916932
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
917933
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
@@ -1423,6 +1439,7 @@ gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14231439
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
14241440
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14251441
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
1442+
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
14261443
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
14271444
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
14281445
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

hack/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [ -z "${GIT_SHA}" ]; then
4848
fi
4949

5050

51-
export CGO_ENABLED=1
51+
export GOEXPERIMENT=boringcrypto
5252

5353
if [[ -z "${GIT_DIRTY}" ]]; then
5454
GIT_TREE_STATE=clean

hack/crd-gen/main.go

+4-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/backupdriver/backup_driver_controller.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/constants"
2423
"io"
25-
"io/ioutil"
2624
"time"
2725

26+
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/constants"
27+
2828
"github.com/vmware-tanzu/astrolabe/pkg/astrolabe"
2929
backupdriverapi "github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/apis/backupdriver/v1alpha1"
3030
v1 "k8s.io/api/core/v1"
@@ -141,7 +141,7 @@ func (ctrl *backupDriverController) createSnapshot(snapshot *backupdriverapi.Sna
141141
return err
142142
}
143143

144-
mdBuf, err := ioutil.ReadAll(metadataReader) // TODO - limit this so it can't run us out of memory here
144+
mdBuf, err := io.ReadAll(metadataReader) // TODO - limit this so it can't run us out of memory here
145145
if err != nil && err != io.EOF {
146146
errMsg := fmt.Sprintf("createSnapshot PostSnapshot: Error happened when reading metadata: %v", err)
147147
ctrl.logger.Error(errMsg)
@@ -206,7 +206,7 @@ func (ctrl *backupDriverController) deleteSnapshot(deleteSnapshot *backupdrivera
206206
// Backups created in Guest Cluster when local-mode is set do not exercise the Backup Repository claims workflow, as
207207
// a result, the Backup Repository is unset. If the Backup Repository is observed unset when deleting the backup
208208
// then there is no need to retrieve the corresponding supervisor Backup Repository as it is implied local-mode.
209-
if ctrl.svcKubeConfig != nil && brName!= "" {
209+
if ctrl.svcKubeConfig != nil && brName != "" {
210210
// For guest cluster, get the supervisor backup repository name
211211
br, err := ctrl.backupdriverClient.BackupRepositories().Get(ctx, brName, metav1.GetOptions{})
212212
if err != nil {
@@ -289,7 +289,7 @@ func (ctrl *backupDriverController) cloneFromSnapshot(cloneFromSnapshot *backupd
289289
}
290290
return err
291291
}
292-
if pvc.Spec.StorageClassName != nil && (*pvc.Spec.StorageClassName) != ""{
292+
if pvc.Spec.StorageClassName != nil && (*pvc.Spec.StorageClassName) != "" {
293293
ctrl.logger.Infof("StorageClassName is %s for PVC %s/%s", *pvc.Spec.StorageClassName, pvc.Namespace, pvc.Name)
294294
} else {
295295
errMsg := fmt.Sprintf("cloneFromSnapshot PreCloneFromSnapshot: Failed for PVC %s/%s because StorageClassName is not set", pvc.Namespace, pvc.Name)

pkg/cmd/backupdriver/cli/install/install.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ package install
1919
import (
2020
"context"
2121
"fmt"
22+
2223
"github.com/vmware-tanzu/velero-plugin-for-vsphere/pkg/constants"
2324

25+
"os"
26+
2427
"github.com/pkg/errors"
2528
"github.com/spf13/cobra"
2629
"github.com/spf13/pflag"
@@ -31,9 +34,7 @@ import (
3134
"github.com/vmware-tanzu/velero/pkg/client"
3235
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
3336
"github.com/vmware-tanzu/velero/pkg/cmd/util/output"
34-
"io/ioutil"
3537
"k8s.io/client-go/kubernetes"
36-
"os"
3738

3839
kubeutil "github.com/vmware-tanzu/velero/pkg/util/kube"
3940
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -186,7 +187,7 @@ func (o *InstallOptions) Run(c *cobra.Command, f client.Factory) error {
186187
return nil
187188
}
188189

189-
//Complete completes options for a command.
190+
// Complete completes options for a command.
190191
func (o *InstallOptions) Complete(args []string, f client.Factory) error {
191192
fileName := "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
192193

@@ -201,7 +202,7 @@ func (o *InstallOptions) Complete(args []string, f client.Factory) error {
201202
return errors.WithStack(err)
202203
}
203204

204-
content, err := ioutil.ReadFile(fileName)
205+
content, err := os.ReadFile(fileName)
205206
if err != nil {
206207
return errors.WithStack(err)
207208
}
@@ -259,4 +260,3 @@ func (o *InstallOptions) CheckFeatureFlagsForBackupDriver(kubeClient kubernetes.
259260

260261
return nil
261262
}
262-

0 commit comments

Comments
 (0)