Skip to content

INTLY-7486: Point amq console links to the parent link instead of the address space link#583

Merged
pb82 merged 1 commit intomasterfrom
INTLY-7486
May 11, 2020
Merged

INTLY-7486: Point amq console links to the parent link instead of the address space link#583
pb82 merged 1 commit intomasterfrom
INTLY-7486

Conversation

@JameelB
Copy link
Contributor

@JameelB JameelB commented May 8, 2020

JIRA: https://issues.redhat.com/browse/INTLY-7486

This change ensures amq online url points to the parent console instead of address space on os3.

Reason for change
The AMQ console route has changed from console-proxy to console in the new AMQ version 1.4. It's path to the address space also has a new format.

After upgrade from rhmi 1.6 to 1.7, the dashboardUrl in the address space of the service instance still remained pointing to the console-proxy route which is being used by the webapp to populate the amq console links in the managed services menu and within the walkthroughs.

This dashboardurl field is managed by the AMQ service broker itself and cannot be modified once created.

Instead of pointing to the address space itself, we should point to the 'parent' amq console link. This will enable us to no longer rely on the dashboardUrl field in the service instance. It will also allow us to ensure that the url to the amq console will always be correct on future versions if it changes again. The AMQ url will now be made available to the webapp through the INSTALLED_SERVICES field.

Related Walkthrough changes: integr8ly/tutorial-web-app-walkthroughs#137

Verification steps

Installation

  1. Run the webapp locally and ensure you pass the following env var when running:
INSTALLED_SERVICES='{   "amq-online-standard":{       "Host":"<amq-online-console-route>"  }}'

Verified on OSD OS3:

Before amq was provisioned:
image

After amq was provisioned, each amq console link redirected you to the following url: https://console-openshift-enmasse.f2d1.rhmi-qe1.openshiftapps.com/#/address-spaces

This was also verified on OS4 by @pb82.

Changes did not affect routes in OS4. This change only affected the AMQ route on OS3.

WT1A was tested with the following PR: integr8ly/tutorial-web-app-walkthroughs#137

Upgrade

Steps to verify changes on upgrade from RHMI 1.6 to 1.7:

  • Install RHMI 1.6
  • Go through WT1A
  • Upgrade to RHMI 1.7
  • Update the webapp CR to add the following param to spec.parameters
    INSTALLED_SERVICES: |-
          { 
            "amq-online-standard":{ 
                "Host":"<amq-online-console-route>"
            }
          }
    
  • Scale down the webapp operator deployment.
  • Update the webapp image to point to quay.io/jameelb/tutorial-web-app:master
  • Verify WT1A still works for previously created address spaces.
  • Verify previously sent messages are still there.

Verified changes on upgrade from RHMI 1.6 to 1.7. WT1A still works, previously sent messages can still be seen in the order app. New messages can still be sent.

@JameelB
Copy link
Contributor Author

JameelB commented May 8, 2020

ping @tiffanynolan

@tiffanynolan tiffanynolan requested a review from pb82 May 8, 2020 17:51
Copy link
Contributor

@pb82 pb82 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tiffanynolan we have verified this change on OS3 and OS4. If @mfrances17 and @dlabaj are ok with it I think we can get it merged.

@JameelB JameelB changed the title [WIP] INTLY-7486 INTLY-7486: Point amq console links to the parent link instead of the address space link May 8, 2020
@pb82 pb82 merged commit f9c4c7c into master May 11, 2020
@pb82 pb82 deleted the INTLY-7486 branch May 11, 2020 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants