From 5f2b34893223b9d77ba05eb2e2a35fa9a40f3104 Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Tue, 16 Feb 2021 10:08:00 +0200 Subject: [PATCH] Fix some crd typos. (#678) * Fix some typos. Signed-off-by: Oleksandr Andriienko --- README.md | 6 +++--- deploy/crds/org_v1_che_crd.yaml | 12 ++++++------ .../che-operator.clusterserviceversion.yaml | 6 +++--- .../manifests/org_v1_che_crd.yaml | 12 ++++++------ .../che-operator.clusterserviceversion.yaml | 6 +++--- .../manifests/org_v1_che_crd.yaml | 12 ++++++------ olm/README.md | 2 +- pkg/apis/org/v1/che_types.go | 10 +++++----- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 8f669cf36..ea718e342 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ $ olm/update-nightly-bundle.sh 3. Build catalog source and bundle images: ```bash -$ olm/buildAndPushInitialBundle.sh +$ olm/buildAndPushInitialBundle.sh ``` 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: //eclipse-che--opm-catalog:preview + image: //eclipse-che--opm-catalog:preview sourceType: grpc updateStrategy: registryPoll: @@ -115,7 +115,7 @@ spec: 5. Deploy Che operator: ```bash -$ chectl server:deploy --installer=olm --platform= --catalog-source-yaml --olm-channel=nightly --package-manifest-name=eclipse-che-preview- +$ chectl server:deploy --installer=olm --platform= --catalog-source-yaml --olm-channel=nightly --package-manifest-name=eclipse-che-preview- ``` ### Deploy Che operator using bash script diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml index a0dc24724..26b7fe3c5 100644 --- a/deploy/crds/org_v1_che_crd.yaml +++ b/deploy/crds/org_v1_che_crd.yaml @@ -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. diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index c5202f041..9e8283ff3 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -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 diff --git a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml index a0dc24724..26b7fe3c5 100644 --- a/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml @@ -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. diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index 243f7507e..411b2ccb7 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -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 diff --git a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml index 6593ae729..7e616e508 100644 --- a/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml +++ b/deploy/olm-catalog/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml @@ -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. diff --git a/olm/README.md b/olm/README.md index 8d2ef4a94..26b413a7e 100644 --- a/olm/README.md +++ b/olm/README.md @@ -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= && \ export IMAGE_REGISTRY_HOST= && \ - ./buildAndPushInitialBundle.sh [FROM-INDEX-IMAGE] + ./buildAndPushInitialBundle.sh [FROM-INDEX-IMAGE] ``` This script will build and push for you two images: CatalogSource(index) and bundle one: diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go index f6f9f65f2..e165adb3a 100644 --- a/pkg/apis/org/v1/che_types.go +++ b/pkg/apis/org/v1/che_types.go @@ -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.