chore: Remove `spec.components.database` and `status.postgresVersion` fields (#1684)
* chore: Remove spec.components.database and status.postgresVersion fields Signed-off-by: Anatolii Bazko <abazko@redhat.com> --------- Signed-off-by: Anatolii Bazko <abazko@redhat.com>pull/1689/head
Anatolii Bazko
GitHub
parent
f1494e5ce7
commit
47d5ae3f05
|
|
@ -183,11 +183,6 @@ type CheClusterComponents struct {
|
|||
// Configuration settings related to the devfile registry used by the Che installation.
|
||||
// +optional
|
||||
DevfileRegistry DevfileRegistry `json:"devfileRegistry"`
|
||||
// Configuration settings related to the database used by the Che installation.
|
||||
// Database component is Deprecated. All properties will be ignored.
|
||||
// +optional
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:com.tectonic.ui:hidden"
|
||||
Database Database `json:"database"`
|
||||
// Configuration settings related to the dashboard used by the Che installation.
|
||||
// +optional
|
||||
Dashboard Dashboard `json:"dashboard"`
|
||||
|
|
@ -331,39 +326,6 @@ type DevfileRegistry struct {
|
|||
ExternalDevfileRegistries []ExternalDevfileRegistry `json:"externalDevfileRegistries,omitempty"`
|
||||
}
|
||||
|
||||
// Database component is Deprecated. All properties will be ignored.
|
||||
// Configuration settings related to the database used by the Che installation.
|
||||
// +k8s:openapi-gen=true
|
||||
type Database struct {
|
||||
// Instructs the Operator to deploy a dedicated database.
|
||||
// By default, a dedicated PostgreSQL database is deployed as part of the Che installation.
|
||||
// When `externalDb` is set as `true`, no dedicated database is deployed by the
|
||||
// Operator and you need to provide connection details about the external database you want to use.
|
||||
// +optional
|
||||
ExternalDb bool `json:"externalDb"`
|
||||
// Deployment override options.
|
||||
// +optional
|
||||
Deployment *Deployment `json:"deployment,omitempty"`
|
||||
// PostgreSQL database hostname that the Che server connects to.
|
||||
// Override this value only when using an external database. See field `externalDb`.
|
||||
// +optional
|
||||
PostgresHostName string `json:"postgresHostName,omitempty"`
|
||||
// PostgreSQL Database port the Che server connects to.
|
||||
// Override this value only when using an external database. See field `externalDb`.
|
||||
// +optional
|
||||
PostgresPort string `json:"postgresPort,omitempty"`
|
||||
// PostgreSQL database name that the Che server uses to connect to the database.
|
||||
// +optional
|
||||
PostgresDb string `json:"postgresDb,omitempty"`
|
||||
// The secret that contains PostgreSQL `user` and `password` that the Che server uses to connect to the database.
|
||||
// The secret must have a `app.kubernetes.io/part-of=che.eclipse.org` label.
|
||||
// +optional
|
||||
CredentialsSecretName string `json:"credentialsSecretName,omitempty"`
|
||||
// PVC settings for PostgreSQL database.
|
||||
// +optional
|
||||
Pvc *PVC `json:"pvc,omitempty"`
|
||||
}
|
||||
|
||||
// Che server metrics configuration
|
||||
type ServerMetrics struct {
|
||||
// Enables `metrics` for the Che server endpoint.
|
||||
|
|
@ -784,13 +746,6 @@ type CheClusterStatus struct {
|
|||
// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="Reason"
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors="urn:alm:descriptor:text"
|
||||
Reason string `json:"reason,omitempty"`
|
||||
// The PostgreSQL version of the image in use.
|
||||
// +optional
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=status
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=status,displayName="PostgreSQL version"
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors="urn:alm:descriptor:text"
|
||||
// +operator-sdk:csv:customresourcedefinitions:type=status,xDescriptors="urn:alm:descriptor:com.tectonic.ui:hidden"
|
||||
PostgresVersion string `json:"postgresVersion,omitempty"`
|
||||
// The resolved workspace base domain. This is either the copy of the explicitly defined property of the
|
||||
// same name in the spec or, if it is undefined in the spec and we're running on OpenShift, the automatically
|
||||
// resolved basedomain for routes.
|
||||
|
|
|
|||
|
|
@ -114,7 +114,6 @@ func (in *CheClusterComponents) DeepCopyInto(out *CheClusterComponents) {
|
|||
in.CheServer.DeepCopyInto(&out.CheServer)
|
||||
in.PluginRegistry.DeepCopyInto(&out.PluginRegistry)
|
||||
in.DevfileRegistry.DeepCopyInto(&out.DevfileRegistry)
|
||||
in.Database.DeepCopyInto(&out.Database)
|
||||
in.Dashboard.DeepCopyInto(&out.Dashboard)
|
||||
out.ImagePuller = in.ImagePuller
|
||||
out.Metrics = in.Metrics
|
||||
|
|
@ -503,31 +502,6 @@ func (in *DashboardHeaderMessage) DeepCopy() *DashboardHeaderMessage {
|
|||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *Database) DeepCopyInto(out *Database) {
|
||||
*out = *in
|
||||
if in.Deployment != nil {
|
||||
in, out := &in.Deployment, &out.Deployment
|
||||
*out = new(Deployment)
|
||||
(*in).DeepCopyInto(*out)
|
||||
}
|
||||
if in.Pvc != nil {
|
||||
in, out := &in.Pvc, &out.Pvc
|
||||
*out = new(PVC)
|
||||
**out = **in
|
||||
}
|
||||
}
|
||||
|
||||
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Database.
|
||||
func (in *Database) DeepCopy() *Database {
|
||||
if in == nil {
|
||||
return nil
|
||||
}
|
||||
out := new(Database)
|
||||
in.DeepCopyInto(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
||||
func (in *DefaultNamespace) DeepCopyInto(out *DefaultNamespace) {
|
||||
*out = *in
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ runTest() {
|
|||
chectl server:deploy \
|
||||
--batch \
|
||||
--platform minikube \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--k8spodwaittimeout=6000000 \
|
||||
--k8spodreadytimeout=6000000 \
|
||||
--che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml"
|
||||
|
||||
# Read OIDC configuration
|
||||
|
|
|
|||
|
|
@ -33,11 +33,9 @@ runTest() {
|
|||
chectl server:deploy \
|
||||
--batch \
|
||||
--platform minikube \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--k8spodwaittimeout=6000000 \
|
||||
--k8spodreadytimeout=6000000 \
|
||||
--templates "${CURRENT_OPERATOR_VERSION_TEMPLATE_PATH}" \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml"
|
||||
|
||||
make wait-devworkspace-running NAMESPACE="devworkspace-controller" VERBOSE=1
|
||||
|
|
|
|||
|
|
@ -30,11 +30,9 @@ runTest() {
|
|||
chectl server:deploy \
|
||||
--batch \
|
||||
--platform minikube \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--k8spodwaittimeout=6000000 \
|
||||
--k8spodreadytimeout=6000000 \
|
||||
--templates ${LAST_OPERATOR_VERSION_TEMPLATE_PATH} \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml"
|
||||
|
||||
createDevWorkspace
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ runTest() {
|
|||
--batch \
|
||||
--platform minikube \
|
||||
--templates ${PREVIOUS_OPERATOR_VERSION_TEMPLATE_PATH} \
|
||||
--k8spodwaittimeout=120000 \
|
||||
--k8spodreadytimeout=120000 \
|
||||
--k8spodwaittimeout=6000000 \
|
||||
--k8spodreadytimeout=6000000 \
|
||||
--che-operator-cr-patch-yaml "${OPERATOR_REPO}/build/scripts/minikube-tests/minikube-checluster-patch.yaml"
|
||||
|
||||
createDevWorkspace
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ metadata:
|
|||
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
|
||||
repository: https://github.com/eclipse-che/che-operator
|
||||
support: Eclipse Foundation
|
||||
name: eclipse-che.v7.67.0-792.next
|
||||
name: eclipse-che.v7.68.0-793.next
|
||||
namespace: placeholder
|
||||
spec:
|
||||
apiservicedefinitions: {}
|
||||
|
|
@ -141,13 +141,6 @@ spec:
|
|||
images.
|
||||
displayName: Container registry
|
||||
path: containerRegistry
|
||||
- description: Configuration settings related to the database used by the
|
||||
Che installation. Database component is Deprecated. All properties will
|
||||
be ignored.
|
||||
displayName: Database
|
||||
path: components.database
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:hidden
|
||||
- description: Enables users to work with repositories hosted on Azure DevOps
|
||||
Service (dev.azure.com).
|
||||
displayName: Azure
|
||||
|
|
@ -227,12 +220,6 @@ spec:
|
|||
path: pluginRegistryURL
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:org.w3:link
|
||||
- description: The PostgreSQL version of the image in use.
|
||||
displayName: PostgreSQL version
|
||||
path: postgresVersion
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:text
|
||||
- urn:alm:descriptor:com.tectonic.ui:hidden
|
||||
- description: A brief CamelCase message indicating details about why the
|
||||
Che deployment is in the current phase.
|
||||
displayName: Reason
|
||||
|
|
@ -1242,7 +1229,7 @@ spec:
|
|||
minKubeVersion: 1.19.0
|
||||
provider:
|
||||
name: Eclipse Foundation
|
||||
version: 7.67.0-792.next
|
||||
version: 7.68.0-793.next
|
||||
webhookdefinitions:
|
||||
- admissionReviewVersions:
|
||||
- v1
|
||||
|
|
|
|||
|
|
@ -4609,283 +4609,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database
|
||||
used by the Che installation. Database component is Deprecated.
|
||||
All properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user`
|
||||
and `password` that the Che server uses to connect to
|
||||
the database. The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to
|
||||
set in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container
|
||||
and any service environment variables.
|
||||
If a variable cannot be resolved, the
|
||||
reference in the input string will be
|
||||
unchanged. Double $$ are reduced to a
|
||||
single $, which allows for escaping the
|
||||
$(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
|
||||
will produce the string literal "$(VAR_NAME)".
|
||||
Escaped references will never be expanded,
|
||||
regardless of whether the variable exists
|
||||
or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment
|
||||
variable's value. Cannot be used if value
|
||||
is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields.
|
||||
apiVersion, kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the
|
||||
ConfigMap or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the
|
||||
pod: supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of
|
||||
the container: only resources limits
|
||||
and requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env
|
||||
vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource
|
||||
to select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields.
|
||||
apiVersion, kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the
|
||||
Secret or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave
|
||||
it empty to use the default container image
|
||||
provided by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value
|
||||
is `Always` for `nightly`, `next` or `latest`
|
||||
images, and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount
|
||||
of compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5
|
||||
cores) If the value is not specified,
|
||||
then the default value is set depending
|
||||
on the component. If value is `0`, then
|
||||
no value is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi
|
||||
= 500GiB = 500 * 1024 * 1024 * 1024)
|
||||
If the value is not specified, then
|
||||
the default value is set depending on
|
||||
the component. If value is `0`, then
|
||||
no value is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount
|
||||
of compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5
|
||||
cores) If the value is not specified,
|
||||
then the default value is set depending
|
||||
on the component. If value is `0`, then
|
||||
no value is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi
|
||||
= 500GiB = 500 * 1024 * 1024 * 1024)
|
||||
If the value is not specified, then
|
||||
the default value is set depending on
|
||||
the component. If value is `0`, then
|
||||
no value is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value
|
||||
is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database
|
||||
is deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by
|
||||
the Operator and you need to provide connection details
|
||||
about the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update
|
||||
the claim size, the storage class that provisions
|
||||
it must support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume
|
||||
Claim. When omitted or left blank, a default storage
|
||||
class is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7943,9 +7666,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about
|
||||
why the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -4474,280 +4474,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7729,9 +7455,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -88,12 +88,6 @@ spec:
|
|||
- description: Configuration of an alternative registry that stores Che images.
|
||||
displayName: Container registry
|
||||
path: containerRegistry
|
||||
- description: Configuration settings related to the database used by the Che
|
||||
installation. Database component is Deprecated. All properties will be ignored.
|
||||
displayName: Database
|
||||
path: components.database
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:com.tectonic.ui:hidden
|
||||
- description: Enables users to work with repositories hosted on Azure DevOps
|
||||
Service (dev.azure.com).
|
||||
displayName: Azure
|
||||
|
|
@ -173,12 +167,6 @@ spec:
|
|||
path: pluginRegistryURL
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:org.w3:link
|
||||
- description: The PostgreSQL version of the image in use.
|
||||
displayName: PostgreSQL version
|
||||
path: postgresVersion
|
||||
x-descriptors:
|
||||
- urn:alm:descriptor:text
|
||||
- urn:alm:descriptor:com.tectonic.ui:hidden
|
||||
- description: A brief CamelCase message indicating details about why the Che
|
||||
deployment is in the current phase.
|
||||
displayName: Reason
|
||||
|
|
|
|||
|
|
@ -4493,280 +4493,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7748,9 +7474,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -4488,280 +4488,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7743,9 +7469,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -4493,280 +4493,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7748,9 +7474,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -4488,280 +4488,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7743,9 +7469,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -4488,280 +4488,6 @@ spec:
|
|||
type: string
|
||||
type: object
|
||||
type: object
|
||||
database:
|
||||
description: Configuration settings related to the database used
|
||||
by the Che installation. Database component is Deprecated. All
|
||||
properties will be ignored.
|
||||
properties:
|
||||
credentialsSecretName:
|
||||
description: The secret that contains PostgreSQL `user` and
|
||||
`password` that the Che server uses to connect to the database.
|
||||
The secret must have a `app.kubernetes.io/part-of=che.eclipse.org`
|
||||
label.
|
||||
type: string
|
||||
deployment:
|
||||
description: Deployment override options.
|
||||
properties:
|
||||
containers:
|
||||
description: List of containers belonging to the pod.
|
||||
items:
|
||||
description: Container custom settings.
|
||||
properties:
|
||||
env:
|
||||
description: List of environment variables to set
|
||||
in the container.
|
||||
items:
|
||||
description: EnvVar represents an environment
|
||||
variable present in a Container.
|
||||
properties:
|
||||
name:
|
||||
description: Name of the environment variable.
|
||||
Must be a C_IDENTIFIER.
|
||||
type: string
|
||||
value:
|
||||
description: 'Variable references $(VAR_NAME)
|
||||
are expanded using the previously defined
|
||||
environment variables in the container and
|
||||
any service environment variables. If a
|
||||
variable cannot be resolved, the reference
|
||||
in the input string will be unchanged. Double
|
||||
$$ are reduced to a single $, which allows
|
||||
for escaping the $(VAR_NAME) syntax: i.e.
|
||||
"$$(VAR_NAME)" will produce the string literal
|
||||
"$(VAR_NAME)". Escaped references will never
|
||||
be expanded, regardless of whether the variable
|
||||
exists or not. Defaults to "".'
|
||||
type: string
|
||||
valueFrom:
|
||||
description: Source for the environment variable's
|
||||
value. Cannot be used if value is not empty.
|
||||
properties:
|
||||
configMapKeyRef:
|
||||
description: Selects a key of a ConfigMap.
|
||||
properties:
|
||||
key:
|
||||
description: The key to select.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the ConfigMap
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
fieldRef:
|
||||
description: 'Selects a field of the pod:
|
||||
supports metadata.name, metadata.namespace,
|
||||
`metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
|
||||
spec.nodeName, spec.serviceAccountName,
|
||||
status.hostIP, status.podIP, status.podIPs.'
|
||||
properties:
|
||||
apiVersion:
|
||||
description: Version of the schema
|
||||
the FieldPath is written in terms
|
||||
of, defaults to "v1".
|
||||
type: string
|
||||
fieldPath:
|
||||
description: Path of the field to
|
||||
select in the specified API version.
|
||||
type: string
|
||||
required:
|
||||
- fieldPath
|
||||
type: object
|
||||
resourceFieldRef:
|
||||
description: 'Selects a resource of the
|
||||
container: only resources limits and
|
||||
requests (limits.cpu, limits.memory,
|
||||
limits.ephemeral-storage, requests.cpu,
|
||||
requests.memory and requests.ephemeral-storage)
|
||||
are currently supported.'
|
||||
properties:
|
||||
containerName:
|
||||
description: 'Container name: required
|
||||
for volumes, optional for env vars'
|
||||
type: string
|
||||
divisor:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Specifies the output
|
||||
format of the exposed resources,
|
||||
defaults to "1"
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
resource:
|
||||
description: 'Required: resource to
|
||||
select'
|
||||
type: string
|
||||
required:
|
||||
- resource
|
||||
type: object
|
||||
secretKeyRef:
|
||||
description: Selects a key of a secret
|
||||
in the pod's namespace
|
||||
properties:
|
||||
key:
|
||||
description: The key of the secret
|
||||
to select from. Must be a valid
|
||||
secret key.
|
||||
type: string
|
||||
name:
|
||||
description: 'Name of the referent.
|
||||
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||
TODO: Add other useful fields. apiVersion,
|
||||
kind, uid?'
|
||||
type: string
|
||||
optional:
|
||||
description: Specify whether the Secret
|
||||
or its key must be defined
|
||||
type: boolean
|
||||
required:
|
||||
- key
|
||||
type: object
|
||||
type: object
|
||||
required:
|
||||
- name
|
||||
type: object
|
||||
type: array
|
||||
image:
|
||||
description: Container image. Omit it or leave it
|
||||
empty to use the default container image provided
|
||||
by the Operator.
|
||||
type: string
|
||||
imagePullPolicy:
|
||||
description: Image pull policy. Default value is
|
||||
`Always` for `nightly`, `next` or `latest` images,
|
||||
and `IfNotPresent` in other cases.
|
||||
enum:
|
||||
- Always
|
||||
- IfNotPresent
|
||||
- Never
|
||||
type: string
|
||||
name:
|
||||
description: Container name.
|
||||
type: string
|
||||
resources:
|
||||
description: Compute resources required by this
|
||||
container.
|
||||
properties:
|
||||
limits:
|
||||
description: Describes the maximum amount of
|
||||
compute resources allowed.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
request:
|
||||
description: Describes the minimum amount of
|
||||
compute resources required.
|
||||
properties:
|
||||
cpu:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: CPU, in cores. (500m = .5 cores)
|
||||
If the value is not specified, then the
|
||||
default value is set depending on the
|
||||
component. If value is `0`, then no value
|
||||
is set for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
memory:
|
||||
anyOf:
|
||||
- type: integer
|
||||
- type: string
|
||||
description: Memory, in bytes. (500Gi =
|
||||
500GiB = 500 * 1024 * 1024 * 1024) If
|
||||
the value is not specified, then the default
|
||||
value is set depending on the component.
|
||||
If value is `0`, then no value is set
|
||||
for the component.
|
||||
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
|
||||
x-kubernetes-int-or-string: true
|
||||
type: object
|
||||
type: object
|
||||
type: object
|
||||
type: array
|
||||
securityContext:
|
||||
description: Security options the pod should run with.
|
||||
properties:
|
||||
fsGroup:
|
||||
description: A special supplemental group that applies
|
||||
to all containers in a pod. The default value is
|
||||
`1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
runAsUser:
|
||||
description: The UID to run the entrypoint of the
|
||||
container process. The default value is `1724`.
|
||||
format: int64
|
||||
type: integer
|
||||
type: object
|
||||
type: object
|
||||
externalDb:
|
||||
description: Instructs the Operator to deploy a dedicated
|
||||
database. By default, a dedicated PostgreSQL database is
|
||||
deployed as part of the Che installation. When `externalDb`
|
||||
is set as `true`, no dedicated database is deployed by the
|
||||
Operator and you need to provide connection details about
|
||||
the external database you want to use.
|
||||
type: boolean
|
||||
postgresDb:
|
||||
description: PostgreSQL database name that the Che server
|
||||
uses to connect to the database.
|
||||
type: string
|
||||
postgresHostName:
|
||||
description: PostgreSQL database hostname that the Che server
|
||||
connects to. Override this value only when using an external
|
||||
database. See field `externalDb`.
|
||||
type: string
|
||||
postgresPort:
|
||||
description: PostgreSQL Database port the Che server connects
|
||||
to. Override this value only when using an external database.
|
||||
See field `externalDb`.
|
||||
type: string
|
||||
pvc:
|
||||
description: PVC settings for PostgreSQL database.
|
||||
properties:
|
||||
claimSize:
|
||||
description: Persistent Volume Claim size. To update the
|
||||
claim size, the storage class that provisions it must
|
||||
support resizing.
|
||||
type: string
|
||||
storageClass:
|
||||
description: Storage class for the Persistent Volume Claim.
|
||||
When omitted or left blank, a default storage class
|
||||
is used.
|
||||
type: string
|
||||
type: object
|
||||
type: object
|
||||
devWorkspace:
|
||||
description: DevWorkspace Operator configuration.
|
||||
properties:
|
||||
|
|
@ -7743,9 +7469,6 @@ spec:
|
|||
pluginRegistryURL:
|
||||
description: The public URL of the internal plug-in registry.
|
||||
type: string
|
||||
postgresVersion:
|
||||
description: The PostgreSQL version of the image in use.
|
||||
type: string
|
||||
reason:
|
||||
description: A brief CamelCase message indicating details about why
|
||||
the Che deployment is in the current phase.
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ package postgres
|
|||
|
||||
import (
|
||||
"github.com/eclipse-che/che-operator/pkg/common/chetypes"
|
||||
"github.com/eclipse-che/che-operator/pkg/common/utils"
|
||||
"github.com/eclipse-che/che-operator/pkg/deploy"
|
||||
appsv1 "k8s.io/api/apps/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
|
|
@ -41,7 +40,6 @@ func (p *PostgresReconciler) Reconcile(ctx *chetypes.DeployContext) (reconcile.R
|
|||
_, _ = p.syncPVC(ctx)
|
||||
_, _ = p.syncCredentials(ctx)
|
||||
_, _ = p.syncService(ctx)
|
||||
_, _ = p.setDbVersion(ctx)
|
||||
|
||||
// Backup server component is not used anymore
|
||||
_, _ = p.syncBackupDeployment(ctx)
|
||||
|
|
@ -65,17 +63,8 @@ func (p *PostgresReconciler) syncDeployment(ctx *chetypes.DeployContext) (bool,
|
|||
return deploy.DeleteNamespacedObject(ctx, postgresComponentName, &appsv1.Deployment{})
|
||||
}
|
||||
|
||||
func (p *PostgresReconciler) setDbVersion(ctx *chetypes.DeployContext) (bool, error) {
|
||||
if ctx.CheCluster.Status.PostgresVersion != "" {
|
||||
ctx.CheCluster.Status.PostgresVersion = ""
|
||||
_ = deploy.UpdateCheCRStatus(ctx, "postgresVersion", ctx.CheCluster.Status.PostgresVersion)
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
func (p *PostgresReconciler) syncCredentials(ctx *chetypes.DeployContext) (bool, error) {
|
||||
postgresCredentialsSecretName := utils.GetValue(ctx.CheCluster.Spec.Components.Database.CredentialsSecretName, defaultPostgresCredentialsSecret)
|
||||
return deploy.DeleteNamespacedObject(ctx, postgresCredentialsSecretName, &corev1.Secret{})
|
||||
return deploy.DeleteNamespacedObject(ctx, defaultPostgresCredentialsSecret, &corev1.Secret{})
|
||||
}
|
||||
|
||||
func (p *PostgresReconciler) syncBackupDeployment(ctx *chetypes.DeployContext) (bool, error) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue