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.

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

fix: rs conflict with fallback to patch #3559

Merged

Commits on May 7, 2024

  1. fix: fallback to patch on scale conflict

    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 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    7943d8d View commit details
    Browse the repository at this point in the history
  2. typo

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 7, 2024
    Configuration menu
    Copy the full SHA
    650e86d View commit details
    Browse the repository at this point in the history
  3. cleanup commented out code

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ae05623 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Trigger Build

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    29fe254 View commit details
    Browse the repository at this point in the history
  2. only patch rollouts manged fields

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    8bfb37d View commit details
    Browse the repository at this point in the history
  3. lint

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    7526220 View commit details
    Browse the repository at this point in the history
  4. fix flaky test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3822105 View commit details
    Browse the repository at this point in the history
  5. fix flaky test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    b30b93d View commit details
    Browse the repository at this point in the history
  6. reduce patch size

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5e2bda5 View commit details
    Browse the repository at this point in the history
  7. get some logs

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    0dd919e View commit details
    Browse the repository at this point in the history
  8. cleanup

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    90d5ada View commit details
    Browse the repository at this point in the history
  9. improve tests

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 8, 2024
    Configuration menu
    Copy the full SHA
    aa8f677 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Trigger Build

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    332ef46 View commit details
    Browse the repository at this point in the history
  2. add env var to log diff

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a73bfa5 View commit details
    Browse the repository at this point in the history
  3. remove expirment rs patch

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    23f6883 View commit details
    Browse the repository at this point in the history
  4. imporve logs

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a6297b6 View commit details
    Browse the repository at this point in the history
  5. use correct variable

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a913d1c View commit details
    Browse the repository at this point in the history
  6. change env var

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    401c8c8 View commit details
    Browse the repository at this point in the history
  7. fix flaky e2e

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0e6db13 View commit details
    Browse the repository at this point in the history
  8. fix flaky e2e

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    3810f1d View commit details
    Browse the repository at this point in the history
  9. fix flaky e2e

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    2384b7e View commit details
    Browse the repository at this point in the history
  10. remove not found rollouts

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    89ed30f View commit details
    Browse the repository at this point in the history
  11. update replica count

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    61a56bb View commit details
    Browse the repository at this point in the history
  12. lint

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    d9a6655 View commit details
    Browse the repository at this point in the history
  13. refactor cleanup

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 9, 2024
    Configuration menu
    Copy the full SHA
    faaafc6 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. keep track of UpdatedReplicas on sync

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 10, 2024
    Configuration menu
    Copy the full SHA
    2aeaf63 View commit details
    Browse the repository at this point in the history
  2. some hpa tests and log changes

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 10, 2024
    Configuration menu
    Copy the full SHA
    7411720 View commit details
    Browse the repository at this point in the history
  3. remove update to UpdatedReplicas

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 10, 2024
    Configuration menu
    Copy the full SHA
    f4a2e27 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. add more test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 13, 2024
    Configuration menu
    Copy the full SHA
    bec20f2 View commit details
    Browse the repository at this point in the history
  2. fix test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed May 13, 2024
    Configuration menu
    Copy the full SHA
    a9e11ef View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. undo change

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    1a6fe3b View commit details
    Browse the repository at this point in the history
  2. add comment to flaky tests

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    8454637 View commit details
    Browse the repository at this point in the history
  3. cleanup Makefile

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2b73c42 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r…

    …s-conflict-with-fallback-to-patch
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    5f09e84 View commit details
    Browse the repository at this point in the history
  5. remove test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    66b2e59 View commit details
    Browse the repository at this point in the history
  6. use labels

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    cce7ac4 View commit details
    Browse the repository at this point in the history
  7. remove make file change

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    1272d22 View commit details
    Browse the repository at this point in the history
  8. add label to test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    bbcc80e View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. review changes

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e1bc540 View commit details
    Browse the repository at this point in the history
  2. change to TODO

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4ebd960 View commit details
    Browse the repository at this point in the history
  3. fix test

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    fed308b View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' of github.com:argoproj/argo-rollouts into fix-r…

    …s-conflict-with-fallback-to-patch
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    046fde9 View commit details
    Browse the repository at this point in the history
  5. add extra logging for tests

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e39bb6e View commit details
    Browse the repository at this point in the history
  6. Trigger Build

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    697a55f View commit details
    Browse the repository at this point in the history
  7. add ignore to codecov

    Signed-off-by: Zach Aller <[email protected]>
    zachaller committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    e52400d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Configuration menu
    Copy the full SHA
    ec9d9b0 View commit details
    Browse the repository at this point in the history