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 0.49.x] Bump github.com/hashicorp/consul/api module to match main and fix linter failure #1704

Closed
wants to merge 0 commits into from

Conversation

analogue
Copy link
Collaborator

@analogue analogue commented Nov 11, 2022

Original backport: #1700
Backport failure: https://github.com/hashicorp/consul-k8s/actions/runs/3441242131/jobs/5740575684
Backport failure log:

...
# github.com/hashicorp/consul-k8s/control-plane/api/v1alpha1
api/v1alpha1/ingressgateway_types.go:251:3: unknown field 'Defaults' in struct literal of type "github.com/hashicorp/consul/api".IngressGatewayConfigEntry
api/v1alpha1/ingressgateway_types.go:355:3: unknown field 'MaxConnections' in struct literal of type "github.com/hashicorp/consul/api".IngressService
api/v1alpha1/ingressgateway_types.go:356:3: unknown field 'MaxPendingRequests' in struct literal of type "github.com/hashicorp/consul/api".IngressService
api/v1alpha1/ingressgateway_types.go:357:3: unknown field 'MaxConcurrentRequests' in struct literal of type "github.com/hashicorp/consul/api".IngressService
api/v1alpha1/ingressgateway_types.go:464:50: undefined: api.IngressServiceConfig
api/v1alpha1/ingressgateway_types.go:468:15: undefined: api.IngressServiceConfig
ERROR: Failed to build Consul for linux/amd64

Exited with code exit status 1

This just bumps the github.com/hashicorp/consul/api module in go.mod to fix the linter failures and match the version on the main branch.

There are other linter failures related to peering acceptor, but I'll just limit scope to the failures introduced by this backport.

@analogue analogue requested review from thisisnotashwin, a team and kschoche and removed request for a team November 11, 2022 19:21
@analogue analogue changed the title Bump github.com/hashicorp/consul/api module to match main and fix lin… [backport 0.49.x] Bump github.com/hashicorp/consul/api module to match main and fix lin… Nov 11, 2022
@analogue analogue marked this pull request as ready for review November 11, 2022 19:21
@thisisnotashwin
Copy link
Contributor

It appears that there are still some linting errors.

@analogue
Copy link
Collaborator Author

Yeah, noted in description. I can fix and figure out which backport PR they originated from and add that person as a reviewer.

@jmurret jmurret changed the base branch from release/0.49.x to jm/peer-to-peername-cherrypick November 11, 2022 22:25
@jmurret jmurret changed the title [backport 0.49.x] Bump github.com/hashicorp/consul/api module to match main and fix lin… [backport 0.49.x] Bump github.com/hashicorp/consul/api module to match main and fix linter failure Nov 11, 2022
@thisisnotashwin
Copy link
Contributor

Has this change been backported? It says there are no files in the diff

Base automatically changed from jm/peer-to-peername-cherrypick to release/0.49.x November 14, 2022 15:56
@jmurret jmurret closed this Nov 14, 2022
@jmurret jmurret force-pushed the sp/fix-broken-linter branch from def64dc to 4f14a73 Compare November 14, 2022 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants