Skip to content

Commit 344554c

Browse files
nitin-sachdev-29nitin-sachdev-29
authored
Updated consul/api, envoyextensions & troubleshoot submodules (#4451)
* updated consul-dataplane version to 1.6.2, executed go mod tidy and added CHANGELOG.md * updated golang.org/x/net dependency to 0.34.0 to fix vulnerability https://pkg.go.dev/vuln/GO-2024-3333
1 parent 3418e79 commit 344554c

File tree

7 files changed

+44
-35
lines changed

7 files changed

+44
-35
lines changed

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 1.6.2 (January 7, 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+
8+
BUG FIXES:
9+
10+
* 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)]
11+
* 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)]
12+
113
## 1.6.1 (November 4, 2023)
214

315
SECURITY:

‎charts/consul/Chart.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
apiVersion: v2
55
name: consul
6-
version: 1.6.2-dev
7-
appVersion: 1.20-dev
6+
version: 1.6.2
7+
appVersion: 1.20.2
88
kubeVersion: ">=1.22.0-0"
99
description: Official HashiCorp Consul Chart
1010
home: https://www.consul.io
@@ -13,14 +13,14 @@ sources:
1313
- https://github.com/hashicorp/consul
1414
- https://github.com/hashicorp/consul-k8s
1515
annotations:
16-
artifacthub.io/prerelease: true
16+
artifacthub.io/prerelease: false
1717
artifacthub.io/images: |
1818
- name: consul
19-
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-dev
19+
image: hashicorp/consul:1.20.2
2020
- name: consul-k8s-control-plane
21-
image: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev
21+
image: hashicorp/consul-k8s-control-plane:1.6.2
2222
- name: consul-dataplane
23-
image: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev
23+
image: hashicorp/consul-dataplane:1.6.2
2424
- name: envoy
2525
image: envoyproxy/envoy:v1.25.11
2626
artifacthub.io/license: MPL-2.0

‎charts/consul/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ global:
6666
# image: "hashicorp/consul-enterprise:1.10.0-ent"
6767
# ```
6868
# @default: hashicorp/consul:<latest version>
69-
image: docker.mirror.hashicorp.services/hashicorppreview/consul:1.20-dev
69+
image: hashicorp/consul:1.20.2
7070

7171
# Array of objects containing image pull secret names that will be applied to each service account.
7272
# This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image.
@@ -86,7 +86,7 @@ global:
8686
# image that is used for functionality such as catalog sync.
8787
# This can be overridden per component.
8888
# @default: hashicorp/consul-k8s-control-plane:<latest version>
89-
imageK8S: docker.mirror.hashicorp.services/hashicorppreview/consul-k8s-control-plane:1.6-dev
89+
imageK8S: hashicorp/consul-k8s-control-plane:1.6.2
9090

9191
# The image pull policy used globally for images controlled by Consul (consul, consul-dataplane, consul-k8s, consul-telemetry-collector).
9292
# One of "IfNotPresent", "Always", "Never", and "". Refer to https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
@@ -793,7 +793,7 @@ global:
793793
# The name (and tag) of the consul-dataplane Docker image used for the
794794
# connect-injected sidecar proxies and mesh, terminating, and ingress gateways.
795795
# @default: hashicorp/consul-dataplane:<latest supported version>
796-
imageConsulDataplane: docker.mirror.hashicorp.services/hashicorppreview/consul-dataplane:1.6-dev
796+
imageConsulDataplane: hashicorp/consul-dataplane:1.6.2
797797

798798
# Configuration for running this Helm chart on the Red Hat OpenShift platform.
799799
# This Helm chart currently supports OpenShift v4.x+.

‎cli/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/posener/complete v1.2.3
2424
github.com/stretchr/testify v1.9.0
2525
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
26-
golang.org/x/text v0.17.0
26+
golang.org/x/text v0.21.0
2727
helm.sh/helm/v3 v3.14.4
2828
k8s.io/api v0.29.2
2929
k8s.io/apiextensions-apiserver v0.29.2
@@ -170,12 +170,12 @@ require (
170170
go.opentelemetry.io/otel/trace v1.28.0 // indirect
171171
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
172172
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
173-
golang.org/x/crypto v0.26.0 // indirect
174-
golang.org/x/net v0.28.0 // indirect
173+
golang.org/x/crypto v0.32.0 // indirect
174+
golang.org/x/net v0.34.0 // indirect
175175
golang.org/x/oauth2 v0.21.0 // indirect
176-
golang.org/x/sync v0.8.0 // indirect
177-
golang.org/x/sys v0.24.0 // indirect
178-
golang.org/x/term v0.23.0 // indirect
176+
golang.org/x/sync v0.10.0 // indirect
177+
golang.org/x/sys v0.29.0 // indirect
178+
golang.org/x/term v0.28.0 // indirect
179179
golang.org/x/time v0.5.0 // indirect
180180
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
181181
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect

‎cli/go.sum

+15-18
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,13 @@ github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
292292
github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
293293
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
294294
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
295-
github.com/hashicorp/consul/api v1.30.0 h1:ArHVMMILb1nQv8vZSGIwwQd2gtc+oSQZ6CalyiyH2XQ=
296-
github.com/hashicorp/consul/api v1.30.0/go.mod h1:B2uGchvaXVW2JhFoS8nqTxMD5PBykr4ebY4JWHTTeLM=
295+
github.com/hashicorp/consul/api v1.31.0 h1:32BUNLembeSRek0G/ZAM6WNfdEwYdYo8oQ4+JoqGkNQ=
297296
github.com/hashicorp/consul/api v1.31.0/go.mod h1:2ZGIiXM3A610NmDULmCHd/aqBJj8CkMfOhswhOafxRg=
298-
github.com/hashicorp/consul/envoyextensions v0.7.3 h1:5Gn1Hj135NYNRBmB3IdwhkxIHQgEJPjXYPZcA+05rNY=
299-
github.com/hashicorp/consul/envoyextensions v0.7.3/go.mod h1:tya/kHsOBGaeAS9inAfUFJIEJ812c125cQD4MrLTt2s=
297+
github.com/hashicorp/consul/envoyextensions v0.7.7 h1:4vTkYLsmknHqtzw3Zf74FJbLeg5flIjIN77A6FBVBUA=
300298
github.com/hashicorp/consul/envoyextensions v0.7.7/go.mod h1:tOlLYi2UgCDg4x6qhe+O9Kz4o6SQ7E8fRFxCUKH4pkk=
301299
github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg=
302300
github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s=
303-
github.com/hashicorp/consul/troubleshoot v0.7.1 h1:IQYxC1qsV3jO74VZDyPi283Ufi84/mXSMm53U8dsN2M=
304-
github.com/hashicorp/consul/troubleshoot v0.7.1/go.mod h1:U+fpb8yE3iGJTahAY1VGda4aYUDhaa0IZu+sIgGvcwk=
301+
github.com/hashicorp/consul/troubleshoot v0.7.4 h1:b1GqnBrQ739L+Xcz28gKxIVOigFcgBxOaYj1Jtl4FUA=
305302
github.com/hashicorp/consul/troubleshoot v0.7.4/go.mod h1:haNIaNQtUzxJ4Z6YEywctQ9gcACacnK7UbEwMRs8TCg=
306303
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
307304
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
@@ -647,8 +644,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
647644
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
648645
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
649646
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
650-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
651-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
647+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
648+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
652649
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
653650
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 h1:kx6Ds3MlpiUHKj7syVnbp57++8WpuKPcR5yjLBjvLEA=
654651
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ=
@@ -677,8 +674,8 @@ golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1
677674
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
678675
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
679676
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
680-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
681-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
677+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
678+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
682679
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
683680
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
684681
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -692,8 +689,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
692689
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
693690
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
694691
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
695-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
696-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
692+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
693+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
697694
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
698695
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
699696
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -730,23 +727,23 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
730727
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
731728
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
732729
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
733-
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
734-
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
730+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
731+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
735732
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
736733
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
737734
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
738735
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
739-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
740-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
736+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
737+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
741738
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
742739
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
743740
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
744741
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
745742
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
746743
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
747744
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
748-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
749-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
745+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
746+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
750747
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
751748
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
752749
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎control-plane/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ require (
3737
github.com/stretchr/testify v1.8.4
3838
go.uber.org/zap v1.25.0
3939
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
40-
golang.org/x/sync v0.8.0
4140
golang.org/x/text v0.17.0
4241
golang.org/x/time v0.3.0
4342
gomodules.xyz/jsonpatch/v2 v2.4.0
@@ -147,6 +146,7 @@ require (
147146
golang.org/x/mod v0.20.0 // indirect
148147
golang.org/x/net v0.28.0 // indirect
149148
golang.org/x/oauth2 v0.10.0 // indirect
149+
golang.org/x/sync v0.8.0 // indirect
150150
golang.org/x/sys v0.24.0 // indirect
151151
golang.org/x/term v0.23.0 // indirect
152152
golang.org/x/tools v0.24.0 // indirect

‎version/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222
// A pre-release marker for the version. If this is "" (empty string)
2323
// then it means that it is a final release. Otherwise, this is a pre-release
2424
// such as "dev" (in development), "beta", "rc1", etc.
25-
VersionPrerelease = "dev"
25+
VersionPrerelease = ""
2626
)
2727

2828
// GetHumanVersion composes the parts of the version in a way that's suitable

0 commit comments

Comments
 (0)