From 3bded5b67188725beb6165d2e36d9023916c02bf Mon Sep 17 00:00:00 2001
From: Karel Suta <ksuta@redhat.com>
Date: Fri, 27 Sep 2024 12:54:40 +0200
Subject: [PATCH] Cleanup of codeflare-common defaults and Makefile

Removing CodeFlare SDK version as CodeFlare SDK doesn't use Go lang tests any more.
Adjusted Makefile to align with current content of defaults.go
---
 Makefile                    |  6 +-----
 support/defaults.go         |  5 ++---
 support/environment.go      |  5 -----
 support/environment_test.go | 15 ---------------
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index dcc367b..82c4c4d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,8 @@
-# CODEFLARE_SDK_VERSION defines the default version of the CodeFlare SDK
-CODEFLARE_SDK_VERSION ?= 0.9.0
-
 # RAY_VERSION defines the default version of Ray (used for testing)
 RAY_VERSION ?= 2.35.0
 
 # RAY_IMAGE defines the default container image for Ray (used for testing)
-RAY_IMAGE ?= rayproject/ray:$(RAY_VERSION)
+RAY_IMAGE ?= quay.io/modh/ray:2.35.0-py39-cu121
 
 ##@ Development
 
@@ -21,7 +18,6 @@ defaults:
 	@echo "// ***********************" >> $(DEFAULTS_TEST_FILE)
 	@echo "" >> $(DEFAULTS_TEST_FILE)
 	@echo "const (" >> $(DEFAULTS_TEST_FILE)
-	@echo "  CodeFlareSDKVersion = \"$(CODEFLARE_SDK_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
 	@echo "  RayVersion = \"$(RAY_VERSION)\"" >> $(DEFAULTS_TEST_FILE)
 	@echo "  RayImage = \"$(RAY_IMAGE)\"" >> $(DEFAULTS_TEST_FILE)
 	@echo "" >> $(DEFAULTS_TEST_FILE)
diff --git a/support/defaults.go b/support/defaults.go
index 0057c78..72d1091 100644
--- a/support/defaults.go
+++ b/support/defaults.go
@@ -5,7 +5,6 @@ package support
 // ***********************
 
 const (
-	CodeFlareSDKVersion = "v0.20.2"
-	RayVersion          = "2.35.0"
-	RayImage            = "quay.io/modh/ray:2.35.0-py39-cu121"
+	RayVersion = "2.35.0"
+	RayImage   = "quay.io/modh/ray:2.35.0-py39-cu121"
 )
diff --git a/support/environment.go b/support/environment.go
index d377839..6ed07a6 100644
--- a/support/environment.go
+++ b/support/environment.go
@@ -25,7 +25,6 @@ const (
 	// The environment variables hereafter can be used to change the components
 	// used for testing.
 
-	CodeFlareTestSdkVersion   = "CODEFLARE_TEST_SDK_VERSION"
 	CodeFlareTestRayVersion   = "CODEFLARE_TEST_RAY_VERSION"
 	CodeFlareTestRayImage     = "CODEFLARE_TEST_RAY_IMAGE"
 	CodeFlareTestPyTorchImage = "CODEFLARE_TEST_PYTORCH_IMAGE"
@@ -71,10 +70,6 @@ const (
 	UndefinedCluster  ClusterType = "UNDEFINED"
 )
 
-func GetCodeFlareSDKVersion() string {
-	return lookupEnvOrDefault(CodeFlareTestSdkVersion, CodeFlareSDKVersion)
-}
-
 func GetRayVersion() string {
 	return lookupEnvOrDefault(CodeFlareTestRayVersion, RayVersion)
 }
diff --git a/support/environment_test.go b/support/environment_test.go
index c40cf72..75b49e2 100644
--- a/support/environment_test.go
+++ b/support/environment_test.go
@@ -8,21 +8,6 @@ import (
 	"github.com/onsi/gomega"
 )
 
-func TestGetCodeFlareSDKVersion(t *testing.T) {
-
-	g := gomega.NewGomegaWithT(t)
-	// Set the environment variable.
-	os.Setenv(CodeFlareTestSdkVersion, "1.2.3")
-
-	// Get the version.
-	version := GetCodeFlareSDKVersion()
-
-	// Assert that the version is correct.
-
-	g.Expect(version).To(gomega.Equal("1.2.3"), "Expected version 1.2.3, but got %s", version)
-
-}
-
 func TestGetRayVersion(t *testing.T) {
 
 	g := gomega.NewGomegaWithT(t)