Skip to content
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

Jump to bottom

fix: rs conflict with fallback to patch #3559

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft

fix: rs conflict with fallback to patch #3559

wants to merge 28 commits into from

Conversation

zachaller
Copy link
Collaborator

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional with a list of types and scopes found here, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I've signed my commits with DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My builds are green. Try syncing with master if they are not.
  • My organization is added to USERS.md.

@zachaller zachaller changed the title Fix rs conflict with fallback to patch fix: rs conflict with fallback to patch May 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 7, 2024 •
edited

Go Published Test Results

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

Results for commit f4a2e27.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 7, 2024 •
edited

E2E Tests Published Test Results

  4 files    4 suites   4h 0m 14s ⏱️
113 tests  99 ✅  8 💤 6 ❌
459 runs  419 ✅ 32 💤 8 ❌

For more details on these failures, see this check.

Results for commit f4a2e27.

♻️ This comment has been updated with latest results.

@codecov Codecov
Copy link

codecov bot commented May 7, 2024 •
edited

Codecov Report

Attention: Patch coverage is 51.89873% with 38 lines in your changes are missing coverage. Please review.

Project coverage is 78.16%. Comparing base (8405f2e) to head (f4a2e27).
Report is 102 commits behind head on master.

Files Patch % Lines
rollout/controller.go 60.71% 16 Missing and 6 partials ⚠️
hack/gen-crd-spec/main.go 0.00% 6 Missing ⚠️
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%   78.16%   -3.67%     
==========================================
  Files         135      158      +23     
  Lines       20688    18447    -2241     
==========================================
- Hits        16931    14420    -2511     
- Misses       2883     3116     +233     
- Partials      874      911      +37

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

@zachaller zachaller force-pushed the fix-rs-conflict-with-fallback-to-patch branch from ef796a4 to 16e67ce Compare May 7, 2024 22:00
@zachaller
fix: fallback to patch on scale conflict
7943d8d 
Signed-off-by: Zach Aller <[email protected]>

fix: switch to retry logic

Signed-off-by: Zach Aller <[email protected]>

lint

Signed-off-by: Zach Aller <[email protected]>

retry experiments

Signed-off-by: Zach Aller <[email protected]>

remove TODO

Signed-off-by: Zach Aller <[email protected]>

remove accidental add

Signed-off-by: Zach Aller <[email protected]>

remove accidental add

Signed-off-by: Zach Aller <[email protected]>

add retry to setting revision

Signed-off-by: Zach Aller <[email protected]>

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] <[email protected]>
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] <[email protected]>
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] <[email protected]>
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) <[email protected]>

* docs: traffic manager clarifications

Signed-off-by: Kostis (Codefresh) <[email protected]>

* docs: explain canary with/out traffic manager

Signed-off-by: Kostis (Codefresh) <[email protected]>

* docs: add 3 columns on the comparison table

Signed-off-by: Kostis (Codefresh) <[email protected]>

---------

Signed-off-by: Kostis (Codefresh) <[email protected]>

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 López Sánchez <[email protected]>

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] <[email protected]>
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 <[email protected]>

fix variable

Signed-off-by: Zach Aller <[email protected]>

add retry counts to log

Signed-off-by: Zach Aller <[email protected]>

add retry counts to logs

Signed-off-by: Zach Aller <[email protected]>

clean logs, always dump controller e2e logs

Signed-off-by: Zach Aller <[email protected]>

lower timeout

Signed-off-by: Zach Aller <[email protected]>

bump timeout on e2e

Signed-off-by: Zach Aller <[email protected]>

retry on rollout conflict

Signed-off-by: Zach Aller <[email protected]>

don't reque on rs changes

Signed-off-by: Zach Aller <[email protected]>

reque rs

Signed-off-by: Zach Aller <[email protected]>

bump qps for e2e

Signed-off-by: Zach Aller <[email protected]>

fix gen-crd

Signed-off-by: Zach Aller <[email protected]>

switch to patch

Signed-off-by: Zach Aller <[email protected]>

switch to patch

Signed-off-by: Zach Aller <[email protected]>

add log

Signed-off-by: Zach Aller <[email protected]>

move log lines

Signed-off-by: Zach Aller <[email protected]>

Trigger Build

Signed-off-by: Zach Aller <[email protected]>

fix one e2e test

Signed-off-by: Zach Aller <[email protected]>

lint

Signed-off-by: Zach Aller <[email protected]>

add test

Signed-off-by: Zach Aller <[email protected]>

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] <[email protected]>
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] <[email protected]>
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

refactor

Signed-off-by: Zach Aller <[email protected]>

add test for updating rs revision

Signed-off-by: Zach Aller <[email protected]>

add retry for ephemeral metadata

Signed-off-by: Zach Aller <[email protected]>

clear some fields

Signed-off-by: Zach Aller <[email protected]>

add logs

Signed-off-by: Zach Aller <[email protected]>

refactor into function

Signed-off-by: Zach Aller <[email protected]>

change log

Signed-off-by: Zach Aller <[email protected]>

switch rollout update to patch fallback

Signed-off-by: Zach Aller <[email protected]>

siwtch ephemeral metadata sync to shared function

Signed-off-by: Zach Aller <[email protected]>

siwtch merge type

Signed-off-by: Zach Aller <[email protected]>

lint

Signed-off-by: Zach Aller <[email protected]>

don't update status

Signed-off-by: Zach Aller <[email protected]>

switch rollout update to not use patch

Signed-off-by: Zach Aller <[email protected]>

change log

Signed-off-by: Zach Aller <[email protected]>

switch to small patch

Signed-off-by: Zach Aller <[email protected]>

some cleanup

Signed-off-by: Zach Aller <[email protected]>

remove not found rollout removal

Signed-off-by: Zach Aller <[email protected]>

working setup

Signed-off-by: Zach Aller <[email protected]>

lint

Signed-off-by: Zach Aller <[email protected]>

fix test

Signed-off-by: Zach Aller <[email protected]>

small cleanup

Signed-off-by: Zach Aller <[email protected]>
@zachaller zachaller force-pushed the fix-rs-conflict-with-fallback-to-patch branch from 16e67ce to 7943d8d Compare May 7, 2024 22:02
@zachaller
typo
650e86d 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
cleanup commented out code
ae05623 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
Trigger Build
29fe254 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
only patch rollouts manged fields
8bfb37d 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
lint
7526220 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
fix flaky test
3822105 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
fix flaky test
b30b93d 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
reduce patch size
5e2bda5 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
get some logs
0dd919e 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
cleanup
90d5ada 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
improve tests
aa8f677 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
Trigger Build
332ef46 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
add env var to log diff
a73bfa5 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
remove expirment rs patch
23f6883 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
imporve logs
a6297b6 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
use correct variable
a913d1c 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
change env var
401c8c8 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
fix flaky e2e
0e6db13 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
fix flaky e2e
3810f1d 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
fix flaky e2e
2384b7e 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
remove not found rollouts
89ed30f 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
update replica count
61a56bb 
Signed-off-by: Zach Aller <[email protected]>
@zachaller
lint
d9a6655 
Signed-off-by: Zach Aller <[email protected]>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 10, 2024

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

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

See analysis details on SonarCloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@zachaller