Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete tls switcher. Add plugin and devfile registry links. #696

Merged
merged 2 commits into from
Mar 4, 2021
Merged

Delete tls switcher. Add plugin and devfile registry links. #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f781194
Fix and improve CR, CRD.
AndrienkoAleksandr Mar 4, 2021
8a2b87e
Update OLM bundle
AndrienkoAleksandr Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 97 additions & 91 deletions deploy/crds/org_v1_che_cr.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deploy/crds/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ spec:
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).
doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html.
See also the `proxyURL` fields.'
type: string
pluginRegistryCpuLimit:
Expand Down Expand Up @@ -671,7 +671,7 @@ spec:
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 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:
Expand Down Expand Up @@ -744,7 +744,7 @@ spec:
useInternalClusterSVCNames:
description: Use internal cluster SVC names to communicate between
components to speed up the traffic and avoid proxy issues. The
default value is `false`.
default value is `true`.
type: boolean
workspaceNamespaceDefault:
description: Defines Kubernetes default namespace in which user's
Expand Down
44 changes: 17 additions & 27 deletions ...-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ metadata:
"externalIdentityProvider": false,
"identityProviderAdminUserName": "",
"identityProviderClientId": "",
"identityProviderImage": "",
"identityProviderPassword": "",
"identityProviderRealm": "",
"identityProviderURL": "",
Expand All @@ -29,8 +28,7 @@ metadata:
"chePostgresPassword": "",
"chePostgresPort": "",
"chePostgresUser": "",
"externalDb": false,
"postgresImage": ""
"externalDb": false
},
"k8s": {
"ingressClass": "",
Expand All @@ -48,24 +46,15 @@ metadata:
"allowUserDefinedWorkspaceNamespaces": false,
"cheClusterRoles": "",
"cheFlavor": "",
"cheImage": "",
"cheImageTag": "",
"cheWorkspaceClusterRole": "",
"devfileRegistryImage": "",
"gitSelfSignedCert": false,
"nonProxyHosts": "",
"pluginRegistryImage": "",
"proxyPassword": "",
"proxyPort": "",
"proxyURL": "",
"proxyUser": "",
"serverExposureStrategy": "",
"serverMemoryLimit": "",
"serverMemoryRequest": "",
"serverTrustStoreConfigMapName": "",
"singleHostGatewayConfigMapLabels": {},
"singleHostGatewayConfigSidecarImage": "",
"singleHostGatewayImage": "",
"tlsSupport": true,
"useInternalClusterSVCNames": true,
"workspaceNamespaceDefault": "<username>-che"
Expand All @@ -74,7 +63,6 @@ metadata:
"postgresPVCStorageClassName": "",
"preCreateSubPaths": true,
"pvcClaimSize": "1Gi",
"pvcJobsImage": "",
"pvcStrategy": "common",
"workspacePVCStorageClassName": ""
}
Expand All @@ -85,13 +73,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-03-03T13:40:26Z"
createdAt: "2021-03-04T13:35:29Z"
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.27.0-106.nightly
name: eclipse-che-preview-kubernetes.v7.28.0-108.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -102,14 +90,6 @@ spec:
displayName: Eclipse Che Cluster
kind: CheCluster
name: checlusters.org.eclipse.che
specDescriptors:
- description: Deprecated. Instructs the Operator to deploy Che in TLS mode.
This is enabled by default. Disabling TLS sometimes cause malfunction
of some Che components.
displayName: TLS support
path: server.tlsSupport
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
statusDescriptors:
- description: Status of a Che installation. Can be `Available`, `Unavailable`,
or `Available, Rolling Update in Progress`.
Expand All @@ -127,6 +107,11 @@ spec:
path: cheVersion
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: Public URL to the devfile registry.
displayName: Devfile registry URL
path: devfileRegistryURL
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: A URL that points to some URL where to find help related
to the current Operator status.
displayName: Help link
Expand All @@ -151,6 +136,11 @@ spec:
path: openShiftOAuthUserCredentialsSecret
x-descriptors:
- urn:alm:descriptor:text
- description: Public URL to the plugin registry.
displayName: Plugin registry URL
path: pluginRegistryURL
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: A brief CamelCase message indicating details about why the
Pod is in this state.
displayName: Reason
Expand Down Expand Up @@ -223,17 +213,17 @@ spec:
Status:
Che Cluster Running: Available
Che URL: http://che-my-eclipse-che.gcp.my-ide.cloud
Che Version: 7.0.0
Che Version: 7.26.0
...
```

By opening this URL in a web browser, Eclipse Che is ready to use.
## Defaults
By default, the operator deploys Eclipse Che with:
* Bundled PostgreSQL and Keycloak
* Per-Workspace PVC strategy
* Common PVC strategy
* Auto-generated passwords
* TLS mode (secure routes)
* TLS mode (secure ingresses)
## Installation Options
Eclipse Che operator installation options include:
* Connection to external database and Keycloak
Expand Down Expand Up @@ -685,4 +675,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.27.0-106.nightly
version: 7.28.0-108.nightly
6 changes: 3 additions & 3 deletions deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ spec:
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).
doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html.
See also the `proxyURL` fields.'
type: string
pluginRegistryCpuLimit:
Expand Down Expand Up @@ -671,7 +671,7 @@ spec:
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 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:
Expand Down Expand Up @@ -744,7 +744,7 @@ spec:
useInternalClusterSVCNames:
description: Use internal cluster SVC names to communicate between
components to speed up the traffic and avoid proxy issues. The
default value is `false`.
default value is `true`.
type: boolean
workspaceNamespaceDefault:
description: Defines Kubernetes default namespace in which user's
Expand Down
42 changes: 16 additions & 26 deletions ...m-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ metadata:
"externalIdentityProvider": false,
"identityProviderAdminUserName": "",
"identityProviderClientId": "",
"identityProviderImage": "",
"identityProviderPassword": "",
"identityProviderRealm": "",
"identityProviderURL": "",
Expand All @@ -29,8 +28,7 @@ metadata:
"chePostgresPassword": "",
"chePostgresPort": "",
"chePostgresUser": "",
"externalDb": false,
"postgresImage": ""
"externalDb": false
},
"metrics": {
"enable": true
Expand All @@ -39,24 +37,15 @@ metadata:
"allowUserDefinedWorkspaceNamespaces": false,
"cheClusterRoles": "",
"cheFlavor": "",
"cheImage": "",
"cheImageTag": "",
"cheWorkspaceClusterRole": "",
"devfileRegistryImage": "",
"gitSelfSignedCert": false,
"nonProxyHosts": "",
"pluginRegistryImage": "",
"proxyPassword": "",
"proxyPort": "",
"proxyURL": "",
"proxyUser": "",
"serverExposureStrategy": "",
"serverMemoryLimit": "",
"serverMemoryRequest": "",
"serverTrustStoreConfigMapName": "",
"singleHostGatewayConfigMapLabels": {},
"singleHostGatewayConfigSidecarImage": "",
"singleHostGatewayImage": "",
"tlsSupport": true,
"useInternalClusterSVCNames": true,
"workspaceNamespaceDefault": "<username>-che"
Expand All @@ -65,7 +54,6 @@ metadata:
"postgresPVCStorageClassName": "",
"preCreateSubPaths": true,
"pvcClaimSize": "1Gi",
"pvcJobsImage": "",
"pvcStrategy": "common",
"workspacePVCStorageClassName": ""
}
Expand All @@ -76,13 +64,13 @@ metadata:
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-03-03T13:40:37Z"
createdAt: "2021-03-04T13:35:37Z"
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.27.0-106.nightly
name: eclipse-che-preview-openshift.v7.28.0-108.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand All @@ -93,14 +81,6 @@ spec:
displayName: Eclipse Che Cluster
kind: CheCluster
name: checlusters.org.eclipse.che
specDescriptors:
- description: Deprecated. Instructs the Operator to deploy Che in TLS mode.
This is enabled by default. Disabling TLS sometimes cause malfunction
of some Che components.
displayName: TLS support
path: server.tlsSupport
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
statusDescriptors:
- description: Status of a Che installation. Can be `Available`, `Unavailable`,
or `Available, Rolling Update in Progress`.
Expand All @@ -118,6 +98,11 @@ spec:
path: cheVersion
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: Public URL to the devfile registry.
displayName: Devfile registry URL
path: devfileRegistryURL
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: A URL that points to some URL where to find help related
to the current Operator status.
displayName: Help link
Expand All @@ -142,6 +127,11 @@ spec:
path: openShiftOAuthUserCredentialsSecret
x-descriptors:
- urn:alm:descriptor:text
- description: Public URL to the plugin registry.
displayName: Plugin registry URL
path: pluginRegistryURL
x-descriptors:
- urn:alm:descriptor:org.w3:link
- description: A brief CamelCase message indicating details about why the
Pod is in this state.
displayName: Reason
Expand All @@ -158,7 +148,7 @@ spec:

Press the **Install** button, choose the upgrade strategy, and wait for the **Installed** Operator status.

When the operator is installed, create a new CR of Kind CheCluster (click the **Create New** button).
When the operator is installed, create a new CR of Kind CheCluster (click the **Create New** or **Create Instance** button).
The CR spec contains all defaults (see below).

You can start using Eclipse Che when the CR status is set to **Available**, and you see a URL to Eclipse Che.
Expand All @@ -169,7 +159,7 @@ spec:

* Bundled PostgreSQL and Keycloak

* Per-Workspace PVC strategy
* Common PVC strategy

* Auto-generated passwords

Expand Down Expand Up @@ -757,4 +747,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.27.0-106.nightly
version: 7.28.0-108.nightly
6 changes: 3 additions & 3 deletions deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ spec:
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).
doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html.
See also the `proxyURL` fields.'
type: string
pluginRegistryCpuLimit:
Expand Down Expand Up @@ -672,7 +672,7 @@ spec:
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 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:
Expand Down Expand Up @@ -745,7 +745,7 @@ spec:
useInternalClusterSVCNames:
description: Use internal cluster SVC names to communicate between
components to speed up the traffic and avoid proxy issues. The
default value is `false`.
default value is `true`.
type: boolean
workspaceNamespaceDefault:
description: Defines Kubernetes default namespace in which user's
Expand Down
15 changes: 9 additions & 6 deletions pkg/apis/org/v1/che_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,9 @@ type CheClusterSpecServer struct {
GitSelfSignedCert bool `json:"gitSelfSignedCert"`
// Deprecated. Instructs the Operator to deploy Che in TLS mode. This is enabled by default. Disabling TLS sometimes cause malfunction of some Che components.
// +optional
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.displayName="TLS support"
// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.x-descriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
TlsSupport bool `json:"tlsSupport"`
// Use internal cluster SVC names to communicate between components to speed up the traffic and avoid proxy issues.
// The default value is `false`.
// The default value is `true`.
// +optional
UseInternalClusterSVCNames bool `json:"useInternalClusterSVCNames"`
// Public URL of the devfile registry, that serves sample, ready-to-use devfiles.
Expand Down Expand Up @@ -226,7 +223,7 @@ type CheClusterSpecServer struct {
// Only use 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.
// See the doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html. See also the `proxyPort` and `nonProxyHosts` fields.
// +optional
ProxyURL string `json:"proxyURL,omitempty"`
// Port of the proxy server. Only use when configuring a proxy is required. See also the `proxyURL` and `nonProxyHosts` fields.
Expand All @@ -236,7 +233,7 @@ type CheClusterSpecServer struct {
// Specify wild card domain use the following form `.<DOMAIN>` and `|` as delimiter, for example: `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 the doc https://docs.openshift.com/container-platform/4.4/networking/enable-cluster-wide-proxy.html. See also the `proxyURL` fields.
NonProxyHosts string `json:"nonProxyHosts,omitempty"`
// User name of the proxy server. Only use when configuring a proxy is required. See also the `proxyURL`, `proxyPassword` and `proxySecret` fields.
// +optional
Expand Down Expand Up @@ -592,9 +589,15 @@ type CheClusterStatus struct {
KeycloakURL string `json:"keycloakURL"`
// Public URL to the devfile registry.
// +optional
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors=true
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors.displayName="Devfile registry URL"
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors.x-descriptors="urn:alm:descriptor:org.w3:link"
DevfileRegistryURL string `json:"devfileRegistryURL"`
// Public URL to the plugin registry.
// +optional
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors=true
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors.displayName="Plugin registry URL"
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors.x-descriptors="urn:alm:descriptor:org.w3:link"
PluginRegistryURL string `json:"pluginRegistryURL"`
// A human readable message indicating details about why the Pod is in this condition.
// +optional
Expand Down