From 0bafc5ec5c86de72ce51863b7571357fb2cb7a57 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Fri, 9 Sep 2022 22:42:58 +0300 Subject: [PATCH] chore: Update RELATED_IMAGE regexes for che/devspaces (#1515) Signed-off-by: Anatolii Bazko Signed-off-by: Anatolii Bazko --- pkg/deploy/image-puller/imagepuller.go | 8 +++--- pkg/deploy/image-puller/imagepuller_test.go | 28 ++------------------- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/pkg/deploy/image-puller/imagepuller.go b/pkg/deploy/image-puller/imagepuller.go index 22398402e..859cc3136 100644 --- a/pkg/deploy/image-puller/imagepuller.go +++ b/pkg/deploy/image-puller/imagepuller.go @@ -475,14 +475,12 @@ func GetDefaultImages() []ImageAndName { images := []ImageAndName{} imagePatterns := [...]string{ "^RELATED_IMAGE_.*_theia.*", + "^RELATED_IMAGE_.*_code.*", + "^RELATED_IMAGE_.*_idea.*", "^RELATED_IMAGE_.*_machine(_)?exec(_.*)?_plugin_registry_image.*", "^RELATED_IMAGE_.*_kubernetes(_.*)?_plugin_registry_image.*", "^RELATED_IMAGE_.*_openshift(_.*)?_plugin_registry_image.*", - "^RELATED_IMAGE_.*_cpp(_.*)?_devfile_registry_image.*", - "^RELATED_IMAGE_.*_dotnet(_.*)?_devfile_registry_image.*", - "^RELATED_IMAGE_.*_golang(_.*)?_devfile_registry_image.*", - "^RELATED_IMAGE_.*_php(_.*)?_devfile_registry_image.*", - "^RELATED_IMAGE_.*_java.{1,2}(_maven)?_devfile_registry_image.*", + "^RELATED_IMAGE_universal(_)?developer(_)?image(_.*)?_devfile_registry_image.*", } for _, pattern := range imagePatterns { matches := utils.GetEnvsByRegExp(pattern) diff --git a/pkg/deploy/image-puller/imagepuller_test.go b/pkg/deploy/image-puller/imagepuller_test.go index 5429e65e7..eeb78437d 100644 --- a/pkg/deploy/image-puller/imagepuller_test.go +++ b/pkg/deploy/image-puller/imagepuller_test.go @@ -435,34 +435,10 @@ func TestEnvVars(t *testing.T) { { name: "detect devfile registry images", env: map[string]string{ - "RELATED_IMAGE_che_cpp_rhel7_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-cpp-rhel7", - "RELATED_IMAGE_che_dotnet_2_2_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-dotnet-2.2", - "RELATED_IMAGE_che_dotnet_3_1_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-dotnet-3.1", - "RELATED_IMAGE_che_golang_1_14_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-golang-1.14", - "RELATED_IMAGE_che_php_7_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-php-7", - "RELATED_IMAGE_che_java11_maven_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-java11-maven", - "RELATED_IMAGE_che_java8_maven_devfile_registry_image_G4XDGNR": "quay.io/eclipse/che-java8-maven", - "RELATED_IMAGE_codeready_workspaces_stacks_cpp_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-cpp-rhel8", - "RELATED_IMAGE_codeready_workspaces_stacks_dotnet_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-dotnet-rhel8", - "RELATED_IMAGE_codeready_workspaces_stacks_golang_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-golang-rhel8", - "RELATED_IMAGE_codeready_workspaces_stacks_php_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/stacks-php-rhel8", - "RELATED_IMAGE_codeready_workspaces_plugin_java11_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/plugin-java11-rhel8", - "RELATED_IMAGE_codeready_workspaces_plugin_java8_devfile_registry_image_GIXDCMQK": "registry.redhat.io/codeready-workspaces/plugin-java8-rhel8", + "RELATED_IMAGE_universal_developer_image_devfile_registry_image_OVRGSOBNGBSTCOBZMQ4Q____": "quay.io/devfile/universal-developer-image:ubi8-38da5c2", }, expected: []ImageAndName{ - {Name: "che_cpp_rhel7_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-cpp-rhel7"}, - {Name: "che_dotnet_2_2_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-dotnet-2.2"}, - {Name: "che_dotnet_3_1_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-dotnet-3.1"}, - {Name: "che_golang_1_14_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-golang-1.14"}, - {Name: "che_php_7_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-php-7"}, - {Name: "che_java11_maven_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-java11-maven"}, - {Name: "che_java8_maven_devfile_registry_image_G4XDGNR", Image: "quay.io/eclipse/che-java8-maven"}, - {Name: "codeready_workspaces_stacks_cpp_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-cpp-rhel8"}, - {Name: "codeready_workspaces_stacks_dotnet_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-dotnet-rhel8"}, - {Name: "codeready_workspaces_stacks_golang_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-golang-rhel8"}, - {Name: "codeready_workspaces_stacks_php_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/stacks-php-rhel8"}, - {Name: "codeready_workspaces_plugin_java11_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/plugin-java11-rhel8"}, - {Name: "codeready_workspaces_plugin_java8_devfile_registry_image_GIXDCMQK", Image: "registry.redhat.io/codeready-workspaces/plugin-java8-rhel8"}, + {Name: "universal_developer_image_devfile_registry_image_OVRGSOBNGBSTCOBZMQ4Q____", Image: "quay.io/devfile/universal-developer-image:ubi8-38da5c2"}, }, }, }