Fix golangci-lint errors #10196

z1cheng · 2023-07-10T13:42:08Z

What this PR does / why we need it:

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
CVE Report (Scanner found CVE and adding report)
Breaking change (fix or feature that would cause existing functionality to change)
Documentation only

Which issue/s this PR fixes

fixes #10097

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 unit and/or e2e tests to cover my changes.
All new and existing tests passed.

netlify · 2023-07-10T13:42:16Z

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name	Link
🔨 Latest commit	`fe3dae9`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/64f03057fa0a560008090f9f

k8s-ci-robot · 2023-07-10T13:42:16Z

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 · 2023-07-10T13:42:17Z

Hi @z1cheng. 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.

Signed-off-by: z1cheng <imchench@gmail.com>

tao12345666333

Thanks!

let's wait for CI

/ok-to-test

cmd/nginx/main_test.go

cmd/plugin/util/util.go

internal/ingress/annotations/alias/main_test.go

internal/ingress/annotations/annotations.go

test/e2e/endpointslices/topology.go

internal/net/ssl/ssl.go

internal/ingress/controller/template/template.go

rikatz · 2023-08-11T13:58:02Z

/approve
/hold
Thanks for this contribution @z1cheng this is really great. Left just two comments to be reverted, otherwise lgtm.

Leaving now for @tao12345666333 for the lgtm as a second pass, in case I've missed something.

Signed-off-by: z1cheng <imchench@gmail.com>

…to fix_lint_errors

Signed-off-by: z1cheng <imchench@gmail.com>

z1cheng · 2023-08-12T07:33:48Z

test/e2e/framework/k8s.go

@@ -143,16 +143,21 @@ func (f *Framework) EnsureDeployment(deployment *appsv1.Deployment) *appsv1.Depl
 }

 // waitForPodsReady waits for a given amount of time until a group of Pods is running in the given namespace.
-func waitForPodsReady(kubeClientSet kubernetes.Interface, timeout time.Duration, expectedReplicas int, namespace string, opts metav1.ListOptions) error {
+func waitForPodsReady(kubeClientSet kubernetes.Interface, timeout time.Duration, expectedReplicas int, namespace string, opts *metav1.ListOptions) error {
+	//nolint:staticcheck // TODO: will replace it since wait.PollImmediate is deprecated


Create a followup issue to track: #10305

tao12345666333 · 2023-08-24T01:26:42Z

/re-test

tao12345666333 · 2023-08-24T01:28:29Z

/retest

internal/net/ssl/ssl.go

Signed-off-by: z1cheng <imchench@gmail.com>

tao12345666333

/lgtm

Thanks!

k8s-ci-robot · 2023-08-31T07:32:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, tao12345666333, z1cheng

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:

~~OWNERS~~ [rikatz,tao12345666333]

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

z1cheng · 2023-08-31T07:36:21Z

/hold cancel

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 10, 2023

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 10, 2023

k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 10, 2023

k8s-ci-robot requested review from cpanato and puerco July 10, 2023 13:42

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2023

z1cheng force-pushed the fix_lint_errors branch from b44a5a0 to a946384 Compare July 22, 2023 07:44

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2023

Fix golangci-lint errors

d4ace6a

Signed-off-by: z1cheng <imchench@gmail.com>

z1cheng force-pushed the fix_lint_errors branch from ca8191b to d4ace6a Compare July 23, 2023 15:26

z1cheng marked this pull request as ready for review July 23, 2023 15:27

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 23, 2023

k8s-ci-robot requested review from strongjz and tao12345666333 July 23, 2023 15:27

Fix dupl errors

587963a

Signed-off-by: z1cheng <imchench@gmail.com>

tao12345666333 reviewed Jul 24, 2023

View reviewed changes

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 Jul 24, 2023

tao12345666333 added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Aug 9, 2023

rikatz reviewed Aug 9, 2023

View reviewed changes

cmd/nginx/main_test.go Show resolved Hide resolved

rikatz reviewed Aug 9, 2023

View reviewed changes

cmd/plugin/util/util.go Outdated Show resolved Hide resolved

rikatz reviewed Aug 9, 2023

View reviewed changes

internal/ingress/annotations/alias/main_test.go Outdated Show resolved Hide resolved

rikatz reviewed Aug 9, 2023

View reviewed changes

internal/ingress/annotations/annotations.go Outdated Show resolved Hide resolved

rikatz reviewed Aug 11, 2023

View reviewed changes

test/e2e/endpointslices/topology.go Show resolved Hide resolved

rikatz reviewed Aug 11, 2023

View reviewed changes

internal/net/ssl/ssl.go Outdated Show resolved Hide resolved

rikatz reviewed Aug 11, 2023

View reviewed changes

internal/ingress/controller/template/template.go Outdated Show resolved Hide resolved

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 11, 2023

Fix comments

dbc161a

Signed-off-by: z1cheng <imchench@gmail.com>

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2023

Merge branch 'main' of https://github.com/kubernetes/ingress-nginx in…

925331c

…to fix_lint_errors

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2023

z1cheng mentioned this pull request Aug 11, 2023

Fix deferInLoop error #10299

Closed

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2023

Merge main branch and fix glangci errors

131099f

Signed-off-by: z1cheng <imchench@gmail.com>

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 12, 2023

z1cheng commented Aug 12, 2023

View reviewed changes

z1cheng requested a review from tao12345666333 August 14, 2023 11:09

tao12345666333 reviewed Aug 31, 2023

View reviewed changes

internal/net/ssl/ssl.go Outdated Show resolved Hide resolved

internal/net/ssl/ssl.go Outdated Show resolved Hide resolved

internal/net/ssl/ssl.go Outdated Show resolved Hide resolved

Revert write file permision

fe3dae9

Signed-off-by: z1cheng <imchench@gmail.com>

tao12345666333 approved these changes Aug 31, 2023

View reviewed changes

k8s-ci-robot assigned tao12345666333 Aug 31, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 31, 2023

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 31, 2023

k8s-ci-robot merged commit b3060bf into kubernetes:main Aug 31, 2023
45 checks passed

z1cheng deleted the fix_lint_errors branch August 31, 2023 07:36

z1cheng mentioned this pull request Sep 11, 2023

REQUEST: New membership for z1cheng kubernetes/org#4449

Closed

9 tasks

lionelnicolas mentioned this pull request Sep 26, 2023

HTTPS upstream vhost regression in 1.9.0 #10450

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix golangci-lint errors #10196

Fix golangci-lint errors #10196

z1cheng commented Jul 10, 2023

netlify bot commented Jul 10, 2023 •

edited

Loading

k8s-ci-robot commented Jul 10, 2023

k8s-ci-robot commented Jul 10, 2023

tao12345666333 left a comment

rikatz commented Aug 11, 2023

z1cheng Aug 12, 2023

tao12345666333 commented Aug 24, 2023

tao12345666333 commented Aug 24, 2023

tao12345666333 left a comment

k8s-ci-robot commented Aug 31, 2023

z1cheng commented Aug 31, 2023

Fix golangci-lint errors #10196

Fix golangci-lint errors #10196

Conversation

z1cheng commented Jul 10, 2023

What this PR does / why we need it:

Types of changes

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

netlify bot commented Jul 10, 2023 • edited Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

k8s-ci-robot commented Jul 10, 2023

k8s-ci-robot commented Jul 10, 2023

tao12345666333 left a comment

Choose a reason for hiding this comment

rikatz commented Aug 11, 2023

z1cheng Aug 12, 2023

Choose a reason for hiding this comment

tao12345666333 commented Aug 24, 2023

tao12345666333 commented Aug 24, 2023

tao12345666333 left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Aug 31, 2023

z1cheng commented Aug 31, 2023

netlify bot commented Jul 10, 2023 •

edited

Loading