Skip to content

Commit

Permalink
Merge pull request #18662 from enj/enj/d/masterPublicURL_internal_ext…
Browse files Browse the repository at this point in the history
…ernal

Automatic merge from submit-queue.

masterPublicURL must be both internally and externally accessible

fda7222 changed the doc for the internal struct.  This change simply updates the external type to match.

Signed-off-by: Monis Khan <[email protected]>

xref: https://github.com/openshift/origin/pull/10845/files#diff-3788994f990386b63387ece5c3b5dc33R638
xref: openshift/oauth-proxy#55

/assign @liggitt
  • Loading branch information
openshift-merge-robot authored Feb 19, 2018
2 parents 10f6e7f + dea57df commit bfdca25
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/cmd/server/apis/config/v1/swagger_doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/cmd/server/apis/config/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ type OAuthConfig struct {
// MasterURL is used for making server-to-server calls to exchange authorization codes for access tokens
MasterURL string `json:"masterURL"`

// MasterPublicURL is used for building valid client redirect URLs for external access
// MasterPublicURL is used for building valid client redirect URLs for internal and external access
MasterPublicURL string `json:"masterPublicURL"`

// AssetPublicURL is used for building valid client redirect URLs for external access
Expand Down

0 comments on commit bfdca25

Please sign in to comment.