Skip to content

Commit

Permalink
pb-6681: vendor strok master to kdmp master for PSA support
Browse files Browse the repository at this point in the history
- added make target called vendor to eliminate compilation issue

Signed-off-by: Lalatendu Das <[email protected]>
  • Loading branch information
lalat-das committed May 15, 2024
1 parent 6aee747 commit 52b07b4
Show file tree
Hide file tree
Showing 9 changed files with 105 additions and 33 deletions.
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,15 @@ GO_FILES := $(shell find . -name '*.go' | grep -v 'vendor' | \
grep -v 'generated')

.DEFAULT_GOAL: all
.PHONY: test deploy build container
.PHONY: test vendor vendor-update deploy build container

vendor-update:
go mod download

vendor:
go mod tidy
go mod vendor
sed -i '1 i\// +build skipcompile\n' vendor/kubevirt.io/client-go/kubecli/kubevirt_test_utils.go

all: do-fmt pretest test-container build container

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc7
github.com/libopenstorage/stork v1.4.1-0.20240513102605-2340238c7664
github.com/libopenstorage/stork v1.4.1-0.20240515065340-81de2400f2b1
github.com/portworx/pxc v0.33.0
github.com/portworx/sched-ops v1.20.4-rc1.0.20240424153814-f3083bdb4578
github.com/sirupsen/logrus v1.9.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3362,8 +3362,8 @@ github.com/libopenstorage/stork v1.4.1-0.20230502135851-9cacb19e1df5/go.mod h1:R
github.com/libopenstorage/stork v1.4.1-0.20230519043154-cbc10dffaf19/go.mod h1:Xm4DHoViynFXMQKBXGj3IkA77LY2RBFkNtv6vbo3wNw=
github.com/libopenstorage/stork v1.4.1-0.20230601053837-5dd68f026569/go.mod h1:+mKPMCPNhS/XOF2RPcNFijkr67CCCWp0o8OXVG6xxAk=
github.com/libopenstorage/stork v1.4.1-0.20230610103146-72cf75320066/go.mod h1:Yst+fnOYjWk6SA5pXZBKm19wtiinjxQ/vgYTXI3k80Q=
github.com/libopenstorage/stork v1.4.1-0.20240513102605-2340238c7664 h1:bABYni9x1xTkaIzIvfeYj1MpubMp+kjV5K0qP9k1Xb4=
github.com/libopenstorage/stork v1.4.1-0.20240513102605-2340238c7664/go.mod h1:kp5qtpq+BgjL5WqiOpDvbPH1WGReO5AaqXDbb+XpvzM=
github.com/libopenstorage/stork v1.4.1-0.20240515065340-81de2400f2b1 h1:9KerP/OdPqEkJB7lQcNOh78PVmGdrUU+KomH4f5TvxM=
github.com/libopenstorage/stork v1.4.1-0.20240515065340-81de2400f2b1/go.mod h1:R5w3M262y8SDwJEPN9Ln7Z1ffNecXkcM8Vn2w+rpdig=
github.com/libopenstorage/systemutils v0.0.0-20160208220149-44ac83be3ce1/go.mod h1:xwNGC7xiz/BQ/wbMkvHujL8Gjgseg+x41xMek7sKRRQ=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions vendor/github.com/libopenstorage/stork/pkg/log/log.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ github.com/libopenstorage/openstorage-sdk-clients/sdk/golang
github.com/libopenstorage/secrets
github.com/libopenstorage/secrets/aws/credentials
github.com/libopenstorage/secrets/k8s
# github.com/libopenstorage/stork v1.4.1-0.20240513102605-2340238c7664
# github.com/libopenstorage/stork v1.4.1-0.20240515065340-81de2400f2b1
## explicit; go 1.21
github.com/libopenstorage/stork/drivers
github.com/libopenstorage/stork/drivers/volume
Expand Down

0 comments on commit 52b07b4

Please sign in to comment.