Skip to content

Commit a1c6c1b

Browse files
nitin-sachdev-29nitin-sachdev-29
authored
Preparing 1.5.x branch for next release. (#4462)
1 parent f5b0a9f commit a1c6c1b

File tree

13 files changed

+109
-85
lines changed

13 files changed

+109
-85
lines changed

‎.changelog/4456.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
```release-note:improvement
2+
Updated consul/api, envoyextensions & troubleshoot submodules [[PR-4456](https://github.com/hashicorp/consul-k8s/pull/4456)]
3+
```
4+
```release-note:security
5+
updated golang.org/x/net dependency to 0.34.0 to fix vulnerability [[GO-2024-3333](https://pkg.go.dev/vuln/GO-2024-3333)] in CLI, CNI, acceptance and control-plane submodule.[[PR-4456](https://github.com/hashicorp/consul-k8s/pull/4456)]
6+
```

‎.release/security-scan.hcl

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ binary {
4040
"GHSA-r53h-jv2g-vpx6",
4141
"CVE-2024-26147", # alias
4242
"GHSA-jw44-4f3j-q396", # Tracked in NET-8174
43-
"CVE-2019-25210" # alias
43+
"CVE-2019-25210", # alias
44+
"GO-2022-0635"
4445
]
4546
}
4647
}

‎CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## 1.5.5 (January 10, 2025)
2+
3+
IMPROVEMENTS:
4+
5+
* cli: Introduce `gateway list` for collecting multiple components of all gateways' configuration by running a single command. [[GH-4433](https://github.com/hashicorp/consul-k8s/issues/4433)]
6+
* cli: Introduce `gateway read` for collecting multiple components of a gateway's configuration by running a single command. [[GH-4432](https://github.com/hashicorp/consul-k8s/issues/4432)]
7+
* Updated consul/api, envoyextensions & troubleshoot submodules [[PR-4456](https://github.com/hashicorp/consul-k8s/pull/4456)]
8+
9+
BUG FIXES:
10+
11+
* cli: fix issue where the `consul-k8s proxy list` command does not include API gateways. [[GH-4426](https://github.com/hashicorp/consul-k8s/issues/4426)]
12+
* connect-inject: fix issue where the ACL policy for the connect-injector included the `acl = "write"` rule twice when namespaces were not enabled. [[GH-4434](https://github.com/hashicorp/consul-k8s/issues/4434)]
13+
14+
SECURITY:
15+
16+
* updated golang.org/x/net dependency to 0.34.0 to fix vulnerability [[GO-2024-3333](https://pkg.go.dev/vuln/GO-2024-3333)] in CLI, CNI, acceptance and control-plane submodule.[[PR-4456](https://github.com/hashicorp/consul-k8s/pull/4456)]
17+
118
## 1.5.4 (November 4, 2023)
219

320
SECURITY:

‎acceptance/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ require (
127127
go.opentelemetry.io/otel/metric v1.19.0 // indirect
128128
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
129129
go.opentelemetry.io/otel/trace v1.19.0 // indirect
130-
golang.org/x/crypto v0.26.0 // indirect
130+
golang.org/x/crypto v0.32.0 // indirect
131131
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
132132
golang.org/x/mod v0.20.0 // indirect
133-
golang.org/x/net v0.28.0 // indirect
133+
golang.org/x/net v0.34.0 // indirect
134134
golang.org/x/oauth2 v0.10.0 // indirect
135-
golang.org/x/sync v0.8.0 // indirect
136-
golang.org/x/sys v0.24.0 // indirect
137-
golang.org/x/term v0.23.0 // indirect
138-
golang.org/x/text v0.17.0 // indirect
135+
golang.org/x/sync v0.10.0 // indirect
136+
golang.org/x/sys v0.29.0 // indirect
137+
golang.org/x/term v0.28.0 // indirect
138+
golang.org/x/text v0.21.0 // indirect
139139
golang.org/x/time v0.3.0 // indirect
140140
golang.org/x/tools v0.24.0 // indirect
141141
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎acceptance/go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
476476
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
477477
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
478478
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
479-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
480-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
479+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
480+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
481481
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
482482
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
483483
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -506,8 +506,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
506506
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
507507
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
508508
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
509-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
510-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
509+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
510+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
511511
golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
512512
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
513513
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -520,8 +520,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
520520
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
521521
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
522522
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
523-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
524-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
523+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
524+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
525525
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
526526
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
527527
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -559,16 +559,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
559559
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
560560
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
561561
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
562-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
563-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
562+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
563+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
564564
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
565565
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
566566
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
567567
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
568568
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
569569
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
570-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
571-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
570+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
571+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
572572
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
573573
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
574574
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -579,8 +579,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
579579
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
580580
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
581581
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
582-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
583-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
582+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
583+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
584584
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
585585
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
586586
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎charts/consul/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
apiVersion: v2
55
name: consul
6-
version: 1.5.5-dev
6+
version: 1.5.6-dev
77
appVersion: 1.19-dev
88
kubeVersion: ">=1.22.0-0"
99
description: Official HashiCorp Consul Chart

‎cli/go.mod

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/google/go-cmp v0.6.0
1414
github.com/hashicorp/consul-k8s/charts v0.0.0-00010101000000-000000000000
1515
github.com/hashicorp/consul-k8s/version v0.0.0
16-
github.com/hashicorp/consul/troubleshoot v0.7.1
16+
github.com/hashicorp/consul/troubleshoot v0.7.4
1717
github.com/hashicorp/go-hclog v1.5.0
1818
github.com/hashicorp/hcp-sdk-go v0.62.1-0.20230913154003-cf69c0370c54
1919
github.com/kr/text v0.2.0
@@ -22,7 +22,8 @@ require (
2222
github.com/olekukonko/tablewriter v0.0.5
2323
github.com/posener/complete v1.2.3
2424
github.com/stretchr/testify v1.8.4
25-
golang.org/x/text v0.14.0
25+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
26+
golang.org/x/text v0.21.0
2627
helm.sh/helm/v3 v3.14.4
2728
k8s.io/api v0.29.8
2829
k8s.io/apiextensions-apiserver v0.29.0
@@ -96,8 +97,8 @@ require (
9697
github.com/gorilla/websocket v1.5.0 // indirect
9798
github.com/gosuri/uitable v0.0.4 // indirect
9899
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
99-
github.com/hashicorp/consul/api v1.29.6 // indirect
100-
github.com/hashicorp/consul/envoyextensions v0.7.3 // indirect
100+
github.com/hashicorp/consul/api v1.31.0 // indirect
101+
github.com/hashicorp/consul/envoyextensions v0.7.7 // indirect
101102
github.com/hashicorp/errwrap v1.1.0 // indirect
102103
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
103104
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -165,13 +166,12 @@ require (
165166
go.opentelemetry.io/otel/trace v1.19.0 // indirect
166167
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
167168
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
168-
golang.org/x/crypto v0.22.0 // indirect
169-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
170-
golang.org/x/net v0.24.0 // indirect
169+
golang.org/x/crypto v0.32.0 // indirect
170+
golang.org/x/net v0.34.0 // indirect
171171
golang.org/x/oauth2 v0.10.0 // indirect
172-
golang.org/x/sync v0.6.0 // indirect
173-
golang.org/x/sys v0.19.0 // indirect
174-
golang.org/x/term v0.19.0 // indirect
172+
golang.org/x/sync v0.10.0 // indirect
173+
golang.org/x/sys v0.29.0 // indirect
174+
golang.org/x/term v0.28.0 // indirect
175175
golang.org/x/time v0.3.0 // indirect
176176
google.golang.org/appengine v1.6.7 // indirect
177177
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect

0 commit comments

Comments
 (0)