post 1.6.1 - update main (#669)

merge in changes from 1.6.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.6.1 (November 1, 2024)
+
+SECURITY:
+
+* Upgrade to support Envoy `1.31.2`. [[GH-661](https://github.com/hashicorp/consul-dataplane/pull/661)]
+
 ## 1.6.0 (October 15, 2024)
 
 SECURITY:

Dockerfile

@@ -11,7 +11,7 @@
 # prebuilt binaries in any other form.
 #
 ARG GOLANG_VERSION
-FROM envoyproxy/envoy-distroless:v1.31.2 as envoy-binary
+FROM envoyproxy/envoy-distroless:v1.32.1 as envoy-binary
 
 # Modify the envoy binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-binary
@@ -27,7 +27,7 @@ RUN apt-get update && apt install -y libcap2-bin
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/envoy
 RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/$BIN_NAME
 
-FROM hashicorp/envoy-fips:1.31.2-fips1402 as envoy-fips-binary
+FROM hashicorp/envoy-fips:1.32.1-fips1402 as envoy-fips-binary
 
 # Modify the envoy-fips binary to be able to bind to privileged ports (< 1024).
 FROM debian:bullseye-slim AS setcap-envoy-fips-binary

Makefile

@@ -124,7 +124,7 @@ copy-bootstrap-config: ## copy bootstrap config
 .PHONY: changelog
 changelog: ## build change log
 ifdef DP_LAST_RELEASE_GIT_TAG
-	@changelog-build \
+	go run github.com/hashicorp/go-changelog/cmd/changelog-build@latest \
 		-last-release $(DP_LAST_RELEASE_GIT_TAG) \
 		-entries-dir .changelog/ \
 		-changelog-template .changelog/changelog.tmpl \