Skip to content

Commit

Permalink
Merge branch 'master' into adam--external-resource-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
aburan28 authored Feb 22, 2025
2 parents 075bbec + 77a1398 commit 027f7e0
Show file tree
Hide file tree
Showing 174 changed files with 2,699 additions and 1,346 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
with:
quay_image_name: ${{ needs.set-vars.outputs.controller-meta-tags }}
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
go-version: '1.22'
go-version: '1.23'
platforms: ${{ needs.set-vars.outputs.platforms }}
push: ${{ github.event_name != 'pull_request' }}
secrets:
Expand All @@ -84,7 +84,7 @@ jobs:
with:
quay_image_name: ${{ needs.set-vars.outputs.plugin-meta-tags }}
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
go-version: '1.22'
go-version: '1.23'
platforms: ${{ needs.set-vars.outputs.platforms }}
push: ${{ github.event_name != 'pull_request' }}
target: kubectl-argo-rollouts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
with:
python-version: 3.x
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: '1.22'
go-version: '1.23'
- name: build
run: |
pip install mkdocs mkdocs_material
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- 'master'
env:
# Golang version to use across CI steps
GOLANG_VERSION: '1.22'
GOLANG_VERSION: '1.23'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -27,22 +27,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: ${{ env.GOLANG_VERSION }}
- name: Checkout code
uses: actions/checkout@v4
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.57.2
version: v1.61.0
args: --timeout 6m
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: ${{ env.GOLANG_VERSION }}
id: go
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Golang
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: ${{ env.GOLANG_VERSION }}
# k8s codegen generates files into GOPATH location instead of the GitHub git checkout location
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/image-reuse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ jobs:
if: ${{ github.ref_type != 'tag'}}

- name: Setup Golang
uses: actions/setup-go@v5.1.0 # v3.5.0
uses: actions/setup-go@v5.3.0 # v3.5.0
with:
go-version: ${{ inputs.go-version }}

- name: Install cosign
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
with:
cosign-release: 'v2.2.0'

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
- uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
- uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
- uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0

- name: Setup tags for container image as a CSV type
run: |
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:

- name: Build and push container image
id: image
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 #v6.9.0
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 #v6.14.0
with:
context: .
platforms: ${{ inputs.platforms }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
permissions: {}

env:
GOLANG_VERSION: '1.22' # Note: go-version must also be set in job controller-image.with.go-version & plugin-image.with.go-version.
GOLANG_VERSION: '1.23' # Note: go-version must also be set in job controller-image.with.go-version & plugin-image.with.go-version.

jobs:
controller-image:
Expand All @@ -19,7 +19,7 @@ jobs:
with:
quay_image_name: quay.io/argoproj/argo-rollouts:${{ github.ref_name }}
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
go-version: '1.22'
go-version: '1.23'
platforms: linux/amd64,linux/arm64
push: true
secrets:
Expand All @@ -35,7 +35,7 @@ jobs:
with:
quay_image_name: quay.io/argoproj/kubectl-argo-rollouts:${{ github.ref_name }}
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
go-version: '1.22'
go-version: '1.23'
platforms: linux/amd64,linux/arm64
push: true
target: kubectl-argo-rollouts
Expand Down Expand Up @@ -90,15 +90,15 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Golang
uses: actions/setup-go@v5.1.0 # v4.0.1
uses: actions/setup-go@v5.3.0 # v4.0.1
with:
go-version: ${{ env.GOLANG_VERSION }}

- name: Set up QEMU
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0

- name: Generate release artifacts
run: |
Expand All @@ -107,7 +107,7 @@ jobs:
make manifests IMAGE_TAG=${{ github.ref_name }}
- name: Draft release
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v0.1.15
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v0.1.15
with:
tag_name: ${{ github.event.inputs.tag }}
draft: true
Expand Down Expand Up @@ -163,12 +163,12 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Golang
uses: actions/setup-go@v5.1.0 # v4.0.0
uses: actions/setup-go@v5.3.0 # v4.0.0
with:
go-version: ${{ env.GOLANG_VERSION }}

- name: Install cosign
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
with:
cosign-release: 'v2.2.0'

Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
/tmp/sbom.tar.gz
- name: Upload SBOM and signature assets
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v0.1.15
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v0.1.15
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
default: false
env:
# Golang version to use across CI steps
GOLANG_VERSION: '1.22'
GOLANG_VERSION: '1.23'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: ${{ env.GOLANG_VERSION }}
id: go
Expand Down Expand Up @@ -79,21 +79,21 @@ jobs:
fail-fast: false
matrix:
kubernetes:
- version: 1.26
- version: '1.28'
latest: false
- version: 1.27
- version: '1.29'
latest: false
- version: 1.28
- version: '1.30'
latest: false
- version: 1.29
- version: '1.31'
latest: true
name: Run end-to-end tests
runs-on: ubuntu-latest
steps:
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: '1.22'
go-version: '1.23'
- uses: actions/checkout@v4
- name: Setup k3s
env:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- test-e2e
steps:
- name: Set up Go
uses: actions/setup-go@v5.1.0
uses: actions/setup-go@v5.3.0
with:
go-version: ${{ env.GOLANG_VERSION }}
id: go
Expand All @@ -184,7 +184,7 @@ jobs:
run: |
go tool covdata textfmt -i=coverage-output-unit/,coverage-output-e2e/ -o full-coverage.out
- name: Upload code coverage information to codecov.io
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
with:
file: full-coverage.out
fail_ci_if_error: false
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
dist/
*.iml
# delve debug binaries
__debug_bin
__debug_bin*
cmd/**/debug
debug.test
coverage.out
Expand All @@ -19,4 +19,4 @@ server/static/*
!server/static/.gitkeep
coverage-output-e2e/
coverage-output-unit/
junit-unit-test.xml
junit-unit-test.xml
19 changes: 10 additions & 9 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
run:
deadline: 1m
skip-files:
- ".*\\.pb\\.go"
skip-dirs:
- pkg/client
timeout: 10m
modules-download-mode: readonly
linter-settings:
issues:
exclude-dirs:
- pkg/client
exclude-files:
- ".*\\.pb\\.go"
linters-settings:
goimports:
local-prefixes: github.com/argoproj/argo-rollouts
linters:
enable:
- vet
- gofmt
- goimports
- unused
- govet
- ineffassign
- unconvert
- misspell
- unconvert
- unused
disable-all: true
1 change: 1 addition & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2
formats: all
mkdocs:
configuration: mkdocs.yml
fail_on_warning: false
python:
install:
Expand Down
Loading

0 comments on commit 027f7e0

Please sign in to comment.