Skip to content

Commit 6a8690f

Browse files
mnecasmnecas
committed
Fix the vsphere-xcopy-volume-populator vendors and github build
`make build-vsphere-xcopy-volume-populator-image` fails with: ``` go: google.golang.org/genproto/googleapis/[email protected]: module google.golang.org/genproto/googleapis/[email protected] requires go >= 1.23.0 (running go 1.22.9; GOTOOLCHAIN=local) Error: building at STEP "RUN go mod download && go mod verify": while running runtime: exit status 1 make: *** [Makefile:265: build-vsphere-xcopy-volume-populator-image] Error 1 ``` Signed-off-by: Martin Necas <[email protected]>
1 parent 1289a24 commit 6a8690f

File tree

123 files changed

+2921
-3744
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+2921
-3744
lines changed

‎.github/workflows/build-push-images.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,39 @@ jobs:
2323
- name: forklift-api
2424
file: build/forklift-api/Containerfile
2525
repo: forklift-api
26-
context: .
2726
- name: forklift-controller
2827
file: build/forklift-controller/Containerfile
2928
repo: forklift-controller
30-
context: .
3129
- name: forklift-operator
3230
file: build/forklift-operator/Containerfile
3331
repo: forklift-operator
34-
context: .
3532
- name: openstack-populator
3633
file: build/openstack-populator/Containerfile
3734
repo: openstack-populator
38-
context: .
3935
- name: openstack-populator
4036
file: build/openstack-populator/Containerfile
4137
repo: openstack-populator
42-
context: .
4338
- name: forklift-ova-provider-server
4439
file: build/ova-provider-server/Containerfile
4540
repo: forklift-ova-provider-server
46-
context: .
4741
- name: ovirt-populator
4842
file: build/ovirt-populator/Containerfile-upstream
4943
repo: ovirt-populator
50-
context: .
5144
- name: populator-controller
5245
file: build/populator-controller/Containerfile
5346
repo: populator-controller
54-
context: .
5547
- name: forklift-validation
5648
file: build/validation/Containerfile
5749
repo: forklift-validation
58-
context: .
5950
- name: virt-v2v
6051
file: build/virt-v2v/Containerfile-upstream
6152
repo: forklift-virt-v2v
62-
context: .
6353
- name: virt-v2v
6454
file: build/virt-v2v/Containerfile-upstream-fedora
6555
repo: forklift-virt-v2v-fedora
66-
context: .
6756
- name: vsphere-xcopy-volume-populator
6857
file: build/vsphere-xcopy-volume-populator/Containerfile
6958
repo: vsphere-xcopy-volume-populator
70-
context: "{{defaultContext}}:cmd/vsphere-xcopy-volume-populator"
7159
runs-on: ubuntu-latest
7260
steps:
7361
- name: Checkout forklift
@@ -84,7 +72,6 @@ jobs:
8472
uses: docker/build-push-action@v6
8573
with:
8674
push: true
87-
context: "${{ matrix.context }}"
8875
file: "${{ matrix.file }}"
8976
tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_ORG }}/${{ matrix.repo }}:${{ env.REGISTRY_TAG }}
9077

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ push-openstack-populator-image: build-openstack-populator-image
262262

263263
build-vsphere-xcopy-volume-populator-image: check_container_runtime
264264
$(eval VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE=$(REGISTRY)/$(REGISTRY_ORG)/vsphere-xcopy-volume-populator:$(REGISTRY_TAG))
265-
$(CONTAINER_CMD) build -t $(VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE) -f build/vsphere-xcopy-volume-populator/Containerfile cmd/vsphere-xcopy-volume-populator
265+
$(CONTAINER_CMD) build -t $(VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE) -f build/vsphere-xcopy-volume-populator/Containerfile .
266266

267267
push-vsphere-xcopy-volume-populator-image: build-vsphere-xcopy-volume-populator-image
268268
$(CONTAINER_CMD) push $(VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE)

‎build/vsphere-xcopy-volume-populator/Containerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ WORKDIR /usr/src/app
44

55
# pre-copy/cache go.mod for pre-downloading dependencies and only redownloading
66
# them in subsequent builds if they change
7-
COPY go.mod go.sum ./
7+
COPY . .
8+
WORKDIR /usr/src/app/cmd/vsphere-xcopy-volume-populator
89
RUN go mod download && go mod verify
910

10-
COPY . .
1111
RUN --mount=type=cache,target=/go/pkg/mod \
1212
--mount=type=cache,target=/.cache/go-build \
1313
go build -o bin/vsphere-xcopy-volume-populator
@@ -16,14 +16,14 @@ RUN make vmkfstools-wrapper
1616

1717
FROM registry.access.redhat.com/ubi9/ubi-minimal
1818

19-
COPY --from=builder /usr/src/app/bin/vsphere-xcopy-volume-populator \
19+
COPY --from=builder /usr/src/app/cmd/vsphere-xcopy-volume-populator/bin/vsphere-xcopy-volume-populator \
2020
/bin/vsphere-xcopy-volume-populator
2121

22-
COPY --from=builder /usr/src/app/vmkfstools-wrapper/vmkfstools-wrapper.vib \
22+
COPY --from=builder /usr/src/app/cmd/vsphere-xcopy-volume-populator/vmkfstools-wrapper/vmkfstools-wrapper.vib \
2323
/bin/vmkfstools-wrapper.vib
24-
COPY --from=builder /usr/src/app/vmkfstools-wrapper/vib-install-playbook.yaml \
24+
COPY --from=builder /usr/src/app/cmd/vsphere-xcopy-volume-populator/vmkfstools-wrapper/vib-install-playbook.yaml \
2525
/bin/vib-install-playbook.yaml
26-
COPY --from=builder /usr/src/app/vmkfstools-wrapper/esxi_hosts.yaml \
26+
COPY --from=builder /usr/src/app/cmd/vsphere-xcopy-volume-populator/vmkfstools-wrapper/esxi_hosts.yaml \
2727
/bin/esxi_hosts.yaml
2828

2929
ENTRYPOINT ["/bin/vsphere-xcopy-volume-populator"]

‎cmd/vsphere-xcopy-volume-populator/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ require (
3131
golang.org/x/crypto v0.28.0 // indirect
3232
golang.org/x/oauth2 v0.22.0 // indirect
3333
golang.org/x/time v0.5.0 // indirect
34+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect
35+
google.golang.org/grpc v1.64.0 // indirect
36+
google.golang.org/protobuf v1.34.2 // indirect
3437
gopkg.in/inf.v0 v0.9.1 // indirect
3538
gopkg.in/yaml.v2 v2.4.0 // indirect
3639
k8s.io/api v0.28.10 // indirect
@@ -99,9 +102,6 @@ require (
99102
golang.org/x/term v0.25.0 // indirect
100103
golang.org/x/text v0.21.0 // indirect
101104
golang.org/x/tools v0.24.0 // indirect
102-
google.golang.org/genproto/googleapis/rpc 7b384671a197 // indirect
103-
google.golang.org/grpc v1.67.1 // indirect
104-
google.golang.org/protobuf v1.35.1 // indirect
105105
gopkg.in/yaml.v3 v3.0.1 // indirect
106106
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
107107
k8s.io/mount-utils v0.31.1 // indirect

‎cmd/vsphere-xcopy-volume-populator/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,15 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
323323
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
324324
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
325325
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
326-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
327-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
326+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 h1:umK/Ey0QEzurTNlsV3R+MfxHAb78HCEX/IkuR+zH4WQ=
327+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM=
328328
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
329329
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
330330
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
331331
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
332332
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
333-
google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
334-
google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
333+
google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
334+
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
335335
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
336336
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
337337
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -341,8 +341,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
341341
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
342342
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
343343
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
344-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
345-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
344+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
345+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
346346
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
347347
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
348348
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎cmd/vsphere-xcopy-volume-populator/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/vsphere-xcopy-volume-populator/vendor/google.golang.org/grpc/MAINTAINERS.md‎

Lines changed: 13 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/vsphere-xcopy-volume-populator/vendor/google.golang.org/grpc/README.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/vsphere-xcopy-volume-populator/vendor/google.golang.org/grpc/SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/vsphere-xcopy-volume-populator/vendor/google.golang.org/grpc/backoff/backoff.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)