diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml index 8526bd373..ac038a758 100644 --- a/deploy/crds/org_v1_che_crd.yaml +++ b/deploy/crds/org_v1_che_crd.yaml @@ -435,15 +435,16 @@ spec: particular configuration for Git. type: boolean nonProxyHosts: - description: List of hosts that should not use the configured proxy. - Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32` + description: 'List of hosts that should not use the configured proxy. + So specify wild card domain use the following form `.` + and `|` as delimiter, eg: `localhost|.my.host.com|123.42.12.32` 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). + (see also the `proxyURL` fields).' type: string pluginRegistryImage: description: Overrides the container image used in the Plugin registry diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index 740ce0cc3..3e35acb52 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -52,13 +52,13 @@ metadata: categories: Developer Tools certified: "false" containerImage: quay.io/eclipse/che-operator:nightly - createdAt: "2020-09-25T09:17:34Z" + createdAt: "2020-09-28T07:48:12Z" 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.v7.20.0-9.nightly + name: eclipse-che-preview-kubernetes.v7.20.0-10.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -402,4 +402,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.20.0-9.nightly + version: 7.20.0-10.nightly diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml index 8526bd373..ac038a758 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml @@ -435,15 +435,16 @@ spec: particular configuration for Git. type: boolean nonProxyHosts: - description: List of hosts that should not use the configured proxy. - Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32` + description: 'List of hosts that should not use the configured proxy. + So specify wild card domain use the following form `.` + and `|` as delimiter, eg: `localhost|.my.host.com|123.42.12.32` 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). + (see also the `proxyURL` fields).' type: string pluginRegistryImage: description: Overrides the container image used in the Plugin registry diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index c9e4c6df6..ab0629b43 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -49,13 +49,13 @@ metadata: categories: Developer Tools, OpenShift Optional certified: "false" containerImage: quay.io/eclipse/che-operator:nightly - createdAt: "2020-09-25T09:17:35Z" + createdAt: "2020-09-28T07:48:12Z" description: A Kube-native development solution that delivers portable and collaborative developer workspaces in OpenShift. operatorframework.io/suggested-namespace: eclipse-che repository: https://github.com/eclipse/che-operator support: Eclipse Foundation - name: eclipse-che-preview-openshift.v7.20.0-9.nightly + name: eclipse-che-preview-openshift.v7.20.0-10.nightly namespace: placeholder spec: apiservicedefinitions: {} @@ -435,4 +435,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.20.0-9.nightly + version: 7.20.0-10.nightly diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml index 8526bd373..ac038a758 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml @@ -435,15 +435,16 @@ spec: particular configuration for Git. type: boolean nonProxyHosts: - description: List of hosts that should not use the configured proxy. - Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32` + description: 'List of hosts that should not use the configured proxy. + So specify wild card domain use the following form `.` + and `|` as delimiter, eg: `localhost|.my.host.com|123.42.12.32` 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). + (see also the `proxyURL` fields).' type: string pluginRegistryImage: description: Overrides the container image used in the Plugin registry diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go index 98e274a47..aaedda8df 100644 --- a/pkg/apis/org/v1/che_types.go +++ b/pkg/apis/org/v1/che_types.go @@ -220,7 +220,8 @@ type CheClusterSpecServer struct { // (see also the `proxyURL` and `nonProxyHosts` fields). // +optional ProxyPort string `json:"proxyPort,omitempty"` - // List of hosts that should not use the configured proxy. Use `|`` as delimiter, eg `localhost|my.host.com|123.42.12.32` + // List of hosts that should not use the configured proxy. + // So specify wild card domain use the following form `.` and `|` as delimiter, eg: `localhost|.my.host.com|123.42.12.32` // 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 diff --git a/pkg/apis/org/v1/zz_generated.openapi.go b/pkg/apis/org/v1/zz_generated.openapi.go index a6a5d0c80..900b06c23 100644 --- a/pkg/apis/org/v1/zz_generated.openapi.go +++ b/pkg/apis/org/v1/zz_generated.openapi.go @@ -648,7 +648,7 @@ func schema_pkg_apis_org_v1_CheClusterSpecServer(ref common.ReferenceCallback) c }, "nonProxyHosts": { SchemaProps: spec.SchemaProps{ - 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. 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).", + Description: "List of hosts that should not use the configured proxy. So specify wild card domain use the following form `.` and `|` as delimiter, eg: `localhost|.my.host.com|123.42.12.32` 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{"string"}, Format: "", },