Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ramen to use csi-addons-0.11.0 #1695

Merged
merged 1 commit into from
Jan 14, 2025

Conversation

nirs
Copy link
Member

@nirs nirs commented Dec 4, 2024

Generated using:

% GOTOOLCHAIN=go1.22.9 go get github.com/csi-addons/[email protected]
go: upgraded go 1.22.5 => 1.22.7
go: upgraded toolchain go1.22.7 => go1.22.9
go: upgraded github.com/csi-addons/kubernetes-csi-addons v0.10.1-0.20240924092040-c11db0b867a1 => v0.11.0
go: upgraded google.golang.org/protobuf v1.35.1 => v1.35.2
go: upgraded k8s.io/api v0.31.1 => v0.31.2
go: upgraded k8s.io/apimachinery v0.31.1 => v0.31.2
go: upgraded sigs.k8s.io/controller-runtime v0.19.0 => v0.19.1

% go mod tidy
go: downloading github.com/sagikazarmark/locafero v0.4.0
go: downloading golang.org/x/tools v0.28.0
go: downloading github.com/frankban/quicktest v1.14.6
go: downloading github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
go: downloading github.com/sourcegraph/conc v0.3.0

Boris says we have now go 1.22.9 on the downstream build machines so we
can safely use it.

We need to add a GOTOOLCHAIN makefile variable later to make this
simpler for future updates.

go.mod Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
@nirs
Copy link
Member Author

nirs commented Jan 13, 2025

Need rebase

Generated using:

    % GOTOOLCHAIN=go1.22.9 go get github.com/csi-addons/[email protected]
    go: upgraded go 1.22.5 => 1.22.7
    go: upgraded toolchain go1.22.7 => go1.22.9
    go: upgraded github.com/csi-addons/kubernetes-csi-addons v0.10.1-0.20240924092040-c11db0b867a1 => v0.11.0
    go: upgraded google.golang.org/protobuf v1.35.1 => v1.35.2
    go: upgraded k8s.io/api v0.31.1 => v0.31.2
    go: upgraded k8s.io/apimachinery v0.31.1 => v0.31.2
    go: upgraded sigs.k8s.io/controller-runtime v0.19.0 => v0.19.1

    % go mod tidy
    go: downloading github.com/sagikazarmark/locafero v0.4.0
    go: downloading golang.org/x/tools v0.28.0
    go: downloading github.com/frankban/quicktest v1.14.6
    go: downloading github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
    go: downloading github.com/sourcegraph/conc v0.3.0

Boris says we have now go 1.22.9 on the downstream build machines so we
can safely use it.

We need to add a GOTOOLCHAIN makefile variable later to make this
simpler for future updates.

Signed-off-by: Nir Soffer <[email protected]>
@nirs nirs force-pushed the csi-addons-0.11.0-ramen branch from d77ef0a to 6e1c89c Compare January 13, 2025 21:02
@nirs nirs marked this pull request as ready for review January 13, 2025 21:03
@nirs nirs requested a review from ShyamsundarR January 13, 2025 21:03
@nirs
Copy link
Member Author

nirs commented Jan 13, 2025

Strange, go get updates go version to 1.22.7, but this cause make docker-build to fail:

[1/2] STEP 6/9: RUN go mod download
go: go.mod requires go >= 1.22.7 (running go 1.22.6; GOTOOLCHAIN=local)
Error: building at STEP "RUN go mod download": while running runtime: exit status 1
make: *** [Makefile:226: docker-build] Error 1

Maybe we need to update go in the e2e runner host?

@nirs
Copy link
Member Author

nirs commented Jan 13, 2025

Works locally, building in podman machine on macOS:

% make docker-build
podman build -t quay.io/ramendr/ramen-operator:latest .
[1/2] STEP 1/9: FROM docker.io/library/golang:1.22 AS builder
[1/2] STEP 2/9: WORKDIR /workspace
--> Using cache d9418a4269dd7cc03c5740b0fbd744a76e9c8a62f4070448794d220e6ea49623
--> d9418a4269dd
[1/2] STEP 3/9: COPY go.mod go.mod
--> b3ce5c018b25
[1/2] STEP 4/9: COPY go.sum go.sum
--> 18433eadcd0a
[1/2] STEP 5/9: COPY api/ api/
--> b80a745b143d
[1/2] STEP 6/9: RUN go mod download
--> 781478796d43
[1/2] STEP 7/9: COPY cmd/main.go cmd/main.go
--> 49af4777edb7
[1/2] STEP 8/9: COPY internal/controller/ internal/controller/
--> c4dcf0f38bed
[1/2] STEP 9/9: RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/main.go
--> e45c59149d25
[2/2] STEP 1/7: FROM registry.access.redhat.com/ubi8/ubi-minimal
[2/2] STEP 2/7: WORKDIR /
--> Using cache fb805da7e7310f94ac2cd9f75a0c4051801d3fce5fb3423202ecd041d8b15c6d
--> fb805da7e731
[2/2] STEP 3/7: COPY --from=builder /workspace/manager .
--> 40ca1c231c61
[2/2] STEP 4/7: RUN mkdir -p licenses
--> 0711418bb067
[2/2] STEP 5/7: COPY LICENSES/Apache-2.0.txt licenses/Apache-2.0.txt
--> f0ca331740de
[2/2] STEP 6/7: USER 65532:65532
--> 60b9d3eb7bc5
[2/2] STEP 7/7: ENTRYPOINT ["/manager"]
[2/2] COMMIT quay.io/ramendr/ramen-operator:latest
--> 9179c2fd9e91
Successfully tagged quay.io/ramendr/ramen-operator:latest
9179c2fd9e91fc15925206dc7ec555f78d804fd1e0948d4f73b7b5d5eab20326

@ShyamsundarR
Copy link
Member

If updating e2e with golang version, them let's move to go1.22.9 such that #1732 also gets covered.

@nirs
Copy link
Member Author

nirs commented Jan 13, 2025

The make docker-build resolved, it was a stale go 1.22 build container. podman image rm ... fixed the issue.

@ShyamsundarR
Copy link
Member

Merging, e2e failure is a known issue at present.

@ShyamsundarR ShyamsundarR merged commit 7cf01cb into RamenDR:main Jan 14, 2025
22 of 23 checks passed
@nirs nirs deleted the csi-addons-0.11.0-ramen branch January 14, 2025 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants