Merge pull request #59 from matskiv/INTLY-2791

INTLY-2791: Add new OPENSHIFT_OAUTH_HOST param

Makefile

@@ -2,7 +2,7 @@ SHELL=/bin/bash
 REG=quay.io
 ORG=integreatly
 IMAGE=tutorial-web-app-operator
-TAG=0.0.24
+TAG=0.0.25
 KUBE_CMD=oc apply -f
 DEPLOY_DIR=deploy
 OUT_STATIC_DIR=tmp/_output

deploy/operator.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: tutorial-web-app-operator
       containers:
         - name: tutorial-web-app-operator
-          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.24
+          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.25
           ports:
           - containerPort: 60000
             name: metrics

deploy/template/tutorial-web-app.yml

@@ -12,6 +12,10 @@ parameters:
     description: The OpenShift master/api host e.g. openshift.example.com:8443. If blank, mock data (and mock service URL params) will be used.
     displayName: OpenShift Host
     required: false
+  - name: OPENSHIFT_OAUTH_HOST
+    description: The OpenShift OAuth host. OpenShift 4 example - https://oauth-openshift.apps.openshift.example.com. On OpenShift it's the same as OPENSHIFT_HOST. If blank, mock data (and mock service URL params) will be used.
+    displayName: OpenShift Host
+    required: false
   - name: FUSE_URL
     description: Mock URL for Fuse. Only used if OPENSHIFT_HOST is empty
     required: false
@@ -72,6 +76,8 @@ objects:
                   value: ${OPENSHIFT_OAUTHCLIENT_ID}
                 - name: OPENSHIFT_HOST
                   value: ${OPENSHIFT_HOST}
+                - name: OPENSHIFT_OAUTH_HOST
+                  value: ${OPENSHIFT_OAUTH_HOST}
                 - name: NODE_ENV
                   value: production
                 - name: SSO_ROUTE
@@ -84,7 +90,7 @@ objects:
                   value: ${CLUSTER_TYPE}
                 - name: DATABASE_LOCATION
                   value: ${DATABASE_LOCATION}
-              image: quay.io/integreatly/tutorial-web-app:2.14.0
+              image: quay.io/integreatly/tutorial-web-app:2.15.0
               imagePullPolicy: Always
               name: tutorial-web-app
               ports:

pkg/handlers/webhandler.go

@@ -29,7 +29,7 @@ const (
 	ClusterTypeDefault        = "not set"
 )
 
-var webappParams = [...]string{"OPENSHIFT_OAUTHCLIENT_ID", "OPENSHIFT_HOST", "SSO_ROUTE", IntegreatlyVersion, WTLocations, ClusterType}
+var webappParams = [...]string{"OPENSHIFT_OAUTHCLIENT_ID", "OPENSHIFT_HOST", "OPENSHIFT_OAUTH_HOST", "SSO_ROUTE", IntegreatlyVersion, WTLocations, ClusterType}
 
 func NewWebHandler(m *metrics.Metrics, osClient openshift.OSClientInterface, factory ClientFactory, cruder SdkCruder) AppHandler {
 	return AppHandler{

version/version.go

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.24"
+	Version = "0.0.25"
 )