Skip to content

Cut v1.2.1 rallyhealth #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tperdue321 merged 9 commits into from
Aug 30, 2022
Merged

Cut v1.2.1 rallyhealth #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e831cd
fix: Add pagination to FindLoadBalancerByDNSName (#1971)
zachaller Apr 13, 2022
2e69f70
fix: missing lb event (#2021)
zachaller May 5, 2022
9e55f81
fix: Use actual weight from status field on rollout object (#1937)
zachaller Apr 1, 2022
51c874c
fix: build/lint is broken due to dependencies changes (#1958)
zachaller Apr 5, 2022
d0a2e3a
Merge branch 'master' into cut-v1.2.1-rallyhealth
Aug 30, 2022
a7ec96d
following github workflow error prompt to fix
Aug 30, 2022
fff3c32
go fmt
Aug 30, 2022
78960a8
make go-mod-vendor
Aug 30, 2022
5341522
fix path
Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ env:
# Golang version to use across CI steps
GOLANG_VERSION: '1.17'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint-go:
name: Lint Go code
Expand Down Expand Up @@ -87,8 +83,8 @@ jobs:
# This symlink is necessary to ensure that `git diff` detects changes
- name: Create symlink in GOPATH
run: |
mkdir -p ~/go/src/github.com/argoproj
ln -s $(pwd) ~/go/src/github.com/argoproj/argo-rollouts
mkdir -p ~/go/src/github.com/rallyhealth
ln -s $(pwd) ~/go/src/github.com/rallyhealth/argo-rollouts
- uses: actions/cache@v2
with:
path: /home/runner/.cache/go-build
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.17
require (
github.com/antonmedv/expr v1.9.0
github.com/argoproj/notifications-engine v0.3.1-0.20220129012210-32519f8f68ec
github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0
github.com/argoproj/pkg v0.9.0
github.com/aws/aws-sdk-go-v2 v1.13.0
github.com/aws/aws-sdk-go-v2/config v1.13.1
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.15.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmH
github.com/appscode/go v0.0.0-20190808133642-1d4ef1f1c1e0/go.mod h1:iy07dV61Z7QQdCKJCIvUoDL21u6AIceRhZzyleh2ymc=
github.com/argoproj/notifications-engine v0.3.1-0.20220129012210-32519f8f68ec h1:ulv8ieYQZLyQrTVR4za1ucLFnemS0Dksz8y5e91xxak=
github.com/argoproj/notifications-engine v0.3.1-0.20220129012210-32519f8f68ec/go.mod h1:QF4tr3wfWOnhkKSaRpx7k/KEErQAh8iwKQ2pYFu/SfA=
github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0 h1:Cfp7rO/HpVxnwlRqJe0jHiBbZ77ZgXhB6HWlYD02Xdc=
github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
github.com/argoproj/pkg v0.9.0 h1:PfWWYykfcEQdN0g41XLbVh/aonTjD+dPkvDp3hwpLYM=
github.com/argoproj/pkg v0.9.0/go.mod h1:ra+bQPmbVAoEL+gYSKesuigt4m49i3Qa3mE/xQcjCiA=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
Expand Down
4 changes: 2 additions & 2 deletions ingress/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestSyncIngressReferencedByRolloutMultiIngress(t *testing.T) {
CanaryService: "canary-service",
TrafficRouting: &v1alpha1.RolloutTrafficRouting{
Nginx: &v1alpha1.NginxTrafficRouting{
StableIngress: "test-stable-ingress",
StableIngress: "test-stable-ingress",
AdditionalStableIngresses: []string{"test-stable-ingress-additional"},
},
},
Expand Down Expand Up @@ -287,7 +287,7 @@ func TestSkipIngressWithNoAnnotationsMultiIngress(t *testing.T) {
CanaryService: "canary-service",
TrafficRouting: &v1alpha1.RolloutTrafficRouting{
Nginx: &v1alpha1.NginxTrafficRouting{
StableIngress: "test-stable-ingress",
StableIngress: "test-stable-ingress",
AdditionalStableIngresses: []string{"test-stable-ingress-additional"},
},
},
Expand Down
2 changes: 1 addition & 1 deletion rollout/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ func TestGetReferencedIngressesNginxMultiIngress(t *testing.T) {
r := newCanaryRollout("rollout", 1, nil, nil, nil, intstr.FromInt(0), intstr.FromInt(1))
r.Spec.Strategy.Canary.TrafficRouting = &v1alpha1.RolloutTrafficRouting{
Nginx: &v1alpha1.NginxTrafficRouting{
StableIngress: "nginx-ingress-name",
StableIngress: "nginx-ingress-name",
AdditionalStableIngresses: []string{"nginx-ingress-additional"},
},
}
Expand Down
4 changes: 2 additions & 2 deletions utils/ingress/ingress_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func TestGetRolloutIngressKeysForCanaryWithTrafficRoutingMultiIngress(t *testing
StableService: "stable-service",
TrafficRouting: &v1alpha1.RolloutTrafficRouting{
Nginx: &v1alpha1.NginxTrafficRouting{
StableIngress: "stable-ingress",
StableIngress: "stable-ingress",
AdditionalStableIngresses: []string{"stable-ingress-additional"},
},
ALB: &v1alpha1.ALBTrafficRouting{
Expand All @@ -101,7 +101,7 @@ func TestGetCanaryIngressName(t *testing.T) {
StableService: "stable-service",
TrafficRouting: &v1alpha1.RolloutTrafficRouting{
Nginx: &v1alpha1.NginxTrafficRouting{
StableIngress: "stable-ingress",
StableIngress: "stable-ingress",
AdditionalStableIngresses: []string{"stable-ingress-additional"},
},
},
Expand Down