diff --git a/Makefile b/Makefile index 022b619..d7f3aab 100644 --- a/Makefile +++ b/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 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 641cfbb..f8830c3 100644 --- a/deploy/operator.yaml +++ b/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 diff --git a/deploy/template/tutorial-web-app.yml b/deploy/template/tutorial-web-app.yml index ee8598b..2616d34 100644 --- a/deploy/template/tutorial-web-app.yml +++ b/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: diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go index e937098..3411671 100644 --- a/pkg/handlers/webhandler.go +++ b/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{ diff --git a/version/version.go b/version/version.go index 3947a09..5ac98ad 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "0.0.24" + Version = "0.0.25" )