diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go index 747068a14..576324809 100644 --- a/api/v1/checluster_types.go +++ b/api/v1/checluster_types.go @@ -48,6 +48,10 @@ type CheClusterSpec struct { // +optional // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Persistent storage" Storage CheClusterSpecStorage `json:"storage"` + // Configuration settings related to the User Dashboard used by the Che installation. + // +optional + // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="User Dashboard" + Dashboard CheClusterSpecDashboard `json:"dashboard"` // Configuration settings related to the metrics collection used by the Che installation. // +optional // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Metrics" @@ -593,6 +597,14 @@ type Resources struct { Cpu string `json:"cpu,omitempty"` } +// +k8s:openapi-gen=true +// Configuration settings related to the User Dashboard used by the Che installation. +type CheClusterSpecDashboard struct { + // Warning message that will be displayed on the User Dashboard + // +optional + Warning string `json:"warning,omitempty"` +} + // +k8s:openapi-gen=true // Configuration settings related to the persistent storage used by the Che installation. type CheClusterSpecStorage struct { diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index 0481f6add..ffac0d4f4 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // @@ -88,6 +89,7 @@ func (in *CheClusterSpec) DeepCopyInto(out *CheClusterSpec) { out.Database = in.Database in.Auth.DeepCopyInto(&out.Auth) out.Storage = in.Storage + out.Dashboard = in.Dashboard out.Metrics = in.Metrics out.K8s = in.K8s out.ImagePuller = in.ImagePuller @@ -153,6 +155,21 @@ func (in *CheClusterSpecDB) DeepCopy() *CheClusterSpecDB { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CheClusterSpecDashboard) DeepCopyInto(out *CheClusterSpecDashboard) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheClusterSpecDashboard. +func (in *CheClusterSpecDashboard) DeepCopy() *CheClusterSpecDashboard { + if in == nil { + return nil + } + out := new(CheClusterSpecDashboard) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CheClusterSpecDevWorkspace) DeepCopyInto(out *CheClusterSpecDevWorkspace) { *out = *in diff --git a/api/v2alpha1/zz_generated.deepcopy.go b/api/v2alpha1/zz_generated.deepcopy.go index 4a0ff7cda..aa4b74b01 100644 --- a/api/v2alpha1/zz_generated.deepcopy.go +++ b/api/v2alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated // 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 index 3b4043a36..b0d5757d9 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -75,7 +75,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.44.0-432.next + name: eclipse-che-preview-openshift.v7.45.0-433.next namespace: placeholder spec: apiservicedefinitions: {} @@ -128,6 +128,10 @@ spec: path: auth.gatewayHeaderRewriteSidecarImage x-descriptors: - urn:alm:descriptor:com.tectonic.ui:hidden + - description: Configuration settings related to the User Dashboard used + by the Che installation. + displayName: User Dashboard + path: dashboard - description: Configuration settings related to the database used by the Che installation. displayName: Database @@ -968,7 +972,7 @@ spec: - name: RELATED_IMAGE_devfile_registry value: quay.io/eclipse/che-devfile-registry:next - name: RELATED_IMAGE_pvc_jobs - value: registry.access.redhat.com/ubi8-minimal:8.5-230 + value: registry.access.redhat.com/ubi8-minimal:8.5-230.1645809059 - name: RELATED_IMAGE_postgres value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392 - name: RELATED_IMAGE_postgres_13_3 @@ -1282,4 +1286,4 @@ spec: maturity: stable provider: name: Eclipse Foundation - version: 7.44.0-432.next + version: 7.45.0-433.next diff --git a/bundle/next/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml b/bundle/next/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml index a970da37c..4dfe744b6 100644 --- a/bundle/next/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml +++ b/bundle/next/eclipse-che-preview-openshift/manifests/org_v1_che_crd.yaml @@ -289,6 +289,15 @@ spec: first login. Defaults to `false`. type: boolean type: object + dashboard: + description: Configuration settings related to the User Dashboard + used by the Che installation. + properties: + warning: + description: Warning message that will be displayed on the User + Dashboard + type: string + type: object database: description: Configuration settings related to the database used by the Che installation. diff --git a/config/crd/bases/org_v1_che_crd.yaml b/config/crd/bases/org_v1_che_crd.yaml index 74362859f..d77df7e85 100644 --- a/config/crd/bases/org_v1_che_crd.yaml +++ b/config/crd/bases/org_v1_che_crd.yaml @@ -285,6 +285,15 @@ spec: first login. Defaults to `false`. type: boolean type: object + dashboard: + description: Configuration settings related to the User Dashboard + used by the Che installation. + properties: + warning: + description: Warning message that will be displayed on the User + Dashboard + type: string + type: object database: description: Configuration settings related to the database used by the Che installation. diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index c92818fc7..c98e447f7 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -72,7 +72,7 @@ spec: - name: RELATED_IMAGE_che_tls_secrets_creation_job value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34 - name: RELATED_IMAGE_pvc_jobs - value: registry.access.redhat.com/ubi8-minimal:8.5-230 + value: registry.access.redhat.com/ubi8-minimal:8.5-230.1645809059 - name: RELATED_IMAGE_postgres value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392 - name: RELATED_IMAGE_postgres_13_3 diff --git a/config/manifests/bases/che-operator.clusterserviceversion.yaml b/config/manifests/bases/che-operator.clusterserviceversion.yaml index a2e825e7f..de93c6bcc 100644 --- a/config/manifests/bases/che-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/che-operator.clusterserviceversion.yaml @@ -80,6 +80,10 @@ spec: path: auth.gatewayHeaderRewriteSidecarImage x-descriptors: - urn:alm:descriptor:com.tectonic.ui:hidden + - description: Configuration settings related to the User Dashboard used by + the Che installation. + displayName: User Dashboard + path: dashboard - description: Configuration settings related to the database used by the Che installation. displayName: Database diff --git a/helmcharts/next/crds/org_v1_che_crd.yaml b/helmcharts/next/crds/org_v1_che_crd.yaml index 74362859f..d77df7e85 100644 --- a/helmcharts/next/crds/org_v1_che_crd.yaml +++ b/helmcharts/next/crds/org_v1_che_crd.yaml @@ -285,6 +285,15 @@ spec: first login. Defaults to `false`. type: boolean type: object + dashboard: + description: Configuration settings related to the User Dashboard + used by the Che installation. + properties: + warning: + description: Warning message that will be displayed on the User + Dashboard + type: string + type: object database: description: Configuration settings related to the database used by the Che installation. diff --git a/helmcharts/next/templates/manager.yaml b/helmcharts/next/templates/manager.yaml index c92818fc7..c98e447f7 100644 --- a/helmcharts/next/templates/manager.yaml +++ b/helmcharts/next/templates/manager.yaml @@ -72,7 +72,7 @@ spec: - name: RELATED_IMAGE_che_tls_secrets_creation_job value: quay.io/eclipse/che-tls-secret-creator:alpine-01a4c34 - name: RELATED_IMAGE_pvc_jobs - value: registry.access.redhat.com/ubi8-minimal:8.5-230 + value: registry.access.redhat.com/ubi8-minimal:8.5-230.1645809059 - name: RELATED_IMAGE_postgres value: quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392 - name: RELATED_IMAGE_postgres_13_3 diff --git a/tools.go b/tools.go index 792ec5dab..454c62c67 100644 --- a/tools.go +++ b/tools.go @@ -10,6 +10,7 @@ // Red Hat, Inc. - initial API and implementation // +//go:build tools // +build tools // Place any runtime dependencies as imports in this file.