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.

Sign up for GitHub

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

Jump to bottom

Update ingress to go 1.17 #7521

Merged
merged 6 commits into from
Aug 23, 2021
Merged

Update ingress to go 1.17 #7521

merged 6 commits into from
Aug 23, 2021

Conversation

swiftslee
Copy link
Contributor

@swiftslee swiftslee commented Aug 21, 2021 •
edited
Loading

What this PR does / why we need it:

  1. Change the go.mod
  2. Change ci.yaml
  3. Change all the test-runner references to point to k8s.gcr.io/ingress-nginx/e2e-test-runner:v20210822-g5e5faa24d@sha256:55c568d9e35e15d94b3ab41fe549b8ee4cd910cc3e031ddcccd06256755c5d89
  4. Fix the gofmt error

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

part of #7520

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 21, 2021
@k8s-ci-robot
Copy link
Contributor

@yuswift: This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 21, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @yuswift. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 21, 2021
@swiftslee
Copy link
Contributor Author

/cc @rikatz

@k8s-ci-robot k8s-ci-robot requested a review from rikatz August 21, 2021 15:14
@longwuyuan
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 21, 2021
@swiftslee
Copy link
Contributor Author

I think we need to retest.

@longwuyuan
Copy link
Contributor

I think we need to retest.

Yeah, that K8s v1.17 I think is benign but on a different note, maybe lets wait for more reviews. At least we now know that a simple pass does not break anything major.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 23, 2021
@swiftslee
Copy link
Contributor Author

/retitle Migrate to go 1.17

@k8s-ci-robot
Copy link
Contributor

@yuswift: Re-titling can only be requested by trusted users, like repository collaborators.

In response to this:

/retitle Migrate to go 1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@swiftslee swiftslee mentioned this pull request Aug 23, 2021
Closed
@swiftslee swiftslee changed the title Migrate go.mod to 1.17 Migrate to go 1.17 Aug 23, 2021
@swiftslee
Copy link
Contributor Author

@rikatz
I'm not sure if there are any files I missed to update the e2e-test-runner tag. If so, please point it out.
BTW, do we need to upgrade kube-webhook-gen to go 1.17?

@rikatz
Copy link
Contributor

rikatz commented Aug 23, 2021

/retitle Update ingress to go 1.17
/assign
Will check tomorrow :)

@k8s-ci-robot k8s-ci-robot changed the title Migrate to go 1.17 Update ingress to go 1.17 Aug 23, 2021
@rikatz
Copy link
Contributor

rikatz commented Aug 23, 2021

About kube-webhook-gen it's not as urgent as ingress (it does not receives connections, etc) but in a future yeah, we should probably update it

@rikatz
Copy link
Contributor

rikatz commented Aug 23, 2021

About the error: please run go mod tidy locally with go v1.17 and make a new commit :)

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 23, 2021
@swiftslee
Copy link
Contributor Author

About the error: please run go mod tidy locally with go v1.17 and make a new commit :)

Done :)

@swiftslee
Copy link
Contributor Author

swiftslee commented Aug 23, 2021 •
edited
Loading

hi @rikatz , as @zryfish suggested here , I updated some files with gofmt v1.17.

@rikatz
Copy link
Contributor

rikatz commented Aug 23, 2021 •
edited
Loading

@yuswift thanks.

A last change, so boilerplate verification can pass, in:

https://github.com/kubernetes/ingress-nginx/blob/main/hack/boilerplate/boilerplate.py#L196

Change to:

        r"^((// \+build.*\n)|(//go:build.*\n))+\n", re.MULTILINE)

@swiftslee
Copy link
Contributor Author

@yuswift thanks.

A last change, so boilerplate verification can pass, in:

https://github.com/kubernetes/ingress-nginx/blob/main/hack/boilerplate/boilerplate.py#L196

Change to:

        r"^((// \+build.*\n)|(//go:build.*\n))+\n", re.MULTILINE)

nice catch! done :)

@rikatz
Copy link
Contributor

rikatz commented Aug 23, 2021

/lgtm
/approve

Thanks.

We should probably cherry pick this to "legacy" branch so new legacy releases will use Go 1.17 as well

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 23, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, yuswift

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2021
@rikatz rikatz added this to the v1.0.0 milestone Aug 23, 2021
@k8s-ci-robot k8s-ci-robot merged commit c43ea4d into kubernetes:main Aug 23, 2021
@swiftslee
Copy link
Contributor Author

/cherry-pick legacy

k8s-ci-robot pushed a commit that referenced this pull request Aug 24, 2021
@swiftslee
cherry-pick #7521 Update ingress to go 1.17 (#7531)
f44bbe9 
* fix boilerplate verification

* fix go fmt error

* fix go mod error

* bump e2e-test-runner version

* bump github ci workflow to go 1.17

* bump go.mod to 1.17
@zryfish zryfish mentioned this pull request Aug 24, 2021
Merged
8 tasks
rchshld pushed a commit to joomcode/ingress-nginx that referenced this pull request May 19, 2023
@swiftslee @rchshld
Update ingress to go 1.17 (kubernetes#7521)
cee82a8 
* bump go.mod to 1.17

* bump github ci workflow to go 1.17

* bump e2e-test-runner version

* fix go mod error

* fix go fmt error

* fix boilerplate verification
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@strongjz strongjz Awaiting requested review from strongjz

@tao12345666333 tao12345666333 Awaiting requested review from tao12345666333

@rikatz rikatz Awaiting requested review from rikatz

Assignees

@rikatz rikatz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@swiftslee @k8s-ci-robot @longwuyuan @rikatz