From 3c996d891499cfff5daa1c224a53c7a9d631ffcd Mon Sep 17 00:00:00 2001
From: Bartosz Cisek <bartosz.cisek@covantis.io>
Date: Thu, 25 Jul 2024 17:28:39 +0200
Subject: [PATCH] Update golang to 1.22.5 due to CVE

Closes #451

CVE-2024-24790
---
 .github/workflows/build.yml   |  3 ++-
 .github/workflows/release.yml |  3 ++-
 CHANGELOG.md                  | 16 ++++++++++++++++
 Makefile                      |  6 +++---
 VERSION                       |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index be6b6f9d..5cdb7527 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,10 +14,11 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.4
+          go-version: 1.22.5
       - name: Build Docker Image
         run: make push
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_ORG_NAME: ${{ secrets.DOCKER_ORG_NAME }}
           GIT_TAG_NAME: latest
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 32570ee2..35bacd5a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.4
+          go-version: 1.22.5
       - uses: olegtarasov/get-tag@v2.1
         id: tagName
       - name: Release Docker Image
@@ -23,6 +23,7 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_ORG_NAME: ${{ secrets.DOCKER_ORG_NAME }}
       - name: Release Binary
         run: make release
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..435f4d9e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,16 @@
+## 1.7.1 / 2024-08-02
+
+* [SECURITY] Update golang to 1.22.5 due to CVE-2024-24790
+
+## 1.7.0 / 2023-05-24
+
+* [FEATURE] Add topic and group exclusion parameters #379
+* [FEATURE] Upgrade golang to 1.20.4 0d5444a
+* [ENHANCEMENT] Set RootCAs to nil in default case 3852615
+* [ENHANCEMENT] Bump github.com/Shopify/sarama from 1.36.0 to 1.38.1 b9727bc
+* [ENHANCEMENT] Bump k8s.io/klog/v2 from 2.70.1 to 2.90.1 a450413
+* [ENHANCEMENT] update kingpin, prometheus, golang.org/x/net dependency 358eb6a
+* [ENHANCEMENT] bump golangci-lint to 1.52.2 d51342f
+* [ENHANCEMENT] upgrade github.com/prometheus/promu to v0.14.0 9f423db
+* [ENHANCEMENT] docs: add doc for zookeeper part ad9d078
+* [FIX] docs: fix Grafana dashboard URL 14363cc
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a99dc580..4c7c921d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ build: promu
 
 crossbuild: promu
 	@echo ">> crossbuilding binaries"
-	@$(PROMU) crossbuild --go=1.20
+	@$(PROMU) crossbuild --go=1.22 --parallelism 4
 
 tarball: promu
 	@echo ">> building release tarball"
@@ -48,10 +48,10 @@ docker: build
 	@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" --build-arg BIN_DIR=. .
 
 push: crossbuild
-	@echo ">> building and pushing multi-arch docker images, $(DOCKER_USERNAME),$(DOCKER_IMAGE_NAME),$(GIT_TAG_NAME)"
+	@echo ">> building and pushing multi-arch docker images, $(DOCKER_ORG_NAME),$(DOCKER_IMAGE_NAME),$(GIT_TAG_NAME)"
 	@docker login -u $(DOCKER_USERNAME) -p $(DOCKER_PASSWORD)
 	@docker buildx create --use
-	@docker buildx build -t "$(DOCKER_USERNAME)/$(DOCKER_IMAGE_NAME):$(GIT_TAG_NAME)" \
+	@docker buildx build -t "$(DOCKER_ORG_NAME)/$(DOCKER_IMAGE_NAME):$(GIT_TAG_NAME)" \
 		--output "$(PUSHTAG)" \
 		--platform "$(DOCKER_PLATFORMS)" \
 		.
diff --git a/VERSION b/VERSION
index bd8bf882..6e051c4c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1-rc6