Skip to content

Commit

Permalink
Implements eclipse-che/che#19449.
Browse files Browse the repository at this point in the history 
Defines a new version of the CheCluster custom resource and implements
conversion functions that are going to be used by a conversion webhook
(not yet implemented).
  • Loading branch information
@metlos
metlos committed May 7, 2021
1 parent 2b9aac5 commit 94fb62d
Show file tree
Hide file tree
Showing 14 changed files with 2,251 additions and 876 deletions.
1,870 changes: 1,000 additions & 870 deletions deploy/crds/org_v1_che_crd-v1beta1.yaml
View file

Large diffs are not rendered by default.

119 changes: 119 additions & 0 deletions deploy/crds/org_v1_che_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,3 +913,122 @@ spec:
storage: true
subresources:
status: {}
- name: v2alpha1
schema:
openAPIV3Schema:
description: CheCluster is the configuration of the CheCluster layer of Devworkspace.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: CheClusterSpec holds the configuration of the Che controller.
properties:
gateway:
description: Gateway contains the configuration of the gateway used
for workspace endpoint routing.
properties:
configurerImage:
description: ConfigurerImage is the docker image to use for the
sidecar of the Che gateway that is used to configure it. This
is only used when Enabled is true. If not defined in the CR,
it is taken from the `RELATED_IMAGE_gateway_configurer` environment
variable of the operator deployment/pod. If not defined there,
it defaults to a hardcoded value.
type: string
enabled:
description: "Enabled enables or disables routing of the url rewrite
supporting devworkspace endpoints through a common gateway (the
hostname of which is defined by the Host).
Default value
is \"true\" meaning that the gateway is enabled.
If set to
true (i.e. the gateway is enabled), endpoints marked using the
\"urlRewriteSupported\" attribute are exposed on unique subpaths
of the Host, while the rest of the devworkspace endpoints are
exposed on subdomains of the Host.
If set to false (i.e.
the gateway is disabled), all endpoints are deployed on subdomains
of the Host."
type: boolean
image:
description: Image is the docker image to use for the Che gateway. This
is only used if Enabled is true. If not defined in the CR, it
is taken from the `RELATED_IMAGE_gateway` environment variable
of the operator deployment/pod. If not defined there, it defaults
to a hardcoded value.
type: string
type: object
host:
description: "Host is the full host name used to expose devworkspace
endpoints either on subpaths or on subdomains. See the gateway.enabled
attribute for a more detailed description of where and how are devworkspace
endpoints exposed in various configurations.
This attribute is
mandatory on Kubernetes, optional on OpenShift."
type: string
k8s:
description: K8s contains the configuration specific only to Kubernetes
properties:
ingressAnnotations:
additionalProperties:
type: string
description: "IngressAnnotations are the annotations to be put
on the generated ingresses. This can be used to configure the
ingress class and the ingress-controller-specific behavior for
both the gateway and the ingresses created to expose the Devworkspace
component endpoints. When not specified, this defaults to:
\ kubernetes.io/ingress.class: \"nginx\"
\ nginx.ingress.kubernetes.io/proxy-read-timeout: \"3600\",
\ nginx.ingress.kubernetes.io/proxy-connect-timeout: \"3600\",
\ nginx.ingress.kubernetes.io/ssl-redirect: \"true\""
type: object
type: object
tlsSecretName:
description: "Name of a secret that will be used to setup ingress/route
TLS certificate. When the field is empty string, the default cluster
certificate will be used. The same secret is assumed to exist in
the same namespace as the CheCluster CR and is used for both the
gateway and all devworkspace endpoints. In case of the devworkspace
endpoints, the secret is copied to the namespace of the devworkspace.
The secret has to be of type \"tls\"."
type: string
type: object
status:
description: CheClusterStatus contains the status of the CheCluster object
properties:
gatewayHost:
description: ResolvedHost is the resolved host of the ingress/route.
This is equal to the Host in the spec on Kubernetes but contains
the actual host name of the route if Host is unspecified on OpenShift.
type: string
gatewayPhase:
description: GatewayPhase specifies the phase in which the gateway
deployment currently is. If the gateway is disabled, the phase is
"Inactive".
type: string
message:
description: Message contains further human-readable info for why
the Che cluster is in the phase it currently is.
type: string
phase:
description: Phase is the phase in which the Che cluster as a whole
finds itself in.
type: string
type: object
type: object
served: true
storage: false
subresources:
status: {}
10 changes: 7 additions & 3 deletions .../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-05-06T14:33:11Z"
createdAt: "2021-05-07T12:19:30Z"
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/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.30.0-174.nightly
name: eclipse-che-preview-kubernetes.v7.30.0-176.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -152,6 +152,10 @@ spec:
- urn:alm:descriptor:io.kubernetes.phase:reason
- urn:alm:descriptor:text
version: v1
- description: CheCluster is the configuration of the CheCluster layer of Devworkspace.
kind: CheCluster
name: checlusters.org.eclipse.che
version: v2alpha1
description: |
A collaborative Kubernetes-native development solution that delivers Kubernetes workspaces and in-browser IDE for rapid cloud application development.
This operator installs PostgreSQL, Keycloak, Registries and the Eclipse Che server, as well as configures all these services.
Expand Down Expand Up @@ -1127,4 +1131,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.30.0-174.nightly
version: 7.30.0-176.nightly
119 changes: 119 additions & 0 deletions deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -913,3 +913,122 @@ spec:
storage: true
subresources:
status: {}
- name: v2alpha1
schema:
openAPIV3Schema:
description: CheCluster is the configuration of the CheCluster layer of Devworkspace.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: CheClusterSpec holds the configuration of the Che controller.
properties:
gateway:
description: Gateway contains the configuration of the gateway used
for workspace endpoint routing.
properties:
configurerImage:
description: ConfigurerImage is the docker image to use for the
sidecar of the Che gateway that is used to configure it. This
is only used when Enabled is true. If not defined in the CR,
it is taken from the `RELATED_IMAGE_gateway_configurer` environment
variable of the operator deployment/pod. If not defined there,
it defaults to a hardcoded value.
type: string
enabled:
description: "Enabled enables or disables routing of the url rewrite
supporting devworkspace endpoints through a common gateway (the
hostname of which is defined by the Host).
Default value
is \"true\" meaning that the gateway is enabled.
If set to
true (i.e. the gateway is enabled), endpoints marked using the
\"urlRewriteSupported\" attribute are exposed on unique subpaths
of the Host, while the rest of the devworkspace endpoints are
exposed on subdomains of the Host.
If set to false (i.e.
the gateway is disabled), all endpoints are deployed on subdomains
of the Host."
type: boolean
image:
description: Image is the docker image to use for the Che gateway. This
is only used if Enabled is true. If not defined in the CR, it
is taken from the `RELATED_IMAGE_gateway` environment variable
of the operator deployment/pod. If not defined there, it defaults
to a hardcoded value.
type: string
type: object
host:
description: "Host is the full host name used to expose devworkspace
endpoints either on subpaths or on subdomains. See the gateway.enabled
attribute for a more detailed description of where and how are devworkspace
endpoints exposed in various configurations.
This attribute is
mandatory on Kubernetes, optional on OpenShift."
type: string
k8s:
description: K8s contains the configuration specific only to Kubernetes
properties:
ingressAnnotations:
additionalProperties:
type: string
description: "IngressAnnotations are the annotations to be put
on the generated ingresses. This can be used to configure the
ingress class and the ingress-controller-specific behavior for
both the gateway and the ingresses created to expose the Devworkspace
component endpoints. When not specified, this defaults to:
\ kubernetes.io/ingress.class: \"nginx\"
\ nginx.ingress.kubernetes.io/proxy-read-timeout: \"3600\",
\ nginx.ingress.kubernetes.io/proxy-connect-timeout: \"3600\",
\ nginx.ingress.kubernetes.io/ssl-redirect: \"true\""
type: object
type: object
tlsSecretName:
description: "Name of a secret that will be used to setup ingress/route
TLS certificate. When the field is empty string, the default cluster
certificate will be used. The same secret is assumed to exist in
the same namespace as the CheCluster CR and is used for both the
gateway and all devworkspace endpoints. In case of the devworkspace
endpoints, the secret is copied to the namespace of the devworkspace.
The secret has to be of type \"tls\"."
type: string
type: object
status:
description: CheClusterStatus contains the status of the CheCluster object
properties:
gatewayHost:
description: ResolvedHost is the resolved host of the ingress/route.
This is equal to the Host in the spec on Kubernetes but contains
the actual host name of the route if Host is unspecified on OpenShift.
type: string
gatewayPhase:
description: GatewayPhase specifies the phase in which the gateway
deployment currently is. If the gateway is disabled, the phase is
"Inactive".
type: string
message:
description: Message contains further human-readable info for why
the Che cluster is in the phase it currently is.
type: string
phase:
description: Phase is the phase in which the Che cluster as a whole
finds itself in.
type: string
type: object
type: object
served: true
storage: false
subresources:
status: {}
10 changes: 7 additions & 3 deletions ...g/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ metadata:
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-05-06T14:33:21Z"
createdAt: "2021-05-07T12:19:41Z"
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/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.30.0-174.nightly
name: eclipse-che-preview-openshift.v7.30.0-176.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -143,6 +143,10 @@ spec:
- urn:alm:descriptor:io.kubernetes.phase:reason
- urn:alm:descriptor:text
version: v1
- description: CheCluster is the configuration of the CheCluster layer of Devworkspace.
kind: CheCluster
name: checlusters.org.eclipse.che
version: v2alpha1
description: |
A collaborative Kubernetes-native development solution that delivers OpenShift workspaces and in-browser IDE for rapid cloud application development.
This operator installs PostgreSQL, Keycloak, and the Eclipse Che server, as well as configures all three services.
Expand Down Expand Up @@ -1200,4 +1204,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.30.0-174.nightly
version: 7.30.0-176.nightly
Loading

0 comments on commit 94fb62d

Please sign in to comment.