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(timeout): Added feature flag for rollback timeout ui input. #9944

Conversation

DanielaS12
Copy link
Contributor

Fix conflict.

@ovidiupopa07 ovidiupopa07 added the ready to merge Reviewed and ready for merge label Feb 3, 2023
@dogonthehorizon dogonthehorizon merged commit 50b6e00 into spinnaker:mergify/bp/release-1.29.x/pr-9937 Feb 3, 2023
dogonthehorizon pushed a commit that referenced this pull request Feb 3, 2023
…port #9937) (#9941)

* fix(timeout): Added feature flag for rollback timeout ui input. (#9937)

* fix(timeout): Added feature flag for rollback timeout ui input.

* fix(timeout): Added feature flag for rollback timeout ui input.

(cherry picked from commit e239be3)

# Conflicts:
#	packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html

* fix(timeout): Added feature flag for rollback timeout ui input. (#9944)

---------

Co-authored-by: DanielaS12 <111055962+DanielaS12@users.noreply.github.com>
ryanjohnsontv added a commit to homedepot/deck that referenced this pull request Sep 12, 2024
* fix(core): Do not set static document base URL (spinnaker#9890) (spinnaker#9892)

The previous change to enable optional path-based routing (spinnaker#9802) added a `<base>` tag, which regressed serving hash-based routing at non-root public paths.

This change returns to AngularJS's default behavior when using hash-based routing.  Note that path-based routing will continue to only function when served from a domain root.

Resolves spinnaker/spinnaker#6723

(cherry picked from commit 5ac7516)

Co-authored-by: jcavanagh <jcavanagh@users.noreply.github.com>

* fix(aws): fix instance type selector by allowing instance types that can't be validated. (spinnaker#9893) (spinnaker#9895)

* fix(aws): fix instance type selector by allowing instance types that can't be validated.

spinnaker/spinnaker#6734

* fix(aws): adding test for instance type selector fix

spinnaker/spinnaker#6734
(cherry picked from commit 563b6f6)

Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>

* fix(links): update link to spinnaker release changelog (spinnaker#9897) (spinnaker#9900)

* fix(links): update link to spinnaker release changelog

* prettier

(cherry picked from commit 1591513)

Co-authored-by: Jared Stehler <jared.stehler@gmail.com>

* fix(aws): Fixing bugs related to clone CX when instance types are incompatible with image/region (spinnaker#9901) (spinnaker#9907)

* fix(aws): Fixing bugs related to clone UX when instance types are incompatible with image/region

Displaying warnings when incompatible instance types are removed

spinnaker/spinnaker#6734

* fix(aws): PR feedback

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit d7290c4)

Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>

* chore(dependencies): Autobump spinnakerGradleVersion (spinnaker#9916) (spinnaker#9927)

Co-authored-by: root <root@2dd4f76bffcc>
(cherry picked from commit 64d03bc)

Co-authored-by: spinnakerbot <spinbot@spinnaker.io>

* feat(pipeline): added feature flag for pipeline when mj stage child (spinnaker#9914) (spinnaker#9921)

* feat(pipeline): added feature flag for pipeline when mj stage child

* fix(pipeline): added verification for sub pipe data

* added guard verification for undefined data

Co-authored-by: Fernando Freire <fernando.freire@armory.io>
(cherry picked from commit 4b6fd53)

Co-authored-by: Oscar Michel Herrera <oscarmichelh@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* fix(timeout): Added feature flag for rollback timeout ui input. (backport spinnaker#9937) (spinnaker#9941)

* fix(timeout): Added feature flag for rollback timeout ui input. (spinnaker#9937)

* fix(timeout): Added feature flag for rollback timeout ui input.

* fix(timeout): Added feature flag for rollback timeout ui input.

(cherry picked from commit e239be3)

# Conflicts:
#	packages/amazon/src/pipeline/stages/rollbackCluster/rollbackClusterStage.html

* fix(timeout): Added feature flag for rollback timeout ui input. (spinnaker#9944)

---------

Co-authored-by: DanielaS12 <111055962+DanielaS12@users.noreply.github.com>

* [CN-1890] disable deploy options

* fix(google): Resolved typo errors in GCE Autoscaler feature (spinnaker#9947)

* Publish packages to NPM (spinnaker#9949)

* chore(publish): publish packages (2250a47)

 - deck-app@2.4.3
 - @spinnaker/google@0.2.4

* feat(peerdep-sync): Synchronize peerdependencies

* chore(publish): publish peerdeps (2250a47)

 - @spinnaker/pluginsdk-peerdeps@0.9.0

---------

Co-authored-by: spinnakerbot <spinnakerbot@spinnaker.io>

* [CN-1890] remove extra true

* fix(6755): Resolved issue regarding warning reporting when cloning a server group in AWS (spinnaker#9948)

* Revert "feat(Blue/Green): Add warning label and enhance disable/enable manifest stage with Deployment kind." (spinnaker#9951)

* chore(dev): specifying React code for Deck PRs (spinnaker#9953)

Co-authored-by: Cameron Motevasselani <cameron@armory.io>

* feat(provider/cloudrun): Added cloudrun functionality to deck (spinnaker#9931)

* feat(provider/cloudrun): Added cloudrun functionality to deck

* feat(provider/cloudrun): Incorporated Suggested Changes

* feat(provider/cloudRun): Fixed build issue

---------

Co-authored-by: rsinghsidhu <rsinghsiddhu@salesforce.com>

* chore(feature-flag): mj parent pipeline enabled by default (spinnaker#9954)

Co-authored-by: ovidiupopa07 <105648914+ovidiupopa07@users.noreply.github.com>

* Publish packages to NPM (spinnaker#9955)

* chore(publish): publish packages (e1b8d70)

 - deck-app@2.5.0

* feat(peerdep-sync): Synchronize peerdependencies

* chore(publish): publish peerdeps (e1b8d70)

 - @spinnaker/pluginsdk-peerdeps@0.10.0

---------

Co-authored-by: spinnakerbot <spinnakerbot@spinnaker.io>

* feat(deck): make StageFailureMessage component overridable (backport spinnaker#9994) (spinnaker#10007)

* feat(deck): make StageFailureMessage component overridable (spinnaker#9994)

(cherry picked from commit 39f70cc)

# Conflicts:
#	version.json

* chore(build): fix backport merge conflict

---------

Co-authored-by: Matt <6519811+mattgogerly@users.noreply.github.com>

* Revert "fix(core): conditionally hide expression evaluation warning messages (spinnaker#9771)" (spinnaker#10021) (spinnaker#10024)

This reverts commit 7e3dd50.

(cherry picked from commit 62033d0)

Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com>

* fix: Scaling bounds should parse float not int (spinnaker#10026) (spinnaker#10031)

* fix: Scaling bounds should parse float not int

Currently the API can do this, the model supports this, but the parseInt removes decimals from the UI

* fix: Decimal support for upper/lower bound ASG tests

(cherry picked from commit b763cae)

Co-authored-by: Jason <jason.mcintosh@armory.io>

* feat(helm/bake): Add additional input fields where we can fill in details of the APIs versions (spinnaker#10036) (spinnaker#10046)

- These input fields will not be pre-populated with versions of the target cluster available in the environment.

- They will become part of the bake result.

- Added API_VERSIONS_ENABLED env variable flag

(cherry picked from commit d968183)

Co-authored-by: Krystian <24556350+ciurescuraul@users.noreply.github.com>

* fix: Updating Lambda functions available Runtimes (spinnaker#10055) (spinnaker#10056)

(cherry picked from commit 669d1ed)

Co-authored-by: Christos Arvanitis <christos.arvanitis@armory.io>

* Update 1.29.7 (#3)

* fix: UI crashes when running pipeline(s) with many stages. (backport spinnaker#9960) (spinnaker#9974)

Co-authored-by: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com>

* Revert "fix(core): conditionally hide expression evaluation warning messages (spinnaker#9771)" (spinnaker#10021) (spinnaker#10025)

This reverts commit 7e3dd50.

(cherry picked from commit 62033d0)

Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com>

* fix: Scaling bounds should parse float not int (spinnaker#10026) (spinnaker#10035)

* fix: Scaling bounds should parse float not int

Currently the API can do this, the model supports this, but the parseInt removes decimals from the UI

* fix: Decimal support for upper/lower bound ASG tests

(cherry picked from commit b763cae)

Co-authored-by: Jason <jason.mcintosh@armory.io>

* Fix CreateSecurityGroups ternary

* Remove failing test for disabled action

* Temporally adding GH workflows to build Docker from this branch

* Temporally disabling other GHA workflows

* Adding 'thd' prefix to IMAGE_NAME env var

* Changing image name from 'deck' to 'thd-deck'

* Apply master GHA changes

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com>
Co-authored-by: Matt Gogerly <6519811+mattgogerly@users.noreply.github.com>
Co-authored-by: Jason <jason.mcintosh@armory.io>
Co-authored-by: Rodrigo Tovar <rodrigotovar398@gmail.com>

* Update GHA branch name

* Disable cloudrun "Edit Load Balancer"

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: jcavanagh <jcavanagh@users.noreply.github.com>
Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>
Co-authored-by: Jared Stehler <jared.stehler@gmail.com>
Co-authored-by: spinnakerbot <spinbot@spinnaker.io>
Co-authored-by: Oscar Michel Herrera <oscarmichelh@gmail.com>
Co-authored-by: DanielaS12 <111055962+DanielaS12@users.noreply.github.com>
Co-authored-by: pjberry16 <pjberry16@gmail.com>
Co-authored-by: SusmithaGundu <93190458+SusmithaGundu@users.noreply.github.com>
Co-authored-by: Spinnaker Bot <87720302+spinnakerbot2@users.noreply.github.com>
Co-authored-by: spinnakerbot <spinnakerbot@spinnaker.io>
Co-authored-by: pjberry16 <76484282+pjberry16@users.noreply.github.com>
Co-authored-by: Rajinderpal Singh Siddhu <61963157+siddhu-opsmx@users.noreply.github.com>
Co-authored-by: Cameron Motevasselani <cmotevasselani@gmail.com>
Co-authored-by: Cameron Motevasselani <cameron@armory.io>
Co-authored-by: rsinghsidhu <rsinghsiddhu@salesforce.com>
Co-authored-by: Krzysztof Kotula <kkotula13@gmail.com>
Co-authored-by: ovidiupopa07 <105648914+ovidiupopa07@users.noreply.github.com>
Co-authored-by: Matt <6519811+mattgogerly@users.noreply.github.com>
Co-authored-by: Jason <jason.mcintosh@armory.io>
Co-authored-by: Krystian <24556350+ciurescuraul@users.noreply.github.com>
Co-authored-by: Christos Arvanitis <christos.arvanitis@armory.io>
Co-authored-by: armory-abedonik <106548537+armory-abedonik@users.noreply.github.com>
Co-authored-by: Rodrigo Tovar <rodrigotovar398@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Reviewed and ready for merge target-release/1.30
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants