diff --git a/api/v1/checluster_types.go b/api/v1/checluster_types.go index 1ee3b1064..cf4a92565 100644 --- a/api/v1/checluster_types.go +++ b/api/v1/checluster_types.go @@ -373,7 +373,6 @@ type CheClusterSpecServer struct { // Default components applied to DevWorkspaces. // These default components are meant to be used when a Devfile does not contain any components. // +optional - // +kubebuilder:default:={{name: universal-developer-image, container: {image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}} WorkspaceDefaultComponents []devfile.Component `json:"workspaceDefaultComponents,omitempty"` // List of environment variables to set in the Che server container. // +optional diff --git a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml b/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml index f32834054..e212eb5ce 100644 --- a/bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml +++ b/bundle/next/eclipse-che/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.v7.64.0-778.next + name: eclipse-che.v7.64.0-780.next namespace: placeholder spec: apiservicedefinitions: {} @@ -959,7 +959,7 @@ spec: value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS value: '[{"name": "universal-developer-image", "container": - {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES @@ -1243,7 +1243,7 @@ spec: minKubeVersion: 1.19.0 provider: name: Eclipse Foundation - version: 7.64.0-778.next + version: 7.64.0-780.next webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml index d78a2a57d..d02c9bf3b 100644 --- a/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml +++ b/bundle/next/eclipse-che/manifests/org.eclipse.che_checlusters.yaml @@ -2273,10 +2273,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. diff --git a/config/crd/bases/org.eclipse.che_checlusters.yaml b/config/crd/bases/org.eclipse.che_checlusters.yaml index 049b3ea05..a4eb92014 100644 --- a/config/crd/bases/org.eclipse.che_checlusters.yaml +++ b/config/crd/bases/org.eclipse.che_checlusters.yaml @@ -2209,10 +2209,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 864bbef11..f29202103 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -102,7 +102,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 8cbff43a2..1795769f1 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -2228,10 +2228,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. @@ -8173,7 +8169,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml index a2bc754f7..60aa5820c 100644 --- a/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml @@ -96,7 +96,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 924a2b1fd..9cfd455d1 100644 --- a/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -2223,10 +2223,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 6711d6994..76ec3ed7c 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -2228,10 +2228,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. @@ -8175,7 +8171,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml index b950b37db..8fe68ec41 100644 --- a/deploy/deployment/openshift/objects/che-operator.Deployment.yaml +++ b/deploy/deployment/openshift/objects/che-operator.Deployment.yaml @@ -96,7 +96,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 755f881a7..0160691a8 100644 --- a/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -2223,10 +2223,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. diff --git a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml index 924a2b1fd..9cfd455d1 100644 --- a/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml +++ b/helmcharts/next/crds/checlusters.org.eclipse.che.CustomResourceDefinition.yaml @@ -2223,10 +2223,6 @@ spec: description: Deprecated in favor of `disableInternalClusterSVCNames`. type: boolean workspaceDefaultComponents: - default: - - container: - image: quay.io/devfile/universal-developer-image:ubi8-38da5c2 - name: universal-developer-image description: Default components applied to DevWorkspaces. These default components are meant to be used when a Devfile does not contain any components. diff --git a/helmcharts/next/templates/che-operator.Deployment.yaml b/helmcharts/next/templates/che-operator.Deployment.yaml index a2bc754f7..60aa5820c 100644 --- a/helmcharts/next/templates/che-operator.Deployment.yaml +++ b/helmcharts/next/templates/che-operator.Deployment.yaml @@ -96,7 +96,7 @@ spec: - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR value: che-incubator/che-code/latest - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS - value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]' + value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]' - name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL value: https://open-vsx.org - name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DISABLECONTAINERBUILDCAPABILITIES diff --git a/pkg/deploy/dashboard/dashboard_deployment_test.go b/pkg/deploy/dashboard/dashboard_deployment_test.go index 5feeb7191..c6f905eef 100644 --- a/pkg/deploy/dashboard/dashboard_deployment_test.go +++ b/pkg/deploy/dashboard/dashboard_deployment_test.go @@ -183,7 +183,7 @@ func TestDashboardDeploymentEnvVars(t *testing.T) { }, { Name: "CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS", - Value: `[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]`, + Value: `[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]`, }, { Name: "CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL", @@ -255,7 +255,7 @@ func TestDashboardDeploymentEnvVars(t *testing.T) { }, { Name: "CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS", - Value: `[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}}]`, + Value: `[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]`, }, { Name: "CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL",