fix: rs conflict with fallback to patch #3559

zachaller · 2024-05-07T19:33:47Z

When updating a replicaset if we get a conflict with the replicaset, we fallback to a patch. This prevents us from getting into a loop of conflicts and preventing scaling from occurring. This is more of a temporary hot fix until a larger refactor can happen around how rollouts manages replicasets.

github-actions · 2024-05-07T19:42:59Z

Go Published Test Results

2 162 tests 2 162 ✅ 2m 54s ⏱️
119 suites 0 💤
1 files 0 ❌

Results for commit ec9d9b0.

♻️ This comment has been updated with latest results.

github-actions · 2024-05-07T20:08:34Z

E2E Tests Published Test Results

4 files 4 suites 3h 24m 40s ⏱️
110 tests 99 ✅ 6 💤 5 ❌
452 runs 416 ✅ 24 💤 12 ❌

For more details on these failures, see this check.

Results for commit ec9d9b0.

♻️ This comment has been updated with latest results.

codecov · 2024-05-07T20:20:11Z

Codecov Report

Attention: Patch coverage is 65.71429% with 24 lines in your changes missing coverage. Please review.

Project coverage is 80.26%. Comparing base (8405f2e) to head (e52400d).
Report is 114 commits behind head on master.

❗ Current head e52400d differs from pull request most recent head ec9d9b0

Please upload reports for the commit ec9d9b0 to get more accurate results.

Files	Patch %	Lines
rollout/controller.go	75.00%	7 Missing and 7 partials ⚠️
rollout/sync.go	42.85%	4 Missing ⚠️
utils/controller/controller.go	0.00%	2 Missing and 1 partial ⚠️
rollout/ephemeralmetadata.go	33.33%	2 Missing ⚠️
rollout/canary.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3559      +/-   ##
==========================================
- Coverage   81.83%   80.26%   -1.58%     
==========================================
  Files         135      156      +21     
  Lines       20688    17970    -2718     
==========================================
- Hits        16931    14424    -2507     
+ Misses       2883     2634     -249     
- Partials      874      912      +38

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix: switch to retry logic Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry experiments Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry to setting revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump slsa-framework/slsa-github-generator from 1.10.0 to 2.0.0 (argoproj#3537) chore(deps): bump slsa-framework/slsa-github-generator Bumps [slsa-framework/slsa-github-generator](https://github.com/slsa-framework/slsa-github-generator) from 1.10.0 to 2.0.0. - [Release notes](https://github.com/slsa-framework/slsa-github-generator/releases) - [Changelog](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) - [Commits](slsa-framework/slsa-github-generator@v1.10.0...v2.0.0) --- updated-dependencies: - dependency-name: slsa-framework/slsa-github-generator dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump sigstore/cosign-installer from 3.4.0 to 3.5.0 (argoproj#3522) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@e1523de...59acb62) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump golangci/golangci-lint-action from 4 to 5 (argoproj#3540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: provide recommendation for strategies (argoproj#3531) * docs: provide recommendation for strategies Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: traffic manager clarifications Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: explain canary with/out traffic manager Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: add 3 columns on the comparison table Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --------- Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> feat(dashboard): change the color of the current rollout step (argoproj#3526) I feel that having the current (running) step in a orange color is misleading, as orange usually means warning. This commit changes the color to the `$argo-running-color`. Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch from 1.37.0 to 1.38.0 (argoproj#3525) chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.0/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.37.0...service/s3/v1.38.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> perform all of set revision actions on retry Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clean logs, always dump controller e2e logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lower timeout Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump timeout on e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry on rollout conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't reque on rs changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> reque rs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump qps for e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix gen-crd Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> move log lines Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix one e2e test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump actions/setup-go from 5.0.0 to 5.0.1 (argoproj#3552) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump codecov/codecov-action from 4.3.0 to 4.3.1 (argoproj#3550) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 (argoproj#3548) Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> refactor Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test for updating rs revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry for ephemeral metadata Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clear some fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> refactor into function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to patch fallback Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch ephemeral metadata sync to shared function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch merge type Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't update status Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to not use patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to small patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> some cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove not found rollout removal Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> working setup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> small cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

…s-conflict-with-fallback-to-patch

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

leoluz

Please check my comments

test/e2e/aws_test.go

test/e2e/functional/analysistemplate-sleep-job.yaml

utils/annotations/annotations.go

rollout/ephemeralmetadata.go

leoluz · 2024-06-05T20:41:19Z

rollout/controller_test.go

+func (f *fixture) expectGetReplicaSetAction(r *appsv1.ReplicaSet) int { //nolint:unused
+	len := len(f.kubeactions)
+	f.kubeactions = append(f.kubeactions, core.NewGetAction(schema.GroupVersionResource{Resource: "replicasets"}, r.Namespace, r.Name))
+	return len
+}


we should probably add several test cases to validate the new updateReplicaSetFallbackToPatch method

There are two test that cover most the happy paths to lock in the behavior on the two conflict points here. I don't think it's worth going down a lot of the error paths like incorrect json marshal's etc.

codecovs percentages don't always make sense to me, here is the coverage of that function https://app.codecov.io/gh/argoproj/argo-rollouts/pull/3559?src=pr&el=tree&filepath=rollout%2Fcontroller.go&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#6b8a01c38fada35656503847a6f4a00d-R951

It seems that the coverage is comparing the wrong base from the link above.

rollout/controller.go

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

…s-conflict-with-fallback-to-patch

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

rollout/controller.go

leoluz · 2024-06-07T15:12:12Z

rollout/controller_test.go

+func (f *fixture) expectGetReplicaSetAction(r *appsv1.ReplicaSet) int { //nolint:unused
+	len := len(f.kubeactions)
+	f.kubeactions = append(f.kubeactions, core.NewGetAction(schema.GroupVersionResource{Resource: "replicasets"}, r.Namespace, r.Name))
+	return len
+}


It seems that the coverage is comparing the wrong base from the link above.

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

sonarcloud · 2024-06-07T15:25:55Z

Quality Gate passed

Issues
4 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
9.5% Duplication on New Code

See analysis details on SonarCloud

leoluz

LGTM

* fix: fallback to patch on scale conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix: switch to retry logic Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry experiments Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove accidental add Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry to setting revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump slsa-framework/slsa-github-generator from 1.10.0 to 2.0.0 (#3537) chore(deps): bump slsa-framework/slsa-github-generator Bumps [slsa-framework/slsa-github-generator](https://github.com/slsa-framework/slsa-github-generator) from 1.10.0 to 2.0.0. - [Release notes](https://github.com/slsa-framework/slsa-github-generator/releases) - [Changelog](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) - [Commits](slsa-framework/slsa-github-generator@v1.10.0...v2.0.0) --- updated-dependencies: - dependency-name: slsa-framework/slsa-github-generator dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump sigstore/cosign-installer from 3.4.0 to 3.5.0 (#3522) Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](sigstore/cosign-installer@e1523de...59acb62) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump golangci/golangci-lint-action from 4 to 5 (#3540) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4 to 5. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4...v5) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> docs: provide recommendation for strategies (#3531) * docs: provide recommendation for strategies Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: traffic manager clarifications Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: explain canary with/out traffic manager Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> * docs: add 3 columns on the comparison table Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> --------- Signed-off-by: Kostis (Codefresh) <39800303+kostis-codefresh@users.noreply.github.com> feat(dashboard): change the color of the current rollout step (#3526) I feel that having the current (running) step in a orange color is misleading, as orange usually means warning. This commit changes the color to the `$argo-running-color`. Signed-off-by: Alejandro López Sánchez <alejandro.lopez@factorial.co> chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch from 1.37.0 to 1.38.0 (#3525) chore(deps): bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.37.0 to 1.38.0. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/service/s3/v1.38.0/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.37.0...service/s3/v1.38.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> perform all of set revision actions on retry Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry counts to logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clean logs, always dump controller e2e logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lower timeout Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump timeout on e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> retry on rollout conflict Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't reque on rs changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> reque rs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> bump qps for e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix gen-crd Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> move log lines Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix one e2e test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> chore(deps): bump actions/setup-go from 5.0.0 to 5.0.1 (#3552) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump codecov/codecov-action from 4.3.0 to 4.3.1 (#3550) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@v4.3.0...v4.3.1) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> chore(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 (#3548) Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> refactor Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add test for updating rs revision Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add retry for ephemeral metadata Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> clear some fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> add logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> refactor into function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to patch fallback Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch ephemeral metadata sync to shared function Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> siwtch merge type Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> don't update status Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch rollout update to not use patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> change log Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> switch to small patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> some cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> remove not found rollout removal Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> working setup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> small cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * typo Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup commented out code Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * only patch rollouts manged fields Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * reduce patch size Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * get some logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * improve tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add env var to log diff Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove expirment rs patch Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * imporve logs Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use correct variable Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change env var Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix flaky e2e Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove not found rollouts Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * update replica count Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * lint Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * refactor cleanup Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * keep track of UpdatedReplicas on sync Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * some hpa tests and log changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove update to UpdatedReplicas Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add more test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * undo change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add comment to flaky tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * cleanup Makefile Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * use labels Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * remove make file change Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add label to test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * review changes Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * change to TODO Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * fix test Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add extra logging for tests Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * Trigger Build Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * add ignore to codecov Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> * we always generate patch because we are comparing against emtpy obj Signed-off-by: Zach Aller <zachaller@users.noreply.github.com> --------- Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

zachaller changed the title ~~Fix rs conflict with fallback to patch~~ fix: rs conflict with fallback to patch May 7, 2024

zachaller force-pushed the fix-rs-conflict-with-fallback-to-patch branch from ef796a4 to 16e67ce Compare May 7, 2024 22:00

zachaller force-pushed the fix-rs-conflict-with-fallback-to-patch branch from 16e67ce to 7943d8d Compare May 7, 2024 22:02

zachaller added 23 commits May 7, 2024 17:04

typo

650e86d

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

cleanup commented out code

ae05623

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Trigger Build

29fe254

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

only patch rollouts manged fields

8bfb37d

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

lint

7526220

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix flaky test

3822105

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix flaky test

b30b93d

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

reduce patch size

5e2bda5

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

get some logs

0dd919e

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

cleanup

90d5ada

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

improve tests

aa8f677

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Trigger Build

332ef46

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

add env var to log diff

a73bfa5

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

remove expirment rs patch

23f6883

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

imporve logs

a6297b6

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

use correct variable

a913d1c

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

change env var

401c8c8

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix flaky e2e

0e6db13

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix flaky e2e

3810f1d

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix flaky e2e

2384b7e

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

remove not found rollouts

89ed30f

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

update replica count

61a56bb

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

lint

d9a6655

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

zachaller added 12 commits May 9, 2024 22:12

keep track of UpdatedReplicas on sync

2aeaf63

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

some hpa tests and log changes

7411720

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

remove update to UpdatedReplicas

f4a2e27

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

add more test

bec20f2

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix test

a9e11ef

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

undo change

1a6fe3b

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

add comment to flaky tests

8454637

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

cleanup Makefile

2b73c42

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r…

5f09e84

…s-conflict-with-fallback-to-patch

remove test

66b2e59

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

use labels

cce7ac4

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

remove make file change

1272d22

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

zachaller marked this pull request as ready for review June 4, 2024 17:31

zachaller added cherry-pick/release-1.6 cherry-pick/release-1.7 labels Jun 4, 2024

add label to test

bbcc80e

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

leoluz requested changes Jun 5, 2024

View reviewed changes

zachaller added 7 commits June 6, 2024 09:47

review changes

e1bc540

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

change to TODO

4ebd960

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

fix test

fed308b

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r…

046fde9

…s-conflict-with-fallback-to-patch

add extra logging for tests

e39bb6e

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

Trigger Build

697a55f

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

add ignore to codecov

e52400d

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

leoluz requested changes Jun 7, 2024

View reviewed changes

we always generate patch because we are comparing against emtpy obj

ec9d9b0

Signed-off-by: Zach Aller <zachaller@users.noreply.github.com>

leoluz approved these changes Jun 7, 2024

View reviewed changes

zachaller merged commit ec18d99 into argoproj:master Jun 7, 2024
21 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: rs conflict with fallback to patch #3559

fix: rs conflict with fallback to patch #3559

zachaller commented May 7, 2024 •

edited

github-actions bot commented May 7, 2024 •

edited

github-actions bot commented May 7, 2024 •

edited

codecov bot commented May 7, 2024 •

edited

leoluz left a comment

leoluz Jun 5, 2024

zachaller Jun 6, 2024

zachaller Jun 6, 2024

leoluz Jun 7, 2024

leoluz Jun 7, 2024

sonarcloud bot commented Jun 7, 2024

leoluz left a comment

fix: rs conflict with fallback to patch #3559

fix: rs conflict with fallback to patch #3559

Conversation

zachaller commented May 7, 2024 • edited

github-actions bot commented May 7, 2024 • edited

Go Published Test Results

github-actions bot commented May 7, 2024 • edited

E2E Tests Published Test Results

codecov bot commented May 7, 2024 • edited

Codecov Report

leoluz left a comment

Choose a reason for hiding this comment

leoluz Jun 5, 2024

Choose a reason for hiding this comment

zachaller Jun 6, 2024

Choose a reason for hiding this comment

zachaller Jun 6, 2024

Choose a reason for hiding this comment

leoluz Jun 7, 2024

Choose a reason for hiding this comment

leoluz Jun 7, 2024

Choose a reason for hiding this comment

sonarcloud bot commented Jun 7, 2024

Quality Gate passed

leoluz left a comment

Choose a reason for hiding this comment

zachaller commented May 7, 2024 •

edited

github-actions bot commented May 7, 2024 •

edited

github-actions bot commented May 7, 2024 •

edited

codecov bot commented May 7, 2024 •

edited