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

chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (backport of #7334) #7847

Merged
merged 1 commit into from
Sep 25, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 25, 2023

Automatic cherry-pick of #7334 for branch release-2.0

Generated by action

cherry-picked commit 409438f
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.0
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 409438fbc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   app/kumactl/cmd/get/get_test.go
	modified:   pkg/core/logs/matcher_test.go
	modified:   pkg/core/managers/apis/dataplaneinsight/dataplane_insight_manager_test.go
	modified:   pkg/core/managers/apis/zoneegressinsight/zoneegressinsight_manager_test.go
	modified:   pkg/core/managers/apis/zoneingressinsight/zone_ingress_insight_manager_test.go
	modified:   pkg/core/managers/apis/zoneinsight/zone_insight_manager_test.go
	modified:   pkg/mads/server/server_test.go
	modified:   pkg/plugins/resources/k8s/store_test.go
	modified:   pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go
	modified:   pkg/plugins/runtime/k8s/controllers/pod_controller_test.go
	modified:   pkg/plugins/secrets/k8s/store_test.go
	modified:   pkg/xds/sync/dataplane_watchdog_test.go
	modified:   test/e2e_env/kubernetes/gateway/resources.go
	modified:   test/e2e_env/kubernetes/jobs/jobs.go
	modified:   test/e2e_env/kubernetes/meshtrafficpermission/api.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/golangci-lint.yml
	both modified:   mk/dependencies/deps.lock
	both modified:   mk/dev.mk
	deleted by us:   pkg/intercp/catalog/catalog_test.go
	both modified:   pkg/kds/server/components.go
	deleted by us:   pkg/kds/v2/client/zone_sync_test.go
	deleted by us:   pkg/kds/v2/server/components.go
	both modified:   pkg/test/store/store_test_template.go
	deleted by us:   test/blackbox_network_tests/dns_test.go
	deleted by us:   test/e2e_env/kubernetes/connectivity/headless_services.go
	both modified:   test/e2e_env/kubernetes/graceful/graceful.go
	both modified:   test/e2e_env/kubernetes/healthcheck/virtual_probes.go
	deleted by us:   test/e2e_env/kubernetes/meshcircuitbreaker/api.go
	deleted by us:   test/e2e_env/kubernetes/meshcircuitbreaker/meshcircuitbreaker.go
	deleted by us:   test/e2e_env/kubernetes/meshfaultinjection/api.go
	deleted by us:   test/e2e_env/kubernetes/meshhealthcheck/api.go
	deleted by us:   test/e2e_env/kubernetes/meshratelimit/api.go
	deleted by us:   test/e2e_env/kubernetes/meshretry/api.go
	deleted by us:   test/e2e_env/kubernetes/meshtimeout/meshtimeout.go
	both modified:   test/e2e_env/kubernetes/observability/applications_metrics.go
	both modified:   test/e2e_env/kubernetes/reachableservices/reachableservices.go
	both modified:   test/e2e_env/kubernetes/virtualoutbound/virtualoutbound.go
	both modified:   test/e2e_env/multizone/trafficroute/trafficroute.go
	deleted by us:   test/e2e_env/universal/meshretry/http.go
	both modified:   test/e2e_env/universal/mtls/mtls.go
	both modified:   test/e2e_env/universal/retry/retry.go

@michaelbeaumont michaelbeaumont enabled auto-merge (squash) September 25, 2023 15:35
@michaelbeaumont michaelbeaumont merged commit 83fda8a into release-2.0 Sep 25, 2023
2 checks passed
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.0-7334 branch September 25, 2023 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant