Skip to content

Commit de4165c

Browse files
brito-rafazachaller
brito-rafa
and
zachaller
authored
chore: bump k8s libraries and go to current supported versions (#4497)
* chore: updating k8s pkg to 1.34.1 with code refactored when needed Signed-off-by: Rafael Brito <[email protected]> * chore: another pass on bumping k8s libraries Signed-off-by: Rafael Brito <[email protected]> * chore: bumping to go 1.24.9 and tweking tests Signed-off-by: Rafael Brito <[email protected]> * chore: updating hashes on tests after k8s upgrade Signed-off-by: Rafael Brito <[email protected]> * chore: bumping go 1.24 on github actions Signed-off-by: Rafael Brito <[email protected]> * chore: updating go on github actions and updating hashes on e2e Signed-off-by: Rafael Brito <[email protected]> * chore: bumping kubectl library and dev Dockerfile to go 1.24 Signed-off-by: Rafael Brito <[email protected]> * chore(deps): using tag on notifications-engine library Signed-off-by: Rafael Brito <[email protected]> * fix codegen Signed-off-by: Zach Aller <[email protected]> * remove some test versions Signed-off-by: Zach Aller <[email protected]> --------- Signed-off-by: Rafael Brito <[email protected]> Signed-off-by: Zach Aller <[email protected]> Co-authored-by: Zach Aller <[email protected]>
1 parent d2ca4de commit de4165c

File tree

68 files changed

+4688
-3404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4688
-3404
lines changed

‎.github/workflows/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
## image-reuse.yaml
1818

1919
- The resuable workflow can be used to publish or build images with multiple container registries(Quay,GHCR, dockerhub), and then sign them with cosign when an image is published.
20-
- A GO version `must` be specified e.g. 1.19
20+
- A GO version `must` be specified e.g. 1.24
2121
- The image name for each registry *must* contain the tag. Note: multiple tags are allowed for each registry using a CSV type.
2222
- Multiple platforms can be specified e.g. linux/amd64,linux/arm64
2323
- Images are not published by default. A boolean value must be set to `true` to push images.

‎.github/workflows/docker-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
quay_image_name: ${{ needs.set-vars.outputs.controller-meta-tags }}
6969
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
70-
go-version: '1.23'
70+
go-version: '1.24'
7171
platforms: ${{ needs.set-vars.outputs.platforms }}
7272
push: ${{ github.event_name != 'pull_request' }}
7373
secrets:
@@ -84,7 +84,7 @@ jobs:
8484
with:
8585
quay_image_name: ${{ needs.set-vars.outputs.plugin-meta-tags }}
8686
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
87-
go-version: '1.23'
87+
go-version: '1.24'
8888
platforms: ${{ needs.set-vars.outputs.platforms }}
8989
push: ${{ github.event_name != 'pull_request' }}
9090
target: kubectl-argo-rollouts

‎.github/workflows/gh-pages.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Go
2727
uses: actions/[email protected]
2828
with:
29-
go-version: '1.23'
29+
go-version: '1.24'
3030
- name: build
3131
run: |
3232
pip install mkdocs mkdocs_material

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- 'master'
1010
env:
1111
# Golang version to use across CI steps
12-
GOLANG_VERSION: '1.23'
12+
GOLANG_VERSION: '1.24'
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
permissions: {}
88

99
env:
10-
GOLANG_VERSION: '1.23' # Note: go-version must also be set in job controller-image.with.go-version & plugin-image.with.go-version.
10+
GOLANG_VERSION: '1.24' # Note: go-version must also be set in job controller-image.with.go-version & plugin-image.with.go-version.
1111

1212
jobs:
1313
controller-image:
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
quay_image_name: quay.io/argoproj/argo-rollouts:${{ github.ref_name }}
2121
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
22-
go-version: '1.23'
22+
go-version: '1.24'
2323
platforms: linux/amd64,linux/arm64
2424
push: true
2525
secrets:
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
quay_image_name: quay.io/argoproj/kubectl-argo-rollouts:${{ github.ref_name }}
3737
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
38-
go-version: '1.23'
38+
go-version: '1.24'
3939
platforms: linux/amd64,linux/arm64
4040
push: true
4141
target: kubectl-argo-rollouts

‎.github/workflows/testing.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
# Golang version to use across CI steps
16-
GOLANG_VERSION: '1.23'
16+
GOLANG_VERSION: '1.24'
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.ref }}
@@ -75,21 +75,21 @@ jobs:
7575
fail-fast: false
7676
matrix:
7777
kubernetes:
78-
- version: '1.28'
78+
- version: '1.31'
7979
latest: false
80-
- version: '1.29'
80+
- version: '1.32'
8181
latest: false
82-
- version: '1.30'
82+
- version: '1.33'
8383
latest: false
84-
- version: '1.31'
84+
- version: '1.34'
8585
latest: true
8686
name: Run end-to-end tests
8787
runs-on: ubuntu-latest
8888
steps:
8989
- name: Set up Go
9090
uses: actions/[email protected]
9191
with:
92-
go-version: '1.23'
92+
go-version: '1.24'
9393
- uses: actions/checkout@v5
9494
- name: Setup k3s
9595
env:
@@ -179,7 +179,7 @@ jobs:
179179
- name: Upload code coverage information to codecov.io
180180
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
181181
with:
182-
file: full-coverage.out
182+
files: full-coverage.out
183183
fail_ci_if_error: false
184184
codecov_yml_path: .codecov.yml
185185
disable_search: true

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
44
# Also used as the image in CI jobs so needs all dependencies
55
####################################################################################################
6-
FROM --platform=$BUILDPLATFORM golang:1.23 AS builder
6+
FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
77

88
RUN apt-get update && apt-get install -y \
99
wget \
@@ -40,7 +40,7 @@ RUN NODE_ENV='production' yarn build
4040
####################################################################################################
4141
# Rollout Controller Build stage which performs the actual build of argo-rollouts binaries
4242
####################################################################################################
43-
FROM --platform=$BUILDPLATFORM golang:1.23 AS argo-rollouts-build
43+
FROM --platform=$BUILDPLATFORM golang:1.24 AS argo-rollouts-build
4444

4545
WORKDIR /go/src/github.com/argoproj/argo-rollouts
4646

‎Dockerfile.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
####################################################################################################
22
# argo-rollouts-dev
33
####################################################################################################
4-
FROM golang:1.20 AS builder
4+
FROM golang:1.24 AS builder
55

66
RUN apt-get update && apt-get install -y \
77
ca-certificates && \

‎Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,21 @@ gen-proto: k8s-proto api-proto ui-proto
120120
.PHONY: k8s-proto
121121
k8s-proto: go-mod-vendor install-protoc-local install-go-tools-local $(TYPES) ## generate kubernetes protobuf files
122122
mkdir -p ${PKG}
123+
# Remove old generated files (including any symlinks)
123124
rm -f pkg/apis/rollouts/v1alpha1/generated.proto
125+
rm -f pkg/apis/rollouts/v1alpha1/generated.pb.go
124126
cp -f $(CURDIR)/pkg/apis/rollouts/v1alpha1/*.* ${PKG}/
127+
# Create symlink to work around go-to-protobuf path resolution issue in k8s.io/code-generator v0.34+
128+
ln -sf $(CURDIR)/pkg/apis/rollouts/v1alpha1/generated.proto ${PKG}/generated.proto
125129
PATH=${DIST_DIR}:$$PATH GOPATH=${GOPATH} go-to-protobuf \
126130
--go-header-file=./hack/custom-boilerplate.go.txt \
127131
--packages=${PKG} \
128132
--apimachinery-packages=${APIMACHINERY_PKGS} \
129133
--proto-import=${CURDIR}/vendor \
130134
--proto-import=${GOPATH}/src \
131-
--proto-import=${DIST_DIR}/protoc-include
132-
touch pkg/apis/rollouts/v1alpha1/generated.proto
135+
--proto-import=${DIST_DIR}/protoc-include
136+
# Remove the symlink before copying back
137+
rm -f ${PKG}/generated.proto
133138
cp -Rf $(CURDIR)/github.com/argoproj/argo-rollouts/pkg . | true
134139
# cleaning up
135140
rm -Rf $(CURDIR)/github.com/

0 commit comments

Comments
 (0)