Commit Graph

29 Commits (e13a4c2e09e187215302d038e9467251c5c1d1d8)

Author SHA1 Message Date
hc-github-team-es-release-engineering e13a4c2e09
[DO NOT MERGE UNTIL EOY] EOY license fixes 1.15.x (#19787) 2024-01-02 08:38:56 -08:00
hc-github-team-consul-core c32f33b671
Backport of [NET-7009] security: update x/crypto to 0.17.0 into release/1.15.x (#20027)
backport of commit d8a33b4e72

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
2023-12-21 20:30:49 +00:00
hc-github-team-consul-core 1268d067c8
Backport of NET-6317 - update usage of deprecated fields: http2_protocol_options and access_log_path into release/1.15.x (#19951)
NET-6317 - update usage of deprecated fields: http2_protocol_options and access_log_path

Co-authored-by: John Murret <john.murret@hashicorp.com>
2023-12-14 14:57:12 -07:00
Ashesh Vidyut e2f2e49558
NET-3860 - [Supportability] consul troubleshoot CLI for verifying ports (#19835)
* cherry pick commit

* fix merge conf

* del import alias

* fix go mod

* fix go mod and licence
2023-12-06 15:26:50 +05:30
Michael Zalimeni 5f0212bbfc
Backport of [NET-6138] security: Bump google.golang.org/grpc to 1.56.3 (CVE-2023-44487) to release/1.15.x (#19421)
Bump google.golang.org/grpc to 1.56.3

This resolves [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487).

Also includes various fixes from later release versions required for
tests and linters to pass. See 77f44fa878
for the majority of these changes.

Co-authored-by: Chris Thain <chris.m.thain@gmail.com>
2023-10-30 10:51:34 -04:00
hc-github-team-consul-core c33ef90dde
Backport of [NET-5944] security: Update Go version to 1.20.10 and `x/net` to 0.17.0 into release/1.15.x (#19233)
* backport of commit d7d9de9564

* backport of commit 0794b1ce74

---------

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
2023-10-17 00:17:36 +00:00
hc-github-team-consul-core 78f6df469c
Backport of [NET-5146] security: Update Go version to 1.20.7 and `x/net` to 0.13.0 into release/1.15.x (#18362)
backport of commit 905e371607

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
2023-08-02 19:05:45 +00:00
hc-github-team-consul-core a799176bf1
Backport of [NET-4865] Bump golang.org/x/net to 0.12.0 into release/1.15.x (#18188)
Backport of [NET-4865] Bump golang.org/x/net to 0.12.0 into release/1.16.x (#18189)

Bump golang.org/x/net to 0.12.0

While not necessary to directly address CVE-2023-29406 (which should be
handled by using a patched version of Go when building), an
accompanying change to HTTP/2 error handling does impact agent code.

See https://go-review.googlesource.com/c/net/+/506995 for the HTTP/2
change.

Bump this dependency across our submodules as well for the sake of
potential indirect consumers of `x/net/http`.

Manual backport of 84cbf09185.
2023-07-19 16:54:33 +00:00
hc-github-team-consul-core 65cc60e87f
Backport of APIGW Normalize Status Conditions into release/1.15.x (#17844)
* APIGW Normalize Status Conditions (#16994)

* normalize status conditions for gateways and routes

* Added tests for checking condition status and panic conditions for
validating combinations, added dummy code for fsm store

* get rid of unneeded gateway condition generator struct

* Remove unused file

* run go mod tidy

* Update tests, add conflicted gateway status

* put back removed status for test

* Fix linting violation, remove custom conflicted status

* Update fsm commands oss

* Fix incorrect combination of type/condition/status

* cleaning up from PR review

* Change "invalidCertificate" to be of accepted status

* Move status condition enums into api package

* Update gateways controller and generated code

* Update conditions in fsm oss tests

* run go mod tidy on consul-container module to fix linting

* Fix type for gateway endpoint test

* go mod tidy from changes to api

* go mod tidy on troubleshoot

* Fix route conflicted reason

* fix route conflict reason rename

* Fix text for gateway conflicted status

* Add valid certificate ref condition setting

* Revert change to resolved refs to be handled in future PR

* Resolve sneaky merge conflicts

---------

Co-authored-by: John Maguire <john.maguire@hashicorp.com>
Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
2023-06-23 14:05:11 -04:00
malizz 09e11fb8e0
Update 1.15.x submodules, version, and changelog (#17559) 2023-06-15 13:17:54 +00:00
Michael Zalimeni 66f7d7b207
Manual backport 1.15.x of Disable remote proxy patching except AWS Lambda (#17432)
backport of commit ba18381ab2
2023-05-24 22:30:25 -04:00
Semir Patel afc96a6db2 bump consul/api and consul/envoyextensions 2023-03-07 13:31:19 -06:00
hc-github-team-consul-core a3a9b05e14
backport of commit 748e2a76cb (#16328)
Co-authored-by: DanStough <dan.stough@hashicorp.com>
2023-02-18 20:17:58 +00:00
hc-github-team-consul-core 0e89df2b7a
Backport of [OSS] security: update go to 1.20.1 into release/1.15.x (#16314)
* backport of commit 2a8cdf1747

* backport of commit 716d162048

* backport of commit 2c757fac4f

* backport of commit f81c5d4933

* backport of commit ff4f0596f3

* backport of commit 31bbca9fe4

* backport of commit 2f54191353

* backport of commit c263147180

---------

Co-authored-by: DanStough <dan.stough@hashicorp.com>
2023-02-17 21:00:25 +00:00
Nitya Dhanushkodi 94f4347ffe
Backport: troubleshoot: fixes and updated messages (#16294) (#16309) 2023-02-17 10:53:20 -08:00
malizz c10ba43eb3
get clusters from route if listener uses RDS (#16243) 2023-02-13 12:50:32 -08:00
Nitya Dhanushkodi 78a4b5fd6f
update the api in envoyextensions and troubleshoot modules (#16226) 2023-02-09 15:39:03 -08:00
malizz ba862ab6ad
troubleshoot basic envoy stats for an upstream (#16215)
* troubleshoot basic envoy stats for an upstream

* remove envoyID arg
2023-02-09 12:06:31 -08:00
malizz f5391ef142
update troubleshoot CLI, update flags and upstreams output (#16211)
* update troubleshoot CLI, update flags and upstreams output

* update troubleshoot upstreams output
2023-02-08 16:05:22 -08:00
Nitya Dhanushkodi ad7b71dbd7
troubleshoot: handle tproxy dialed directly case (#16210) 2023-02-08 14:49:38 -08:00
Nitya Dhanushkodi 1f25289048
troubleshoot: output messages for the troubleshoot proxy command (#16208) 2023-02-08 13:03:15 -08:00
malizz 0a544809c9
get upstream IPs (#16197)
* get upstream IPs

* separate test data

* fix lint issue

* fix lint issue
2023-02-07 14:57:31 -08:00
malizz 9881aa3f39
add cert tests (#16192) 2023-02-07 09:58:00 -08:00
malizz 3be514ac02
exclude inbound/outbound listeners from upstreams output (#16184) 2023-02-06 18:48:55 -08:00
Nitya Dhanushkodi b8b37c2357
refactor: remove troubleshoot module dependency on consul top level module (#16162)
Ensure nothing in the troubleshoot go module depends on consul's top level module. This is so we can import troubleshoot into consul-k8s and not import all of consul.

* turns troubleshoot into a go module [authored by @curtbushko]
* gets the envoy protos into the troubleshoot module [authored by @curtbushko]
* adds a new go module `envoyextensions` which has xdscommon and extensioncommon folders that both the xds package and the troubleshoot package can import
* adds testing and linting for the new go modules
* moves the unit tests in `troubleshoot/validateupstream` that depend on proxycfg/xds into the xds package, with a comment describing why those tests cannot be in the troubleshoot package
* fixes all the imports everywhere as a result of these changes 

Co-authored-by: Curt Bushko <cbushko@gmail.com>
2023-02-06 09:14:35 -08:00
Nitya Dhanushkodi 8d4c3aa42c
refactor: move service to service validation to troubleshoot package (#16132)
This is to reduce the dependency on xds from within the troubleshoot package.
2023-02-02 22:18:10 -08:00
malizz 71b5a4bf7c
validate certs and get stats (#16139) 2023-02-02 14:24:18 -08:00
malizz b15a6e02b4
update troubleshoot CLI (#16129) 2023-02-01 15:11:05 -08:00
malizz 6e814c5f86
add troubleshoot cli (#16070)
* add troubleshoot cli

* fix lint issue

* fix merge conflict

* fix lint issue
2023-02-01 11:37:30 -08:00