seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some crd typos. (#678) 

* Fix some typos.

Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
pull/679/head
Oleksandr Andriienko 2021-02-16 10:08:00 +02:00 committed by GitHub
parent 2f5ec20453
commit 5f2b348932
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -93,7 +93,7 @@ $ olm/update-nightly-bundle.sh
3. Build catalog source and bundle images:
```bash
$ olm/buildAndPushInitialBundle.sh <openshift|kubernentes>
$ olm/buildAndPushInitialBundle.sh <openshift|kubernetes>
```
4. Create a custom catalog source yaml (update strategy is workaround for https://github.com/operator-framework/operator-lifecycle-manager/issues/903):
@ -105,7 +105,7 @@ metadata:
name: eclipse-che-preview-custom
namespace: che-namespace
spec:
image: <IMAGE_REGISTRY_HOST>/<IMAGE_REGISTRY_USER_NAME>/eclipse-che-<openshift|kubernentes>-opm-catalog:preview
image: <IMAGE_REGISTRY_HOST>/<IMAGE_REGISTRY_USER_NAME>/eclipse-che-<openshift|kubernetes>-opm-catalog:preview
sourceType: grpc
updateStrategy:
registryPoll:
@ -115,7 +115,7 @@ spec:
5. Deploy Che operator:
```bash
$ chectl server:deploy --installer=olm --platform=<PLATFORM> --catalog-source-yaml <PATH_TO_CUSTOM_CATALOG_SOURCE_YAML> --olm-channel=nightly --package-manifest-name=eclipse-che-preview-<openshift|kubernentes>
$ chectl server:deploy --installer=olm --platform=<PLATFORM> --catalog-source-yaml <PATH_TO_CUSTOM_CATALOG_SOURCE_YAML> --olm-channel=nightly --package-manifest-name=eclipse-che-preview-<openshift|kubernetes>
```
### Deploy Che operator using bash script

12
deploy/crds/org_v1_che_crd.yaml
View File

@ -272,7 +272,7 @@ spec:
it will be automatically set by the Operator.
type: string
chePostgresSecret:
description: 'The secret that contains PosgreSQL`user` and `password`
description: 'The secret that contains PostgreSQL`user` and `password`
that the Che server uses to connect to the DB. When the secret
is defined, the `chePostgresUser` and `chePostgresPassword` are
ignored. When the value is omitted or left blank, the one of following
@ -295,12 +295,12 @@ spec:
are about to use. See also all the fields starting with: `chePostgres`.'
type: boolean
postgresImage:
description: Overrides the container image used in the PosgreSQL
description: Overrides the container image used in the PostgreSQL
database deployment. This includes the image tag. Omit it or leave
it empty to use the default container image provided by the Operator.
type: string
postgresImagePullPolicy:
description: Overrides the image pull policy used in the PosgreSQL
description: Overrides the image pull policy used in the PostgreSQL
database deployment. Default value is `Always` for `nightly` or
`latest` images, and `IfNotPresent` in other cases.
type: string
@ -760,7 +760,7 @@ spec:
properties:
postgresPVCStorageClassName:
description: Storage class for the Persistent Volume Claim dedicated
to the PosgreSQL database. When omitted or left blank, a default
to the PostgreSQL database. When omitted or left blank, a default
storage class is used.
type: string
preCreateSubPaths:
@ -807,8 +807,8 @@ spec:
type: string
dbProvisioned:
description: Indicates that a PostgreSQL instance has been correctly
provisioned or not. Indicates that a PosgreSQL instance has been correctly
provisioned or not.
provisioned or not. Indicates that a PostgreSQL instance has been
correctly provisioned or not.
type: boolean
devfileRegistryURL:
description: Public URL to the devfile registry.

6
deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
View File

@ -85,13 +85,13 @@ metadata:
categories: Developer Tools
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-02-12T13:14:54Z"
createdAt: "2021-02-15T16:16:52Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-kubernetes.v7.27.0-100.nightly
name: eclipse-che-preview-kubernetes.v7.27.0-102.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -685,4 +685,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.27.0-100.nightly
version: 7.27.0-102.nightly

12
deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml
View File

@ -272,7 +272,7 @@ spec:
it will be automatically set by the Operator.
type: string
chePostgresSecret:
description: 'The secret that contains PosgreSQL`user` and `password`
description: 'The secret that contains PostgreSQL`user` and `password`
that the Che server uses to connect to the DB. When the secret
is defined, the `chePostgresUser` and `chePostgresPassword` are
ignored. When the value is omitted or left blank, the one of following
@ -295,12 +295,12 @@ spec:
are about to use. See also all the fields starting with: `chePostgres`.'
type: boolean
postgresImage:
description: Overrides the container image used in the PosgreSQL
description: Overrides the container image used in the PostgreSQL
database deployment. This includes the image tag. Omit it or leave
it empty to use the default container image provided by the Operator.
type: string
postgresImagePullPolicy:
description: Overrides the image pull policy used in the PosgreSQL
description: Overrides the image pull policy used in the PostgreSQL
database deployment. Default value is `Always` for `nightly` or
`latest` images, and `IfNotPresent` in other cases.
type: string
@ -760,7 +760,7 @@ spec:
properties:
postgresPVCStorageClassName:
description: Storage class for the Persistent Volume Claim dedicated
to the PosgreSQL database. When omitted or left blank, a default
to the PostgreSQL database. When omitted or left blank, a default
storage class is used.
type: string
preCreateSubPaths:
@ -807,8 +807,8 @@ spec:
type: string
dbProvisioned:
description: Indicates that a PostgreSQL instance has been correctly
provisioned or not. Indicates that a PosgreSQL instance has been correctly
provisioned or not.
provisioned or not. Indicates that a PostgreSQL instance has been
correctly provisioned or not.
type: boolean
devfileRegistryURL:
description: Public URL to the devfile registry.

6
deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
View File

@ -76,13 +76,13 @@ metadata:
categories: Developer Tools, OpenShift Optional
certified: "false"
containerImage: quay.io/eclipse/che-operator:nightly
createdAt: "2021-02-12T13:15:01Z"
createdAt: "2021-02-15T16:16:59Z"
description: A Kube-native development solution that delivers portable and collaborative
developer workspaces in OpenShift.
operatorframework.io/suggested-namespace: eclipse-che
repository: https://github.com/eclipse/che-operator
support: Eclipse Foundation
name: eclipse-che-preview-openshift.v7.27.0-100.nightly
name: eclipse-che-preview-openshift.v7.27.0-102.nightly
namespace: placeholder
spec:
apiservicedefinitions: {}
@ -757,4 +757,4 @@ spec:
maturity: stable
provider:
name: Eclipse Foundation
version: 7.27.0-100.nightly
version: 7.27.0-102.nightly

12
deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml
View File

@ -273,7 +273,7 @@ spec:
it will be automatically set by the Operator.
type: string
chePostgresSecret:
description: 'The secret that contains PosgreSQL`user` and `password`
description: 'The secret that contains PostgreSQL`user` and `password`
that the Che server uses to connect to the DB. When the secret
is defined, the `chePostgresUser` and `chePostgresPassword` are
ignored. When the value is omitted or left blank, the one of following
@ -296,12 +296,12 @@ spec:
are about to use. See also all the fields starting with: `chePostgres`.'
type: boolean
postgresImage:
description: Overrides the container image used in the PosgreSQL
description: Overrides the container image used in the PostgreSQL
database deployment. This includes the image tag. Omit it or leave
it empty to use the default container image provided by the Operator.
type: string
postgresImagePullPolicy:
description: Overrides the image pull policy used in the PosgreSQL
description: Overrides the image pull policy used in the PostgreSQL
database deployment. Default value is `Always` for `nightly` or
`latest` images, and `IfNotPresent` in other cases.
type: string
@ -761,7 +761,7 @@ spec:
properties:
postgresPVCStorageClassName:
description: Storage class for the Persistent Volume Claim dedicated
to the PosgreSQL database. When omitted or left blank, a default
to the PostgreSQL database. When omitted or left blank, a default
storage class is used.
type: string
preCreateSubPaths:
@ -808,8 +808,8 @@ spec:
type: string
dbProvisioned:
description: Indicates that a PostgreSQL instance has been correctly
provisioned or not. Indicates that a PosgreSQL instance has been correctly
provisioned or not.
provisioned or not. Indicates that a PostgreSQL instance has been
correctly provisioned or not.
type: boolean
devfileRegistryURL:
description: Public URL to the devfile registry.

2
olm/README.md
View File

@ -69,7 +69,7 @@ with your latest development changes and use it in the test scripts. To build th
```bash
$ export IMAGE_REGISTRY_USER_NAME=<IMAGE_REGISTRY_USER_NAME> && \
export IMAGE_REGISTRY_HOST=<IMAGE_REGISTRY_HOST> && \
./buildAndPushInitialBundle.sh <openshift|kubernentes> [FROM-INDEX-IMAGE]
./buildAndPushInitialBundle.sh <openshift|kubernetes> [FROM-INDEX-IMAGE]
```
This script will build and push for you two images: CatalogSource(index) and bundle one:

10
pkg/apis/org/v1/che_types.go
View File

@ -313,7 +313,7 @@ type CheClusterSpecDB struct {
// PostgreSQL database name that the Che server uses to connect to the DB. Defaults to `dbche`.
// +optional
ChePostgresDb string `json:"chePostgresDb,omitempty"`
// The secret that contains PosgreSQL`user` and `password` that the Che server uses to connect to the DB.
// The secret that contains PostgreSQL`user` and `password` that the Che server uses to connect to the DB.
// When the secret is defined, the `chePostgresUser` and `chePostgresPassword` are ignored.
// When the value is omitted or left blank, the one of following scenarios applies:
// 1. `chePostgresUser` and `chePostgresPassword` are defined, then they will be used to connect to the DB.
@ -321,10 +321,10 @@ type CheClusterSpecDB struct {
// will be created with default value of `pgche` for `user` and with an auto-generated value for `password`.
// +optional
ChePostgresSecret string `json:"chePostgresSecret,omitempty"`
// Overrides the container image used in the PosgreSQL database deployment. This includes the image tag. Omit it or leave it empty to use the default container image provided by the Operator.
// Overrides the container image used in the PostgreSQL database deployment. This includes the image tag. Omit it or leave it empty to use the default container image provided by the Operator.
// +optional
PostgresImage string `json:"postgresImage,omitempty"`
// Overrides the image pull policy used in the PosgreSQL database deployment. Default value is `Always` for `nightly` or `latest` images, and `IfNotPresent` in other cases.
// Overrides the image pull policy used in the PostgreSQL database deployment. Default value is `Always` for `nightly` or `latest` images, and `IfNotPresent` in other cases.
// +optional
PostgresImagePullPolicy corev1.PullPolicy `json:"postgresImagePullPolicy,omitempty"`
// PostgreSQL container custom settings
@ -482,7 +482,7 @@ type CheClusterSpecStorage struct {
// This includes the image tag. Omit it or leave it empty to use the default container image provided by the Operator. See also the `preCreateSubPaths` field.
// +optional
PvcJobsImage string `json:"pvcJobsImage,omitempty"`
// Storage class for the Persistent Volume Claim dedicated to the PosgreSQL database. When omitted or left blank, a default storage class is used.
// Storage class for the Persistent Volume Claim dedicated to the PostgreSQL database. When omitted or left blank, a default storage class is used.
// +optional
PostgresPVCStorageClassName string `json:"postgresPVCStorageClassName,omitempty"`
// Storage class for the Persistent Volume Claims dedicated to the Che workspaces. When omitted or left blank, a default storage class is used.
@ -554,7 +554,7 @@ type CheClusterStatus struct {
// +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors.x-descriptors="urn:alm:descriptor:text"
OpenShiftOAuthUserCredentialsSecret string `json:"openShiftOAuthUserCredentialsSecret"`
// Indicates that a PostgreSQL instance has been correctly provisioned or not.
// Indicates that a PosgreSQL instance has been correctly provisioned or not.
// Indicates that a PostgreSQL instance has been correctly provisioned or not.
// +optional
DbProvisoned bool `json:"dbProvisioned"`
// Indicates whether an Identity Provider instance, Keycloak or RH-SSO, has been provisioned with realm, client and user.