Skip to content

Add Azure Red Hat OpenShift branding option #1233

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Mar 9, 2019
Merged

Add Azure Red Hat OpenShift branding option #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/bridge/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func main() {
fK8sPublicEndpoint := fs.String("k8s-public-endpoint", "", "Endpoint to use when rendering kubeconfigs for clients. Useful for when bridge uses an internal endpoint clients can't access for communicating with the API server.")

fDexAPIHost := fs.String("dex-api-host", "", "Target host and port of the Dex API service.")
fBranding := fs.String("branding", "okd", "Console branding for the masthead logo and title. One of okd, openshift, ocp, online, or dedicated. Defaults to okd.")
fBranding := fs.String("branding", "okd", "Console branding for the masthead logo and title. One of okd, openshift, ocp, online, dedicated, or azure. Defaults to okd.")
fDocumentationBaseURL := fs.String("documentation-base-url", "", "The base URL for documentation links.")
fGoogleTagManagerID := fs.String("google-tag-manager-id", "", "Google Tag Manager ID. External analytics are disabled if this is not set.")

Expand Down Expand Up @@ -149,8 +149,9 @@ func main() {
case "ocp":
case "online":
case "dedicated":
case "azure":
default:
flagFatalf("branding", "value must be one of okd, openshift, ocp, or online")
flagFatalf("branding", "value must be one of okd, openshift, ocp, online, dedicated, or azure")
}

srv := &server.Server{
Expand Down
2 changes: 2 additions & 0 deletions frontend/public/branding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const getProductName = () => {
return 'OpenShift Online';
case 'dedicated':
return 'OpenShift Dedicated';
case 'azure':
return 'Azure Red Hat OpenShift';
default:
return 'OKD';
}
Expand Down
7 changes: 7 additions & 0 deletions frontend/public/components/masthead.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import openshiftLogoImg from '../imgs/openshift-logo.svg';
import ocpLogoImg from '../imgs/openshift-platform-logo.svg';
import onlineLogoImg from '../imgs/openshift-online-logo.svg';
import dedicatedLogoImg from '../imgs/openshift-dedicated-logo.svg';
import azureLogoImg from '../imgs/azure-red-hat-openshift-logo.svg';
import * as pfBg992 from '../../public/imgs/pfbg_992.jpg';

export const getBrandingDetails = () => {
Expand Down Expand Up @@ -39,6 +40,12 @@ export const getBrandingDetails = () => {
logoAlt = 'OpenShift Dedicated';
productTitle = 'Red Hat OpenShift Dedicated';
break;
case 'azure':
backgroundImg = pfBg992;
logoImg = azureLogoImg;
logoAlt = 'Azure Red Hat OpenShift';
productTitle = 'Azure Red Hat OpenShift';
break;
default:
backgroundImg = pfBg992;
logoImg = okdLogoImg;
Expand Down
101 changes: 101 additions & 0 deletions frontend/public/imgs/azure-red-hat-openshift-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions frontend/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<title>OpenShift Dedicated</title>
<meta name="application-name" content="OpenShift Dedicated">
[[ end ]]
[[ if eq .Branding "azure" ]]
<title>Azure Red Hat OpenShift</title>
<meta name="application-name" content="Azure Red Hat OpenShift">
[[ end ]]

[[ if eq .Branding "okd" ]]
<link rel="shortcut icon" href="<%= require('./imgs/okd-favicon.png') %>">
Expand Down
4 changes: 4 additions & 0 deletions frontend/public/tokener.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<title>OpenShift Dedicated</title>
<meta name="application-name" content="OpenShift Dedicated">
[[ end ]]
[[ if eq .Branding "azure" ]]
<title>Azure Red Hat OpenShift</title>
<meta name="application-name" content="Azure Red Hat OpenShift">
[[ end ]]

[[ if eq .Branding "okd" ]]
<link rel="shortcut icon" href="<%= require('./imgs/okd-favicon.png') %>">
Expand Down