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

Backport of NET-6294 - v1 Agentless proxycfg datasource errors after v2 changes into release/1.17.x #19416

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #19365 to be assessed for backporting due to the inclusion of the label backport/1.17.

The below text is copied from the body of the original PR.


Description

This PR is intended to fix the following message when running consul in v1 kubernetes and registering a service in kubernetes which spawns a s sidecar:

2023-10-24T16:22:00.507Z [ERROR] agent.proxycfg: Failed to handle update from watch: kind=connect-proxy proxy=default/default/forward1-55d89888cd-5758v-forward1-sidecar-proxy service_id=default/default/forward1-55d89888cd-5758v-forward1-sidecar-proxy id=service-http-checks:default/default/forward1-55d89888cd-5758v-forward1 error="error filling agent cache: Internal cache failure: service 'forward1-55d89888cd-5758v-forward1' not in agent state"

The following two issues that resulted to the fix of the above were also fixed:

  • TestEnvoy/case-api-gateway-http-hostnames was failing
  • TestHTTPRouteRetryAndTimeout was previously running TestHTTPRouteRetryAndTimeout has a panic when it is not set. When it is set, the panic goes away. NumRetries does not panic if it is unset, which is confusing.
dc1-consul-server-0-w6tcosn0t ~~ goroutine 435 [running]:
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/proto/private/pbconfigentry.RetryFilterFromStructs(...)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/proto/private/pbconfigentry/config_entry.gen.go:1837
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/proto/private/pbconfigentry.HTTPFiltersFromStructs(0x4001778a80, 0x40013ff200)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/proto/private/pbconfigentry/config_entry.gen.go:437 +0x274
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/proto/private/pbconfigentry.HTTPRouteRuleFromStructs(0x4001778a80, 0x4000956620)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/proto/private/pbconfigentry/config_entry.gen.go:700 +0x4c
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/proto/private/pbconfigentry.HTTPRouteFromStructs(0x4000ea7540, 0x400190bd00)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/proto/private/pbconfigentry/config_entry.gen.go:654 +0x27c
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/proto/private/pbconfigentry.ConfigEntryFromStructs({0x47fc0c0, 0x4000ea7540})
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/proto/private/pbconfigentry/config_entry.go:201 +0x620
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/agent/consul/state.EventPayloadConfigEntry.ToSubscriptionEvent(...)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/agent/consul/state/config_entry_events.go:71
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/agent/submatview.(*LocalMaterializer).subscribeOnce(0x40008e5500, {0x47ec2d8?, 0x400137ee60?}, 0x40012fe160)
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/agent/submatview/local_materializer.go:132 +0x304
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/agent/submatview.(*LocalMaterializer).Run(0x40008e5500, {0x47ec2d8, 0x400137ee60})
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/agent/submatview/local_materializer.go:68 +0x60
dc1-consul-server-0-w6tcosn0t ~~ github.com/hashicorp/consul/agent/submatview.(*Store).readEntry.func1()
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/agent/submatview/store.go:236 +0x50
dc1-consul-server-0-w6tcosn0t ~~ created by github.com/hashicorp/consul/agent/submatview.(*Store).readEntry in goroutine 423
dc1-consul-server-0-w6tcosn0t ~~ 	/Users/jmurret/Documents/github/hashicorp/consul/agent/submatview/store.go:235 +0x430

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core requested a review from a team as a code owner October 27, 2023 20:06
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/NET-6294/actually-next-civet branch from 116be6d to e576a31 Compare October 27, 2023 20:06
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/NET-6294/actually-next-civet branch from b956c7f to c64a91c Compare October 27, 2023 20:06
@github-actions github-actions bot added theme/api Relating to the HTTP API interface pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support labels Oct 27, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 9f85516 into release/1.17.x Oct 27, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/jm/NET-6294/actually-next-civet branch October 27, 2023 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project theme/api Relating to the HTTP API interface theme/envoy/xds Related to Envoy support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants