Update nightly bundle

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
eclipse-che · Apr 21, 2021 · d9e4770 · d9e4770
1 parent ae9670b
commit d9e4770
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 36 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -45,7 +45,7 @@ RUN curl -L https://api.github.com/repos/che-incubator/devworkspace-che-operator
     mv /tmp/che-incubator-devworkspace-che-operator-*/deploy /tmp/devworkspace-che-operator/templates/
 
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.3-298
+FROM registry.access.redhat.com/ubi8-minimal:8.3-298.1618432845
 
 COPY --from=builder /tmp/che-operator/che-operator /usr/local/bin/che-operator
 COPY --from=builder /che-operator/templates/keycloak-provision.sh /tmp/keycloak-provision.sh

diff --git a/deploy/crds/org_v1_che_crd-v1beta1.yaml b/deploy/crds/org_v1_che_crd-v1beta1.yaml
@@ -325,16 +325,15 @@ spec:
               description: Kubernetes Image Puller configuration
               properties:
                 enable:
-                  description: "Install and configure the Community Supported Kubernetes
+                  description: Install and configure the Community Supported Kubernetes
                     Image Puller Operator. When set to `true` and no spec is provided,
                     it will create a default KubernetesImagePuller object to be managed
                     by the Operator. When set to `false`, the KubernetesImagePuller
                     object will be deleted, and the Operator will be uninstalled,
-                    regardless of whether a spec is provided. 
- Note that while this
+                    regardless of whether a spec is provided. Note that while this
                     the Operator and its behavior is community-supported, its payload
                     may be commercially-supported for pulling commercially-supported
-                    images."
+                    images.
                   type: boolean
                 spec:
                   description: A KubernetesImagePullerSpec to configure the image
@@ -524,6 +523,32 @@ spec:
                     ConfigMap from other CR fields, the value defined in the `customCheProperties`
                     is used instead.
                   type: object
+                dashboardCpuLimit:
+                  description: Overrides the CPU limit used in the dashboard deployment.
+                    In cores. (500m = .5 cores). Default to 500m.
+                  type: string
+                dashboardCpuRequest:
+                  description: Overrides the CPU request used in the dashboard deployment.
+                    In cores. (500m = .5 cores). Default to 100m.
+                  type: string
+                dashboardImage:
+                  description: Overrides the container image used in the dashboard
+                    deployment. This includes the image tag. Omit it or leave it empty
+                    to use the default container image provided by the Operator.
+                  type: string
+                dashboardImagePullPolicy:
+                  description: Overrides the image pull policy used in the dashboard
+                    deployment. Default value is `Always` for `nightly` or `latest`
+                    images, and `IfNotPresent` in other cases.
+                  type: string
+                dashboardMemoryLimit:
+                  description: Overrides the memory limit used in the dashboard deployment.
+                    Defaults to 256Mi.
+                  type: string
+                dashboardMemoryRequest:
+                  description: Overrides the memory request used in the dashboard
+                    deployment. Defaults to 16Mi.
+                  type: string
                 devfileRegistryCpuLimit:
                   description: Overrides the CPU limit used in the devfile registry
                     deployment. In cores. (500m = .5 cores). Default to 500m.

diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml
@@ -331,16 +331,15 @@ spec:
                 description: Kubernetes Image Puller configuration
                 properties:
                   enable:
-                    description: "Install and configure the Community Supported Kubernetes
+                    description: Install and configure the Community Supported Kubernetes
                       Image Puller Operator. When set to `true` and no spec is provided,
                       it will create a default KubernetesImagePuller object to be
                       managed by the Operator. When set to `false`, the KubernetesImagePuller
                       object will be deleted, and the Operator will be uninstalled,
-                      regardless of whether a spec is provided.
- Note that while
-                      this the Operator and its behavior is community-supported, its
-                      payload may be commercially-supported for pulling commercially-supported
-                      images."
+                      regardless of whether a spec is provided. Note that while this
+                      the Operator and its behavior is community-supported, its payload
+                      may be commercially-supported for pulling commercially-supported
+                      images.
                     type: boolean
                   spec:
                     description: A KubernetesImagePullerSpec to configure the image
@@ -537,6 +536,32 @@ spec:
                       generated in `che` ConfigMap from other CR fields, the value
                       defined in the `customCheProperties` is used instead.
                     type: object
+                  dashboardCpuLimit:
+                    description: Overrides the CPU limit used in the dashboard deployment.
+                      In cores. (500m = .5 cores). Default to 500m.
+                    type: string
+                  dashboardCpuRequest:
+                    description: Overrides the CPU request used in the dashboard deployment.
+                      In cores. (500m = .5 cores). Default to 100m.
+                    type: string
+                  dashboardImage:
+                    description: Overrides the container image used in the dashboard
+                      deployment. This includes the image tag. Omit it or leave it
+                      empty to use the default container image provided by the Operator.
+                    type: string
+                  dashboardImagePullPolicy:
+                    description: Overrides the image pull policy used in the dashboard
+                      deployment. Default value is `Always` for `nightly` or `latest`
+                      images, and `IfNotPresent` in other cases.
+                    type: string
+                  dashboardMemoryLimit:
+                    description: Overrides the memory limit used in the dashboard
+                      deployment. Defaults to 256Mi.
+                    type: string
+                  dashboardMemoryRequest:
+                    description: Overrides the memory request used in the dashboard
+                      deployment. Defaults to 16Mi.
+                    type: string
                   devfileRegistryCpuLimit:
                     description: Overrides the CPU limit used in the devfile registry
                       deployment. In cores. (500m = .5 cores). Default to 500m.

diff --git a/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/.../nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml
@@ -76,13 +76,13 @@ metadata:
     categories: Developer Tools
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:nightly
-    createdAt: "2021-04-20T09:53:09Z"
+    createdAt: "2021-04-21T06:51:40Z"
     description: A Kube-native development solution that delivers portable and collaborative
       developer workspaces.
     operatorframework.io/suggested-namespace: eclipse-che
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-kubernetes.v7.30.0-164.nightly
+  name: eclipse-che-preview-kubernetes.v7.30.0-168.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -910,7 +910,7 @@ spec:
                       - name: RELATED_IMAGE_che_tls_secrets_creation_job
                         value: quay.io/eclipse/che-tls-secret-creator:alpine-d1ed4ad
                       - name: RELATED_IMAGE_pvc_jobs
-                        value: registry.access.redhat.com/ubi8-minimal:8.3-298
+                        value: registry.access.redhat.com/ubi8-minimal:8.3-298.1618432845
                       - name: RELATED_IMAGE_postgres
                         value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
                       - name: RELATED_IMAGE_keycloak
@@ -1113,4 +1113,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.30.0-164.nightly
+  version: 7.30.0-168.nightly
diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/org_v1_che_crd.yaml
@@ -331,16 +331,15 @@ spec:
                 description: Kubernetes Image Puller configuration
                 properties:
                   enable:
-                    description: "Install and configure the Community Supported Kubernetes
+                    description: Install and configure the Community Supported Kubernetes
                       Image Puller Operator. When set to `true` and no spec is provided,
                       it will create a default KubernetesImagePuller object to be
                       managed by the Operator. When set to `false`, the KubernetesImagePuller
                       object will be deleted, and the Operator will be uninstalled,
-                      regardless of whether a spec is provided.
- Note that while
-                      this the Operator and its behavior is community-supported, its
-                      payload may be commercially-supported for pulling commercially-supported
-                      images."
+                      regardless of whether a spec is provided. Note that while this
+                      the Operator and its behavior is community-supported, its payload
+                      may be commercially-supported for pulling commercially-supported
+                      images.
                     type: boolean
                   spec:
                     description: A KubernetesImagePullerSpec to configure the image
@@ -537,6 +536,32 @@ spec:
                       generated in `che` ConfigMap from other CR fields, the value
                       defined in the `customCheProperties` is used instead.
                     type: object
+                  dashboardCpuLimit:
+                    description: Overrides the CPU limit used in the dashboard deployment.
+                      In cores. (500m = .5 cores). Default to 500m.
+                    type: string
+                  dashboardCpuRequest:
+                    description: Overrides the CPU request used in the dashboard deployment.
+                      In cores. (500m = .5 cores). Default to 100m.
+                    type: string
+                  dashboardImage:
+                    description: Overrides the container image used in the dashboard
+                      deployment. This includes the image tag. Omit it or leave it
+                      empty to use the default container image provided by the Operator.
+                    type: string
+                  dashboardImagePullPolicy:
+                    description: Overrides the image pull policy used in the dashboard
+                      deployment. Default value is `Always` for `nightly` or `latest`
+                      images, and `IfNotPresent` in other cases.
+                    type: string
+                  dashboardMemoryLimit:
+                    description: Overrides the memory limit used in the dashboard
+                      deployment. Defaults to 256Mi.
+                    type: string
+                  dashboardMemoryRequest:
+                    description: Overrides the memory request used in the dashboard
+                      deployment. Defaults to 16Mi.
+                    type: string
                   devfileRegistryCpuLimit:
                     description: Overrides the CPU limit used in the devfile registry
                       deployment. In cores. (500m = .5 cores). Default to 500m.

diff --git a/...g/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/...g/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml
@@ -67,13 +67,13 @@ metadata:
     categories: Developer Tools, OpenShift Optional
     certified: "false"
     containerImage: quay.io/eclipse/che-operator:nightly
-    createdAt: "2021-04-20T09:53:20Z"
+    createdAt: "2021-04-21T06:51:51Z"
     description: A Kube-native development solution that delivers portable and collaborative
       developer workspaces in OpenShift.
     operatorframework.io/suggested-namespace: eclipse-che
     repository: https://github.com/eclipse-che/che-operator
     support: Eclipse Foundation
-  name: eclipse-che-preview-openshift.v7.30.0-164.nightly
+  name: eclipse-che-preview-openshift.v7.30.0-168.nightly
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -977,7 +977,7 @@ spec:
                       - name: RELATED_IMAGE_devfile_registry
                         value: quay.io/eclipse/che-devfile-registry:nightly
                       - name: RELATED_IMAGE_pvc_jobs
-                        value: registry.access.redhat.com/ubi8-minimal:8.3-298
+                        value: registry.access.redhat.com/ubi8-minimal:8.3-298.1618432845
                       - name: RELATED_IMAGE_postgres
                         value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
                       - name: RELATED_IMAGE_keycloak
@@ -1186,4 +1186,4 @@ spec:
   maturity: stable
   provider:
     name: Eclipse Foundation
-  version: 7.30.0-164.nightly
+  version: 7.30.0-168.nightly
diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml
@@ -337,15 +337,15 @@ spec:
                   description: Kubernetes Image Puller configuration
                   properties:
                     enable:
-                      description: "Install and configure the Community Supported\
-                        \ Kubernetes Image Puller Operator. When set to `true` and\
-                        \ no spec is provided, it will create a default KubernetesImagePuller\
-                        \ object to be managed by the Operator. When set to `false`,\
-                        \ the KubernetesImagePuller object will be deleted, and the\
-                        \ Operator will be uninstalled, regardless of whether a spec\
-                        \ is provided. Note that while this the Operator and its behavior\
-                        \ is community-supported, its payload may be commercially-supported\
-                        \ for pulling commercially-supported images."
+                      description: Install and configure the Community Supported Kubernetes
+                        Image Puller Operator. When set to `true` and no spec is provided,
+                        it will create a default KubernetesImagePuller object to be
+                        managed by the Operator. When set to `false`, the KubernetesImagePuller
+                        object will be deleted, and the Operator will be uninstalled,
+                        regardless of whether a spec is provided. Note that while
+                        this the Operator and its behavior is community-supported,
+                        its payload may be commercially-supported for pulling commercially-supported
+                        images.
                       type: boolean
                     spec:
                       description: A KubernetesImagePullerSpec to configure the image
@@ -545,6 +545,33 @@ spec:
                         be normally generated in `che` ConfigMap from other CR fields,
                         the value defined in the `customCheProperties` is used instead.
                       type: object
+                    dashboardCpuLimit:
+                      description: Overrides the CPU limit used in the dashboard deployment.
+                        In cores. (500m = .5 cores). Default to 500m.
+                      type: string
+                    dashboardCpuRequest:
+                      description: Overrides the CPU request used in the dashboard
+                        deployment. In cores. (500m = .5 cores). Default to 100m.
+                      type: string
+                    dashboardImage:
+                      description: Overrides the container image used in the dashboard
+                        deployment. This includes the image tag. Omit it or leave
+                        it empty to use the default container image provided by the
+                        Operator.
+                      type: string
+                    dashboardImagePullPolicy:
+                      description: Overrides the image pull policy used in the dashboard
+                        deployment. Default value is `Always` for `nightly` or `latest`
+                        images, and `IfNotPresent` in other cases.
+                      type: string
+                    dashboardMemoryLimit:
+                      description: Overrides the memory limit used in the dashboard
+                        deployment. Defaults to 256Mi.
+                      type: string
+                    dashboardMemoryRequest:
+                      description: Overrides the memory request used in the dashboard
+                        deployment. Defaults to 16Mi.
+                      type: string
                     devfileRegistryCpuLimit:
                       description: Overrides the CPU limit used in the devfile registry
                         deployment. In cores. (500m = .5 cores). Default to 500m.

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -60,7 +60,7 @@ spec:
             - name: RELATED_IMAGE_che_tls_secrets_creation_job
               value: quay.io/eclipse/che-tls-secret-creator:alpine-d1ed4ad
             - name: RELATED_IMAGE_pvc_jobs
-              value: registry.access.redhat.com/ubi8-minimal:8.3-298
+              value: registry.access.redhat.com/ubi8-minimal:8.3-298.1618432845
             - name: RELATED_IMAGE_postgres
               value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392
             - name: RELATED_IMAGE_keycloak

diff --git a/pkg/apis/org/v1/che_types.go b/pkg/apis/org/v1/che_types.go
@@ -559,7 +559,6 @@ type CheClusterSpecImagePuller struct {
 	// it will create a default KubernetesImagePuller object to be managed by the Operator.
 	// When set to `false`, the KubernetesImagePuller object will be deleted, and the Operator will be uninstalled,
 	// regardless of whether a spec is provided.
-	//
 	// Note that while this the Operator and its behavior is community-supported, its payload may be commercially-supported
 	// for pulling commercially-supported images.
 	Enable bool `json:"enable"`