limitador CRD: spec.Image

Kuadrant · May 3, 2024 · 64d8148 · 64d8148
1 parent 6026be8
commit 64d8148
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 7 deletions.
diff --git a/api/v1alpha1/limitador_types.go b/api/v1alpha1/limitador_types.go
@@ -71,6 +71,7 @@ type LimitadorSpec struct {
 	// +optional
 	Replicas *int `json:"replicas,omitempty"`
 
+	// Deprecated
 	// +optional
 	Version *string `json:"version,omitempty"`
 
@@ -101,6 +102,9 @@ type LimitadorSpec struct {
 	// Sets the level of verbosity
 	// +optional
 	Verbosity *VerbosityLevel `json:"verbosity,omitempty"`
+
+	// +optional
+	Image *string `json:"image,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/limitador/image.go b/pkg/limitador/image.go
@@ -6,10 +6,14 @@ import (
 	"k8s.io/utils/env"
 )
 
+const (
+	LimitadorRepository = "quay.io/kuadrant/limitador"
+)
+
 var (
-	defaultImageVersion = fmt.Sprintf("%s:%s", LimitadorRepository, "latest")
+	defaultImage = fmt.Sprintf("%s:%s", LimitadorRepository, "latest")
 )
 
-func GetLimitadorImageVersion() string {
-	return env.GetString("RELATED_IMAGE_LIMITADOR", defaultImageVersion)
+func GetLimitadorImage() string {
+	return env.GetString("RELATED_IMAGE_LIMITADOR", defaultImage)
 }
diff --git a/pkg/limitador/image_test.go b/pkg/limitador/image_test.go
@@ -7,5 +7,5 @@ import (
 )
 
 func TestLimitadorDefaultImage(t *testing.T) {
-	assert.Equal(t, GetLimitadorImageVersion(), "quay.io/kuadrant/limitador:latest")
+	assert.Equal(t, GetLimitadorImage(), "quay.io/kuadrant/limitador:latest")
 }
diff --git a/pkg/limitador/k8s_objects.go b/pkg/limitador/k8s_objects.go
@@ -16,8 +16,7 @@ import (
 )
 
 const (
-	LimitadorRepository = "quay.io/kuadrant/limitador"
-	StatusEndpoint      = "/status"
+	StatusEndpoint = "/status"
 )
 
 func Service(limitador *limitadorv1alpha1.Limitador) *v1.Service {
@@ -56,11 +55,17 @@ func Service(limitador *limitadorv1alpha1.Limitador) *v1.Service {
 func Deployment(limitador *limitadorv1alpha1.Limitador, deploymentOptions DeploymentOptions) *appsv1.Deployment {
 	replicas := limitador.GetReplicas()
 
-	image := GetLimitadorImageVersion()
+	image := GetLimitadorImage()
+
+	// deprecated
 	if limitador.Spec.Version != nil {
 		image = fmt.Sprintf("%s:%s", LimitadorRepository, *limitador.Spec.Version)
 	}
 
+	if limitador.Spec.Image != nil {
+		image = *limitador.Spec.Image
+	}
+
 	return &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "Deployment",