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(aws): Fixing bugs related to clone CX when instance types are incompatible with image/region (backport #9901) #9975

Merged
merged 3 commits into from
Apr 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2023

This is an automatic backport of pull request #9901 done by Mergify.
Cherry-pick of d7290c4 has failed:

On branch mergify/bp/release-1.28.x/pr-9901
Your branch is up to date with 'origin/release-1.28.x'.

You are currently cherry-picking commit d7290c4d61.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeSelector.tsx
	new file:   packages/amazon/src/serverGroup/configure/wizard/instanceType/InstanceTypeWarning.tsx
	modified:   packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AdvancedModeSelector.tsx
	modified:   packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/InstanceTypeTable.tsx
	modified:   packages/amazon/src/serverGroup/configure/wizard/instanceType/simpleMode/SimpleModeSelector.tsx
	modified:   packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
	modified:   packages/amazon/src/serverGroup/configure/wizard/pages/ServerGroupInstanceType.tsx
	modified:   packages/amazon/src/serverGroup/serverGroup.transformer.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
	deleted by us:   packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ompatible with image/region (#9901)

* 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)

# Conflicts:
#	packages/amazon/src/serverGroup/configure/serverGroupConfiguration.service.ts
#	packages/amazon/src/serverGroup/configure/wizard/instanceType/advancedMode/AmazonInstanceTypeInfoRenderer.tsx
link108 and others added 2 commits April 17, 2023 13:47
#9980)

Co-authored-by: Cameron Motevasselani <cmotevasselani@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com>
fix(aws): Fixing bugs related to clone CX when instance types are incompatible with image/region (#9901)
@pdk27
Copy link
Contributor

pdk27 commented Apr 19, 2023

I think its a good idea to test that Deck builds and loads successfully as partial changes from another PR are included here. Other than that LGTM. Thanks for back porting these fixes.

@link108 link108 merged commit ccd3959 into release-1.28.x Apr 20, 2023
2 checks passed
@link108 link108 deleted the mergify/bp/release-1.28.x/pr-9901 branch April 20, 2023 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants