diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-11 09:23:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 09:23:57 -0800 |
| commit | e347c3ed3cc23cdf3af1077dd4becc572a7dfad9 (patch) | |
| tree | 8fa810b76ff89664e05b6a104904629cef77a4fb | |
| parent | dc6ee13c88384c4be0deca622dba9452c096a746 (diff) | |
| parent | f64e26c3e753efb741f622c2a0130b979656d2f7 (diff) | |
| download | openshift-e347c3ed3cc23cdf3af1077dd4becc572a7dfad9.tar.gz openshift-e347c3ed3cc23cdf3af1077dd4becc572a7dfad9.tar.bz2 openshift-e347c3ed3cc23cdf3af1077dd4becc572a7dfad9.tar.xz openshift-e347c3ed3cc23cdf3af1077dd4becc572a7dfad9.zip | |
Merge pull request #6701 from spadgett/webconsole-config-group
Automatic merge from submit-queue.
Use webconsole.config.openshift.io/v1 API group
Update the install to use the new web console config API group and kind.
API change: openshift/api#29
Cluster up change: openshift/origin#18056
/assign @sdodson
@deads2k @jwforres cc
| -rw-r--r-- | files/origin-components/console-config.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/files/origin-components/console-config.yaml b/files/origin-components/console-config.yaml index 8f3f87c0b..e104e8028 100644 --- a/files/origin-components/console-config.yaml +++ b/files/origin-components/console-config.yaml @@ -1,5 +1,5 @@ -kind: AssetConfig -apiVersion: v1 +kind: WebConsoleConfiguration +apiVersion: webconsole.config.openshift.io/v1 extensionDevelopment: false extensionProperties: null extensionScripts: null @@ -18,4 +18,4 @@ servingInfo: keyFile: /var/serving-cert/tls.key maxRequestsInFlight: 0 namedCertificates: null - requestTimeoutSeconds: 0
\ No newline at end of file + requestTimeoutSeconds: 0 |