Update dev resources

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
eclipse-che · Aug 1, 2022 · 8e073f6 · 8e073f6
1 parent 66ca657
commit 8e073f6
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 85 deletions.
diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go
@@ -748,29 +748,35 @@ type ExternalDevfileRegistries struct {
 }
 
 type CheClusterGitServices struct {
+	// Enables users to work with repositories hosted on GitHub (github.com or GitHub Enterprise).
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="GitHub"
 	GitHub []GitHubService `json:"github,omitempty"`
+	// Enables users to work with repositories hosted on GitLab (gitlab.com or self-hosted).
 	// +optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="GitLab"
 	GitLab []GitLabService `json:"gitlab,omitempty"`
+	// Enables users to work with repositories hosted on Bitbucket (bitbucket.org or self-hosted).
 	// +optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="BitBucket"
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Bitbucket"
 	BitBucket []BitBucketService `json:"bitbucket,omitempty"`
 }
 
-// GitHubService enables users to work with a remote Git repository that is hosted on GitHub.
+// GitHubService enables users to work with repositories hosted on GitHub (GitHub.com or GitHub Enterprise).
 type GitHubService struct {
 	// Kubernetes secret, that contains Base64-encoded GitHub OAuth Client id and GitHub OAuth Client secret data.
 	// The GitHub OAuth data must be stored in the Kubernetes secret in `id` and `secret` keys respectively.
+	// See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-github/.
 	// +kubebuilder:validation:Required
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:io.kubernetes:Secret"
 	SecretName string `json:"secretName"`
 }
 
+// GitLabService enables users to work with repositories hosted on GitLab (gitlab.com or self-hosted).
 type GitLabService struct {
-	// Kubernetes secret, that contains Base64-encoded GitHub Application id and GitHub Application Client secret data.
-	// The GitHub Application data must be stored in `id` and `secret` keys of the Kubernetes secret respectively.
+	// Kubernetes secret, that contains Base64-encoded GitHub Application id and GitLab Application Client secret data.
+	// The GitLab Application data must be stored in `id` and `secret` keys of the Kubernetes secret respectively.
+	// See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-gitlab/.
 	// +kubebuilder:validation:Required
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:io.kubernetes:Secret"
 	SecretName string `json:"secretName"`
@@ -780,16 +786,18 @@ type GitLabService struct {
 	Endpoint string `json:"endpoint"`
 }
 
+// BitBucketService enables users to work with repositories hosted on Bitbucket (bitbucket.org or self-hosted).
 type BitBucketService struct {
-	// Kubernetes secret, that contains Base64-encoded BitBucket OAuth 1.0 or OAuth 2.0 data.
-	// For OAuth 1.0: private key, BitBucket Application link consumer key and BitBucket Application link shared secret must be stored
+	// Kubernetes secret, that contains Base64-encoded Bitbucket OAuth 1.0 or OAuth 2.0 data.
+	// For OAuth 1.0: private key, Bitbucket Application link consumer key and Bitbucket Application link shared secret must be stored
 	// in `private.key`, `consumer.key` and `shared_secret` keys of the Kubernetes secret respectively.
-	// For OAuth 2.0: BitBucket OAuth consumer key and BitBucket OAuth consumer secret must be stored
+	// For OAuth 2.0: Bitbucket OAuth consumer key and Bitbucket OAuth consumer secret must be stored
 	// in `id` and `secret` keys of the Kubernetes secret respectively.
+	// See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-1-for-bitbucket/.
 	// +kubebuilder:validation:Required
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors="urn:alm:descriptor:io.kubernetes:Secret"
 	SecretName string `json:"secretName"`
-	// BitBucket server endpoint URL.
+	// Bitbucket server endpoint URL.
 	// +kubebuilder:validation:Required
 	// +kubebuilder:default:="https://bitbucket.org"
 	Endpoint string `json:"endpoint,omitempty"`

diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@@ -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-preview-openshift.v7.52.0-644.next
+  name: eclipse-che-preview-openshift.v7.52.0-645.next
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -307,34 +307,42 @@ spec:
               repositories.
             displayName: Git Services
             path: gitServices
-          - displayName: BitBucket
+          - description: Enables users to work with repositories hosted on Bitbucket
+              (bitbucket.org or self-hosted).
+            displayName: Bitbucket
             path: gitServices.bitbucket
-          - description: 'Kubernetes secret, that contains Base64-encoded BitBucket
-              OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0: private key, BitBucket Application
-              link consumer key and BitBucket Application link shared secret must
+          - description: 'Kubernetes secret, that contains Base64-encoded Bitbucket
+              OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0: private key, Bitbucket Application
+              link consumer key and Bitbucket Application link shared secret must
               be stored in `private.key`, `consumer.key` and `shared_secret` keys
-              of the Kubernetes secret respectively. For OAuth 2.0: BitBucket OAuth
-              consumer key and BitBucket OAuth consumer secret must be stored in `id`
-              and `secret` keys of the Kubernetes secret respectively.'
+              of the Kubernetes secret respectively. For OAuth 2.0: Bitbucket OAuth
+              consumer key and Bitbucket OAuth consumer secret must be stored in `id`
+              and `secret` keys of the Kubernetes secret respectively. See the following
+              page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-1-for-bitbucket/.'
             displayName: Secret Name
             path: gitServices.bitbucket[0].secretName
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes:Secret
-          - displayName: GitHub
+          - description: Enables users to work with repositories hosted on GitHub
+              (github.com or GitHub Enterprise).
+            displayName: GitHub
             path: gitServices.github
-          - description: Kubernetes secret, that contains Base64-encoded GitHub OAuth
+          - description: 'Kubernetes secret, that contains Base64-encoded GitHub OAuth
               Client id and GitHub OAuth Client secret data. The GitHub OAuth data
               must be stored in the Kubernetes secret in `id` and `secret` keys respectively.
+              See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-github/.'
             displayName: Secret Name
             path: gitServices.github[0].secretName
             x-descriptors:
               - urn:alm:descriptor:io.kubernetes:Secret
-          - displayName: GitLab
+          - description: Enables users to work with repositories hosted on GitLab
+              (gitlab.com or self-hosted).
+            displayName: GitLab
             path: gitServices.gitlab
-          - description: Kubernetes secret, that contains Base64-encoded GitHub Application
-              id and GitHub Application Client secret data. The GitHub Application
+          - description: 'Kubernetes secret, that contains Base64-encoded GitHub Application
+              id and GitLab Application Client secret data. The GitLab Application
               data must be stored in `id` and `secret` keys of the Kubernetes secret
-              respectively.
+              respectively. See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-gitlab/.'
             displayName: Secret Name
             path: gitServices.gitlab[0].secretName
             x-descriptors:
@@ -1471,7 +1479,7 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.52.0-644.next
+  version: 7.52.0-645.next
   webhookdefinitions:
     - admissionReviewVersions:
         - v1

diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/org.eclipse.che_checlusters.yaml
@@ -465,54 +465,67 @@ spec:
                     Git repositories.
                   properties:
                     bitbucket:
+                      description: Enables users to work with repositories hosted
+                        on Bitbucket (bitbucket.org or self-hosted).
                       items:
+                        description: BitBucketService enables users to work with repositories
+                          hosted on Bitbucket (bitbucket.org or self-hosted).
                         properties:
                           endpoint:
                             default: https://bitbucket.org
-                            description: BitBucket server endpoint URL.
+                            description: Bitbucket server endpoint URL.
                             type: string
                           secretName:
                             description: 'Kubernetes secret, that contains Base64-encoded
-                              BitBucket OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0:
-                              private key, BitBucket Application link consumer key
-                              and BitBucket Application link shared secret must be
+                              Bitbucket OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0:
+                              private key, Bitbucket Application link consumer key
+                              and Bitbucket Application link shared secret must be
                               stored in `private.key`, `consumer.key` and `shared_secret`
                               keys of the Kubernetes secret respectively. For OAuth
-                              2.0: BitBucket OAuth consumer key and BitBucket OAuth
+                              2.0: Bitbucket OAuth consumer key and Bitbucket OAuth
                               consumer secret must be stored in `id` and `secret`
-                              keys of the Kubernetes secret respectively.'
+                              keys of the Kubernetes secret respectively. See the
+                              following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-1-for-bitbucket/.'
                             type: string
                         required:
                           - secretName
                         type: object
                       type: array
                     github:
+                      description: Enables users to work with repositories hosted
+                        on GitHub (github.com or GitHub Enterprise).
                       items:
-                        description: GitHubService enables users to work with a remote
-                          Git repository that is hosted on GitHub.
+                        description: GitHubService enables users to work with repositories
+                          hosted on GitHub (GitHub.com or GitHub Enterprise).
                         properties:
                           secretName:
-                            description: Kubernetes secret, that contains Base64-encoded
+                            description: 'Kubernetes secret, that contains Base64-encoded
                               GitHub OAuth Client id and GitHub OAuth Client secret
                               data. The GitHub OAuth data must be stored in the Kubernetes
-                              secret in `id` and `secret` keys respectively.
+                              secret in `id` and `secret` keys respectively. See the
+                              following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-github/.'
                             type: string
                         required:
                           - secretName
                         type: object
                       type: array
                     gitlab:
+                      description: Enables users to work with repositories hosted
+                        on GitLab (gitlab.com or self-hosted).
                       items:
+                        description: GitLabService enables users to work with repositories
+                          hosted on GitLab (gitlab.com or self-hosted).
                         properties:
                           endpoint:
                             default: https://gitlab.com
                             description: GitLab server endpoint URL.
                             type: string
                           secretName:
-                            description: Kubernetes secret, that contains Base64-encoded
-                              GitHub Application id and GitHub Application Client
-                              secret data. The GitHub Application data must be stored
+                            description: 'Kubernetes secret, that contains Base64-encoded
+                              GitHub Application id and GitLab Application Client
+                              secret data. The GitLab Application data must be stored
                               in `id` and `secret` keys of the Kubernetes secret respectively.
+                              See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-gitlab/.'
                             type: string
                         required:
                           - endpoint

diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml
@@ -442,54 +442,67 @@ spec:
                   Git repositories.
                 properties:
                   bitbucket:
+                    description: Enables users to work with repositories hosted on
+                      Bitbucket (bitbucket.org or self-hosted).
                     items:
+                      description: BitBucketService enables users to work with repositories
+                        hosted on Bitbucket (bitbucket.org or self-hosted).
                       properties:
                         endpoint:
                           default: https://bitbucket.org
-                          description: BitBucket server endpoint URL.
+                          description: Bitbucket server endpoint URL.
                           type: string
                         secretName:
                           description: 'Kubernetes secret, that contains Base64-encoded
-                            BitBucket OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0:
-                            private key, BitBucket Application link consumer key and
-                            BitBucket Application link shared secret must be stored
+                            Bitbucket OAuth 1.0 or OAuth 2.0 data. For OAuth 1.0:
+                            private key, Bitbucket Application link consumer key and
+                            Bitbucket Application link shared secret must be stored
                             in `private.key`, `consumer.key` and `shared_secret` keys
                             of the Kubernetes secret respectively. For OAuth 2.0:
-                            BitBucket OAuth consumer key and BitBucket OAuth consumer
+                            Bitbucket OAuth consumer key and Bitbucket OAuth consumer
                             secret must be stored in `id` and `secret` keys of the
-                            Kubernetes secret respectively.'
+                            Kubernetes secret respectively. See the following page:
+                            https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-1-for-bitbucket/.'
                           type: string
                       required:
                       - secretName
                       type: object
                     type: array
                   github:
+                    description: Enables users to work with repositories hosted on
+                      GitHub (github.com or GitHub Enterprise).
                     items:
-                      description: GitHubService enables users to work with a remote
-                        Git repository that is hosted on GitHub.
+                      description: GitHubService enables users to work with repositories
+                        hosted on GitHub (GitHub.com or GitHub Enterprise).
                       properties:
                         secretName:
-                          description: Kubernetes secret, that contains Base64-encoded
+                          description: 'Kubernetes secret, that contains Base64-encoded
                             GitHub OAuth Client id and GitHub OAuth Client secret
                             data. The GitHub OAuth data must be stored in the Kubernetes
-                            secret in `id` and `secret` keys respectively.
+                            secret in `id` and `secret` keys respectively. See the
+                            following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-github/.'
                           type: string
                       required:
                       - secretName
                       type: object
                     type: array
                   gitlab:
+                    description: Enables users to work with repositories hosted on
+                      GitLab (gitlab.com or self-hosted).
                     items:
+                      description: GitLabService enables users to work with repositories
+                        hosted on GitLab (gitlab.com or self-hosted).
                       properties:
                         endpoint:
                           default: https://gitlab.com
                           description: GitLab server endpoint URL.
                           type: string
                         secretName:
-                          description: Kubernetes secret, that contains Base64-encoded
-                            GitHub Application id and GitHub Application Client secret
-                            data. The GitHub Application data must be stored in `id`
+                          description: 'Kubernetes secret, that contains Base64-encoded
+                            GitHub Application id and GitLab Application Client secret
+                            data. The GitLab Application data must be stored in `id`
                             and `secret` keys of the Kubernetes secret respectively.
+                            See the following page: https://www.eclipse.org/che/docs/stable/administration-guide/configuring-oauth-2-for-gitlab/.'
                           type: string
                       required:
                       - endpoint