From 4f59ab69fcaf753d920d7c56f1c98b9a279a5cfa Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Tue, 13 Feb 2024 18:03:50 -0500 Subject: [PATCH 1/2] Upgrade to Argo Rollouts v1.6.6 Signed-off-by: Jonathan West --- .../argo-rollouts-manager.clusterserviceversion.yaml | 2 +- controllers/default.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/run-upstream-argo-rollouts-e2e-tests.sh | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bundle/manifests/argo-rollouts-manager.clusterserviceversion.yaml b/bundle/manifests/argo-rollouts-manager.clusterserviceversion.yaml index d4f2b44..9663a01 100644 --- a/bundle/manifests/argo-rollouts-manager.clusterserviceversion.yaml +++ b/bundle/manifests/argo-rollouts-manager.clusterserviceversion.yaml @@ -21,7 +21,7 @@ metadata: } ] capabilities: Basic Install - createdAt: "2024-01-30T05:17:17Z" + createdAt: "2024-02-13T23:03:49Z" operators.operatorframework.io/builder: operator-sdk-v1.28.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 name: argo-rollouts-manager.v0.0.1 diff --git a/controllers/default.go b/controllers/default.go index 9979882..ad6a597 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -9,7 +9,7 @@ const ( // ArgoRolloutsDefaultImage is the default image for rollouts controller. DefaultArgoRolloutsImage = "quay.io/argoproj/argo-rollouts" // ArgoRolloutsDefaultVersion is the default version for the rollouts controller. - DefaultArgoRolloutsVersion = "v1.6.5" // v1.6.5 + DefaultArgoRolloutsVersion = "v1.6.6" // v1.6.6 // DefaultArgoRolloutsResourceName is the default name for rollout controller resources such as // deployment, service, role, rolebinding and serviceaccount. DefaultArgoRolloutsResourceName = "argo-rollouts" diff --git a/go.mod b/go.mod index dcebac9..d486366 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/argoproj-labs/argo-rollouts-manager go 1.19 require ( - github.com/argoproj/argo-rollouts v1.6.5 + github.com/argoproj/argo-rollouts v1.6.6 github.com/onsi/ginkgo/v2 v2.11.0 github.com/onsi/gomega v1.27.10 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index 63c75f4..d4c624d 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/argoproj/argo-rollouts v1.6.5 h1:VDAp9PGboRbzd9tQJ/8IkaI+KrvWIRrpfSV5aeX0GUQ= -github.com/argoproj/argo-rollouts v1.6.5/go.mod h1:X2kTiBaYCSounmw1kmONdIZTwJNzNQYC0SrXUgSw9UI= +github.com/argoproj/argo-rollouts v1.6.6 h1:JCJ0cGAwWkh2xCAHZ1OQmrobysRjCatmG9IZaLJpS1g= +github.com/argoproj/argo-rollouts v1.6.6/go.mod h1:X2kTiBaYCSounmw1kmONdIZTwJNzNQYC0SrXUgSw9UI= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/hack/run-upstream-argo-rollouts-e2e-tests.sh b/hack/run-upstream-argo-rollouts-e2e-tests.sh index 499cea6..ff7ab91 100755 --- a/hack/run-upstream-argo-rollouts-e2e-tests.sh +++ b/hack/run-upstream-argo-rollouts-e2e-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -CURRENT_ROLLOUTS_VERSION=v1.6.5 +CURRENT_ROLLOUTS_VERSION=v1.6.6 function cleanup { echo "* Cleaning up" @@ -149,3 +149,4 @@ else echo "* SUCCESS: No unexpected errors occurred." fi + From 09e3cbc05764b1e859e87adbea475f788417c3d4 Mon Sep 17 00:00:00 2001 From: Jonathan West Date: Tue, 13 Feb 2024 18:13:55 -0500 Subject: [PATCH 2/2] Fix golangci-lint Go version Signed-off-by: Jonathan West --- .github/workflows/lint.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4d4be77..370a969 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,9 +14,16 @@ jobs: lint_code: name: Run golangci-lint and gosec runs-on: ubuntu-latest + steps: - name: Checkout code uses: actions/checkout@v2 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 'stable' + - name: "run gosec" run: | cd $GITHUB_WORKSPACE