Skip to content

Commit

Permalink
Update golang to 1.22.5 due to CVE
Browse files Browse the repository at this point in the history
  • Loading branch information
bartoszcisek authored and keyz182 committed Aug 2, 2024
1 parent 219c6f8 commit 3c996d8
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.20.4
go-version: 1.22.5
- uses: olegtarasov/[email protected]
id: tagName
- name: Release Docker Image
run: make push
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:
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)" \
.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.0
1.7.1-rc6

0 comments on commit 3c996d8

Please sign in to comment.