diff --git a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml index 336304918..da8f751b1 100644 --- a/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/bundle/manifests/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -43,16 +43,16 @@ spec: description: DefaultRoutingClass specifies the routingClass to be used when a DevWorkspace specifies an empty `.spec.routingClass`. Supported routingClasses can be defined in other controllers. If not specified, the default value of "basic" is used. type: string proxyConfig: - description: "ProxyConfig defines the proxy settings that should be used for all DevWorkspaces. These values are propagated to workspace containers as environment variables. \n On OpenShift, the operator automatically reads values from the \"cluster\" proxies.config.openshift.io object and this value only needs to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster configuration. \n Changes to the proxy configuration are detected by the DevWorkspace Operator and propagated to DevWorkspaces. However, changing the proxy configuration for the DevWorkspace Operator itself requires restarting the controller deployment." + description: "ProxyConfig defines the proxy settings that should be used for all DevWorkspaces. These values are propagated to workspace containers as environment variables. \n On OpenShift, the operator automatically reads values from the \"cluster\" proxies.config.openshift.io object and this value only needs to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster configuration. To ignore automatically read values from the cluster, set values in fields to the empty string (\"\") \n Changes to the proxy configuration are detected by the DevWorkspace Operator and propagated to DevWorkspaces. However, changing the proxy configuration for the DevWorkspace Operator itself requires restarting the controller deployment." properties: httpProxy: - description: HttpProxy is the URL of the proxy for HTTP requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + description: HttpProxy is the URL of the proxy for HTTP requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. To ignore automatically detected proxy settings for the cluster, set this field to an empty string ("") type: string httpsProxy: - description: HttpsProxy is the URL of the proxy for HTTPS requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + description: HttpsProxy is the URL of the proxy for HTTPS requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. To ignore automatically detected proxy settings for the cluster, set this field to an empty string ("") type: string noProxy: - description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored when HttpProxy and HttpsProxy are unset + description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored when HttpProxy and HttpsProxy are unset. To ignore automatically detected proxy settings for the cluster, set this field to an empty string ("") type: string type: object type: object diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 6045bb73b..638aa3d89 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -64,23 +64,31 @@ spec: to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster - configuration. \n Changes to the proxy configuration are detected - by the DevWorkspace Operator and propagated to DevWorkspaces. - However, changing the proxy configuration for the DevWorkspace - Operator itself requires restarting the controller deployment." + configuration. To ignore automatically read values from the + cluster, set values in fields to the empty string (\"\") \n + Changes to the proxy configuration are detected by the DevWorkspace + Operator and propagated to DevWorkspaces. However, changing + the proxy configuration for the DevWorkspace Operator itself + requires restarting the controller deployment." properties: httpProxy: description: HttpProxy is the URL of the proxy for HTTP requests, - in the format http://USERNAME:PASSWORD@SERVER:PORT/ + in the format http://USERNAME:PASSWORD@SERVER:PORT/. To + ignore automatically detected proxy settings for the cluster, + set this field to an empty string ("") type: string httpsProxy: description: HttpsProxy is the URL of the proxy for HTTPS - requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. + To ignore automatically detected proxy settings for the + cluster, set this field to an empty string ("") type: string noProxy: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored - when HttpProxy and HttpsProxy are unset + when HttpProxy and HttpsProxy are unset. To ignore automatically + detected proxy settings for the cluster, set this field + to an empty string ("") type: string type: object type: object diff --git a/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml index 47cdff1b1..8bf35e047 100644 --- a/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml @@ -64,23 +64,31 @@ spec: to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster - configuration. \n Changes to the proxy configuration are detected - by the DevWorkspace Operator and propagated to DevWorkspaces. - However, changing the proxy configuration for the DevWorkspace - Operator itself requires restarting the controller deployment." + configuration. To ignore automatically read values from the + cluster, set values in fields to the empty string (\"\") \n + Changes to the proxy configuration are detected by the DevWorkspace + Operator and propagated to DevWorkspaces. However, changing + the proxy configuration for the DevWorkspace Operator itself + requires restarting the controller deployment." properties: httpProxy: description: HttpProxy is the URL of the proxy for HTTP requests, - in the format http://USERNAME:PASSWORD@SERVER:PORT/ + in the format http://USERNAME:PASSWORD@SERVER:PORT/. To + ignore automatically detected proxy settings for the cluster, + set this field to an empty string ("") type: string httpsProxy: description: HttpsProxy is the URL of the proxy for HTTPS - requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. + To ignore automatically detected proxy settings for the + cluster, set this field to an empty string ("") type: string noProxy: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored - when HttpProxy and HttpsProxy are unset + when HttpProxy and HttpsProxy are unset. To ignore automatically + detected proxy settings for the cluster, set this field + to an empty string ("") type: string type: object type: object diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 605fce34a..10c17f062 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -64,23 +64,31 @@ spec: to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster - configuration. \n Changes to the proxy configuration are detected - by the DevWorkspace Operator and propagated to DevWorkspaces. - However, changing the proxy configuration for the DevWorkspace - Operator itself requires restarting the controller deployment." + configuration. To ignore automatically read values from the + cluster, set values in fields to the empty string (\"\") \n + Changes to the proxy configuration are detected by the DevWorkspace + Operator and propagated to DevWorkspaces. However, changing + the proxy configuration for the DevWorkspace Operator itself + requires restarting the controller deployment." properties: httpProxy: description: HttpProxy is the URL of the proxy for HTTP requests, - in the format http://USERNAME:PASSWORD@SERVER:PORT/ + in the format http://USERNAME:PASSWORD@SERVER:PORT/. To + ignore automatically detected proxy settings for the cluster, + set this field to an empty string ("") type: string httpsProxy: description: HttpsProxy is the URL of the proxy for HTTPS - requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. + To ignore automatically detected proxy settings for the + cluster, set this field to an empty string ("") type: string noProxy: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored - when HttpProxy and HttpsProxy are unset + when HttpProxy and HttpsProxy are unset. To ignore automatically + detected proxy settings for the cluster, set this field + to an empty string ("") type: string type: object type: object diff --git a/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml index 47cdff1b1..8bf35e047 100644 --- a/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/devworkspaceoperatorconfigs.controller.devfile.io.CustomResourceDefinition.yaml @@ -64,23 +64,31 @@ spec: to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster - configuration. \n Changes to the proxy configuration are detected - by the DevWorkspace Operator and propagated to DevWorkspaces. - However, changing the proxy configuration for the DevWorkspace - Operator itself requires restarting the controller deployment." + configuration. To ignore automatically read values from the + cluster, set values in fields to the empty string (\"\") \n + Changes to the proxy configuration are detected by the DevWorkspace + Operator and propagated to DevWorkspaces. However, changing + the proxy configuration for the DevWorkspace Operator itself + requires restarting the controller deployment." properties: httpProxy: description: HttpProxy is the URL of the proxy for HTTP requests, - in the format http://USERNAME:PASSWORD@SERVER:PORT/ + in the format http://USERNAME:PASSWORD@SERVER:PORT/. To + ignore automatically detected proxy settings for the cluster, + set this field to an empty string ("") type: string httpsProxy: description: HttpsProxy is the URL of the proxy for HTTPS - requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. + To ignore automatically detected proxy settings for the + cluster, set this field to an empty string ("") type: string noProxy: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored - when HttpProxy and HttpsProxy are unset + when HttpProxy and HttpsProxy are unset. To ignore automatically + detected proxy settings for the cluster, set this field + to an empty string ("") type: string type: object type: object diff --git a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml index 978a9b66e..6c14fad5b 100644 --- a/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml +++ b/deploy/templates/crd/bases/controller.devfile.io_devworkspaceoperatorconfigs.yaml @@ -63,23 +63,31 @@ spec: to be set to override those defaults. Values for httpProxy and httpsProxy override the cluster configuration directly. Entries for noProxy are merged with the noProxy values in the cluster - configuration. \n Changes to the proxy configuration are detected - by the DevWorkspace Operator and propagated to DevWorkspaces. - However, changing the proxy configuration for the DevWorkspace - Operator itself requires restarting the controller deployment." + configuration. To ignore automatically read values from the + cluster, set values in fields to the empty string (\"\") \n + Changes to the proxy configuration are detected by the DevWorkspace + Operator and propagated to DevWorkspaces. However, changing + the proxy configuration for the DevWorkspace Operator itself + requires restarting the controller deployment." properties: httpProxy: description: HttpProxy is the URL of the proxy for HTTP requests, - in the format http://USERNAME:PASSWORD@SERVER:PORT/ + in the format http://USERNAME:PASSWORD@SERVER:PORT/. To + ignore automatically detected proxy settings for the cluster, + set this field to an empty string ("") type: string httpsProxy: description: HttpsProxy is the URL of the proxy for HTTPS - requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/ + requests, in the format http://USERNAME:PASSWORD@SERVER:PORT/. + To ignore automatically detected proxy settings for the + cluster, set this field to an empty string ("") type: string noProxy: description: NoProxy is a comma-separated list of hostnames and/or CIDRs for which the proxy should not be used. Ignored - when HttpProxy and HttpsProxy are unset + when HttpProxy and HttpsProxy are unset. To ignore automatically + detected proxy settings for the cluster, set this field + to an empty string ("") type: string type: object type: object