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

rebase: update kubernetes to v1.23.0 #2699

Merged
merged 7 commits into from
Dec 13, 2021
Merged

Conversation

Madhu-1
Copy link
Collaborator

@Madhu-1 Madhu-1 commented Dec 8, 2021

updating go dependency to latest kubernetes released version i.e v1.23.0

closes #2698
closes #2590
depends-on: #2703

note:- other dependencies are auto-updated when I ran go mod commands

Signed-off-by: Madhu Rajanna madhupr007@gmail.com

@mergify mergify bot added the rebase update the version of an external component label Dec 8, 2021
go.mod Show resolved Hide resolved
@Madhu-1 Madhu-1 added the ci/skip/e2e skip running e2e CI jobs label Dec 9, 2021
@Madhu-1 Madhu-1 force-pushed the update-kube1.23 branch 4 times, most recently from cd7fcc6 to 58798ce Compare December 9, 2021 06:11
@Madhu-1 Madhu-1 removed the ci/skip/e2e skip running e2e CI jobs label Dec 9, 2021
@Madhu-1 Madhu-1 added ci/skip/e2e skip running e2e CI jobs and removed ci/skip/e2e skip running e2e CI jobs labels Dec 9, 2021
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 9, 2021

/retest all

@Madhu-1 Madhu-1 requested a review from nixpanic December 9, 2021 06:48
@nixpanic nixpanic added the component/build Issues and PRs related to compiling Ceph-CSI label Dec 9, 2021
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

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

Looks good to me, but something causes building e2e.test to fail now:

go test -tags=pacific -mod=vendor -c ./e2e
# sigs.k8s.io/json/internal/golang/encoding/json
vendor/sigs.k8s.io/json/internal/golang/encoding/json/encode.go:1249:12: sf.IsExported undefined (type reflect.StructField has no field or method IsExported)
vendor/sigs.k8s.io/json/internal/golang/encoding/json/encode.go:1255:18: sf.IsExported undefined (type reflect.StructField has no field or method IsExported)

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 9, 2021

  • ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@n61.gusty.ci.centos.org 'cd /opt/build/go/src/github.com/ceph/ceph-csi && make containerized-build CONTAINER_CMD=podman TARGET=e2e.test ENV_CSI_IMAGE_NAME=registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi USE_PULLED_IMAGE=yes'
    Warning: Permanently added 'n61.gusty.ci.centos.org,172.19.2.189' (ECDSA) to the list of known hosts.
    cephcsi image settings: registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi version canary
    podman inspect -f '{{.Id}}' registry-ceph-csi.apps.ocp.ci.centos.org/ceph-csi:devel > .devel-container-id

@nixpanic CI is failing because it's using the older devel image which is built for golang 1.16 we need a new image to be pushed to the CI registry for CI to pass. can you please help with that

go.mod Show resolved Hide resolved
@nixpanic
Copy link
Member

nixpanic commented Dec 9, 2021

I think images are rebuilt after a PR has been merged. See https://jenkins-ceph-csi.apps.ocp.ci.centos.org/job/build-images/

However, if a PR changes the build.env file, it should not download the pre-built container image, but build a new one from scratch... If that is not working for some reason, we need to fix that.

@nixpanic
Copy link
Member

nixpanic commented Dec 9, 2021

I think images are rebuilt after a PR has been merged. See https://jenkins-ceph-csi.apps.ocp.ci.centos.org/job/build-images/

However, if a PR changes the build.env file, it should not download the pre-built container image, but build a new one from scratch... If that is not working for some reason, we need to fix that.

Ah, it seems this is not done for all CI jobs...

def rebuild_test_container = sh(
script: "cd ~/build/ceph-csi && \${OLDPWD}/scripts/container-needs-rebuild.sh test origin/${git_since}",
returnStatus: true)
def rebuild_devel_container = sh(
script: "cd ~/build/ceph-csi && \${OLDPWD}/scripts/container-needs-rebuild.sh devel origin/${git_since}",
returnStatus: true)

It might be easier to send a PR updating Golang, get that merged so the container-images are rebuilt. And then update the Kubernetes dependency.

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 10, 2021

#2703 is to update the golang version to 1.17 once it's merged will rebase this one.

@nixpanic
Copy link
Member

When this PR is merged, #2590 can be closed as well.

nixpanic
nixpanic previously approved these changes Dec 10, 2021
build.env Outdated
@@ -16,7 +16,7 @@ BASE_IMAGE=docker.io/ceph/ceph:v16
CEPH_VERSION=octopus

# standard Golang options
GOLANG_VERSION=1.16.4
GOLANG_VERSION=1.17.4
Copy link
Member

Choose a reason for hiding this comment

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

This obviously is part of #2703 already, so a rebase will be needed. Setting depends-on: #2703 in the description so that Mergify should pick it up automatically.

@@ -38,6 +39,9 @@ RUN source /build.env \
&& dnf -y update \
&& dnf -y clean all \
&& gem install mdl \
&& mkdir -p ${GOROOT} \
&& curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \
Copy link
Member

Choose a reason for hiding this comment

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

This makes me sad, it breaks on non-amd64 architectures... But I also do not know of a better way to do this, current Fedora 35 (:latest) has golang-1.16.x 😞

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 10, 2021

@Rakshith-R you have requested changes. PTAL

@mergify mergify bot dismissed nixpanic’s stale review December 10, 2021 07:39

Pull request has been modified.

Rakshith-R
Rakshith-R previously approved these changes Dec 10, 2021
nixpanic
nixpanic previously approved these changes Dec 10, 2021
@mergify
Copy link
Contributor

mergify bot commented Dec 10, 2021

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

updating go dependency to latest kubernetes
released version i.e v1.23.0

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
as go-sum is auto generated, ignore checking
codespell on this file.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
updating the depencendices to golang 1.17.5
release

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
As we are updating the cephcsi main repo
to golang 1.17, updating the action package
to golang 1.17

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
installed the go version specified in build.env
in the test docker image.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
currently getting find command not found
and xargs command not found when we run
the dockerfile.test. installing findutils
to fix it.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
as part of running `go mod tidy` the unused
k8s.io/utils is removed from the vendor
directory.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@mergify mergify bot dismissed stale reviews from nixpanic and Rakshith-R December 10, 2021 10:22

Pull request has been modified.

@Madhu-1 Madhu-1 added the ci/retry/e2e Label to retry e2e retesting on approved PR's label Dec 10, 2021
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 10, 2021

X Exiting due to GUEST_PROVISION: Failed to start host: creating host: create: Error creating machine: Error in driver during machine creation: IP not available after waiting: machine minikube didn't return IP after 1 minute

CI failure

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 10, 2021

/retest ci/centos/upgrade-tests-rbd

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 13, 2021

/retest ci/centos/upgrade-tests-cephfs

@Madhu-1 Madhu-1 requested a review from a team December 13, 2021 05:23
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 13, 2021

X Exiting due to GUEST_PROVISION: Failed to start host: creating host: create: Error creating machine: Error in driver during machine creation: IP not available after waiting: machine minikube didn't return IP after 1 minute

failed due to above error

@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Dec 13, 2021

@Rakshith-R can you please bring your approval back on this one?

@mergify mergify bot merged commit b1a3b02 into ceph:devel Dec 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/retry/e2e Label to retry e2e retesting on approved PR's component/build Issues and PRs related to compiling Ceph-CSI rebase update the version of an external component
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update kubernetes dependency to v1.23.0
3 participants