Skip to content

Commit 3c75f9a

Browse files
Merge pull request #18056 from spadgett/console-config-api-group
Automatic merge from submit-queue. Use webconsole.config.openshift.io/v1 API group See openshift/api#29 /assign @deads2k @jwforres cc
2 parents 3647e2b + 0ac3f9d commit 3c75f9a

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

install/origin-web-console/console-config.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
kind: AssetConfig
2-
apiVersion: v1
1+
kind: WebConsoleConfiguration
2+
apiVersion: webconsole.config.openshift.io/v1
33
extensionDevelopment: false
44
extensionProperties: null
55
extensionScripts: null
@@ -18,4 +18,4 @@ servingInfo:
1818
keyFile: /var/serving-cert/tls.key
1919
maxRequestsInFlight: 0
2020
namedCertificates: null
21-
requestTimeoutSeconds: 0
21+
requestTimeoutSeconds: 0

pkg/oc/bootstrap/bindata.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/extended/testdata/bindata.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)