-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update CRD to mention OpenShift cluster wide proxy support
Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
- Loading branch information
Showing
13 changed files
with
2,180 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
562 changes: 562 additions & 0 deletions
562
...e-che-preview-kubernetes/9.9.9-nightly.1594287220/eclipse-che-preview-kubernetes.crd.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
55 changes: 55 additions & 0 deletions
55
...-preview-kubernetes/9.9.9-nightly.1594287220/eclipse-che-preview-kubernetes.crd.yaml.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
--- /home/tolusha/gocode/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1594209360/eclipse-che-preview-kubernetes.crd.yaml 2020-07-09 10:23:47.962964030 +0300 | ||
+++ /home/tolusha/gocode/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1594287220/eclipse-che-preview-kubernetes.crd.yaml 2020-07-09 12:33:41.272624471 +0300 | ||
@@ -371,8 +371,13 @@ | ||
nonProxyHosts: | ||
description: List of hosts that should not use the configured proxy. | ||
Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32` | ||
- Only use when configuring a proxy is required (see also the `proxyURL` | ||
- field). | ||
+ Only use when configuring a proxy is required. Operator respects | ||
+ OpenShift cluster wide proxy configuration and no additional configuration | ||
+ is required, but defining `nonProxyHosts` in a custom resource | ||
+ leads to merging non proxy hosts lists from the cluster proxy | ||
+ configuration and ones defined in the custom resources. (see the | ||
+ doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html) | ||
+ (see also the `proxyURL` fields). | ||
type: string | ||
pluginRegistryImage: | ||
description: Overrides the container image used in the Plugin registry | ||
@@ -400,11 +405,13 @@ | ||
type: string | ||
proxyPassword: | ||
description: Password of the proxy server Only use when proxy configuration | ||
- is required (see also the `proxyUser` and `proxySecret` fields). | ||
+ is required (see also the `proxyURL`, `proxyUser` and `proxySecret` | ||
+ fields). | ||
type: string | ||
proxyPort: | ||
description: Port of the proxy server. Only use when configuring | ||
- a proxy is required (see also the `proxyURL` field). | ||
+ a proxy is required. (see also the `proxyURL` and `nonProxyHosts` | ||
+ fields). | ||
type: string | ||
proxySecret: | ||
description: The secret that contains `user` and `password` for | ||
@@ -415,11 +422,18 @@ | ||
description: URL (protocol+hostname) of the proxy server. This drives | ||
the appropriate changes in the `JAVA_OPTS` and `https(s)_proxy` | ||
variables in the Che server and workspaces containers. Only use | ||
- when configuring a proxy is required. | ||
+ when configuring a proxy is required. Operator respects OpenShift | ||
+ cluster wide proxy configuration and no additional configuration | ||
+ is required, but defining `proxyUrl` in a custom resource leads | ||
+ to overrides the cluster proxy configuration with fields `proxyUrl`, | ||
+ `proxyPort`, `proxyUser` and `proxyPassword` from the custom resource. | ||
+ (see the doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html) | ||
+ (see also the `proxyPort` and `nonProxyHosts` fields). | ||
type: string | ||
proxyUser: | ||
description: User name of the proxy server. Only use when configuring | ||
- a proxy is required (see also the `proxyURL` `proxySecret` fields). | ||
+ a proxy is required (see also the `proxyURL`, `proxyPassword` | ||
+ and `proxySecret` fields). | ||
type: string | ||
selfSignedCert: | ||
description: Deprecated. The value of this flag is ignored. Che |
403 changes: 403 additions & 0 deletions
403
...87220/eclipse-che-preview-kubernetes.v9.9.9-nightly.1594287220.clusterserviceversion.yaml
Large diffs are not rendered by default.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
.../eclipse-che-preview-kubernetes.v9.9.9-nightly.1594287220.clusterserviceversion.yaml.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
--- /home/tolusha/gocode/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1594209360/eclipse-che-preview-kubernetes.v9.9.9-nightly.1594209360.clusterserviceversion.yaml 2020-07-09 10:23:47.962964030 +0300 | ||
+++ /home/tolusha/gocode/src/github.com/eclipse/che-operator/olm/eclipse-che-preview-kubernetes/deploy/olm-catalog/eclipse-che-preview-kubernetes/9.9.9-nightly.1594287220/eclipse-che-preview-kubernetes.v9.9.9-nightly.1594287220.clusterserviceversion.yaml 2020-07-09 12:33:41.268624474 +0300 | ||
@@ -52,12 +52,12 @@ | ||
categories: Developer Tools | ||
certified: "false" | ||
containerImage: quay.io/eclipse/che-operator:nightly | ||
- createdAt: "2020-07-08T11:56:01Z" | ||
+ createdAt: "2020-07-09T09:33:41Z" | ||
description: A Kube-native development solution that delivers portable and collaborative | ||
developer workspaces. | ||
repository: https://github.com/eclipse/che-operator | ||
support: Eclipse Foundation | ||
- name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594209360 | ||
+ name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594287220 | ||
namespace: placeholder | ||
spec: | ||
apiservicedefinitions: {} | ||
@@ -399,5 +399,5 @@ | ||
maturity: stable | ||
provider: | ||
name: Eclipse Foundation | ||
- replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594133420 | ||
- version: 9.9.9-nightly.1594209360 | ||
+ replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594209360 | ||
+ version: 9.9.9-nightly.1594287220 |
2 changes: 1 addition & 1 deletion
2
...oy/olm-catalog/eclipse-che-preview-kubernetes/eclipse-che-preview-kubernetes.package.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.