Skip to content

Commit

Permalink
Update CRD to mention OpenShift cluster wide proxy support (#333)
Browse files Browse the repository at this point in the history
Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
  • Loading branch information
tolusha authored Jul 10, 2020
1 parent 0fda3da commit 64e4b48
Show file tree
Hide file tree
Showing 13 changed files with 2,184 additions and 22 deletions.
26 changes: 20 additions & 6 deletions deploy/crds/org_v1_che_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,13 @@ spec:
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
Expand Down Expand Up @@ -400,11 +405,13 @@ spec:
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
Expand All @@ -415,11 +422,18 @@ spec:
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
Expand Down

Large diffs are not rendered by default.

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.1594294265/eclipse-che-preview-kubernetes.crd.yaml 2020-07-10 09:20:27.918985515 +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.1594362070/eclipse-che-preview-kubernetes.crd.yaml 2020-07-10 09:21:10.482919692 +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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--- /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.1594294265/eclipse-che-preview-kubernetes.v9.9.9-nightly.1594294265.clusterserviceversion.yaml 2020-07-10 09:20:27.918985515 +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.1594362070/eclipse-che-preview-kubernetes.v9.9.9-nightly.1594362070.clusterserviceversion.yaml 2020-07-10 09:21:10.478919699 +0300
@@ -52,13 +52,13 @@
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
- createdAt: "2020-07-09T11:31:05Z"
+ createdAt: "2020-07-10T06:21:10Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
- name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594294265
+ name: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594362070
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -400,5 +400,5 @@
maturity: stable
provider:
name: Eclipse Foundation
- replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594209360
- version: 9.9.9-nightly.1594294265
+ replaces: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594294265
+ version: 9.9.9-nightly.1594362070
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- currentCSV: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594294265
- currentCSV: eclipse-che-preview-kubernetes.v9.9.9-nightly.1594362070
name: nightly
- currentCSV: eclipse-che-preview-kubernetes.v7.15.1
name: stable
Expand Down
Loading

0 comments on commit 64e4b48

Please sign in to comment.