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

Updating to latest openshift/api and go 1.16. #10

Merged
merged 1 commit into from
Sep 22, 2021

Conversation

kwoodson
Copy link
Contributor

Updating the openshift/api as well as go-lang 1.16.

@kwoodson
Copy link
Contributor Author

@menglingwei @xiaobing.meng Would you mind reviewing this? This bumps the openshift/api dependencies as well as moving to go-lang 1.16.

@kwoodson
Copy link
Contributor Author

@JoelSpeed PTAL

Dockerfile.rhel Outdated Show resolved Hide resolved
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-alibabacloud
COPY . .
# VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own
RUN unset VERSION \
&& GOPROXY=off NO_DOCKER=1 make build

FROM registry.ci.openshift.org/ocp/4.8:base
FROM registry.ci.openshift.org/ocp/4.10:base
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JoelSpeed I also bumped this to 4.10. I was able to build successfully.

podman build -f Dockerfile.rhel 
[1/2] STEP 1/4: FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
[1/2] STEP 2/4: WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-alibabacloud
--> Using cache 3f8d785debff9b32f5f1e7f11f0adc9d8de837976239f754d52a16e2a3507aca
--> 3f8d785debf
[1/2] STEP 3/4: COPY . .
--> d30e78cbc4f
[1/2] STEP 4/4: RUN unset VERSION  && GOPROXY=off NO_DOCKER=1 make build
fatal: No tags can describe 'a3e82cc7c110ba648ecf2cb47b0b3c17b2302816'.
Try --always, or create some tags.
fatal: No tags can describe 'a3e82cc7c110ba648ecf2cb47b0b3c17b2302816'.
Try --always, or create some tags.
CGO_ENABLED=0 go build  -o "bin/machine-controller-manager" \
               -ldflags "-X github.com/AliyunContainerService/cluster-api-provider-alibabacloud/pkg/version.Raw=   -extldflags "-static"" "github.com/AliyunContainerService/cluster-api-provider-alibabacloud/cmd/manager"
--> ec075e15a01
[2/2] STEP 1/2: FROM registry.ci.openshift.org/ocp/4.10:base
[2/2] STEP 2/2: COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-alibabacloud/bin/machine-controller-manager /
[2/2] COMMIT
--> 77d2785aadd
77d2785aadd9fa24d8f61381bf1cad4b143bef54cdb5366fd0582c7ecbd72645

Copy link

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kwoodson
Copy link
Contributor Author

@menglingwei Can we get this merged please?

@menglingwei
Copy link
Collaborator

@menglingwei @xiaobing.meng Would you mind reviewing this? This bumps the openshift/api dependencies as well as moving to go-lang 1.16.

Sorry, 9.19-9.21 I'm on a national holiday. Now i'm going to do it

@menglingwei menglingwei merged commit 8d2c03f into AliyunContainerService:master Sep 22, 2021
@menglingwei
Copy link
Collaborator

@menglingwei Can we get this merged please?

DONE

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.

None yet

3 participants