fix and test (#193)

Signed-off-by: gazarenkov <[email protected]>

pkg/model/deployment.go

@@ -85,19 +85,18 @@ func (b *BackstageDeployment) addToModel(model *BackstageModel, backstage bsv1.B
  }
  b.deployment.Spec.Template.ObjectMeta.Annotations[ExtConfigHashAnnotation] = model.ExternalConfig.GetHash()
 
- if err := b.setDeployment(backstage); err != nil {
- return false, err
- }
-
  model.backstageDeployment = b
  model.setRuntimeObject(b)
 
  // override image with env var
- // [GA] Do we need this feature?
  if os.Getenv(BackstageImageEnvVar) != "" {
  b.setImage(ptr.To(os.Getenv(BackstageImageEnvVar)))
  }
 
+ if err := b.setDeployment(backstage); err != nil {
+ return false, err
+ }
+
  return true, nil
 }
 

pkg/model/deployment_test.go

@@ -16,6 +16,7 @@ package model
 
 import (
  "context"
+ "os"
  "testing"
 
  apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -169,6 +170,35 @@ spec:
  assert.Equal(t, "my-vol", model.backstageDeployment.deployment.Spec.Template.Spec.Volumes[3].Name)
 }
 
+func TestImageInCRPrevailsOnEnvVar(t *testing.T) {
+ bs := *deploymentTestBackstage.DeepCopy()
+ bs.Spec.Deployment = &bsv1.BackstageDeployment{}
+ bs.Spec.Deployment.Patch = &apiextensionsv1.JSON{
+ Raw: []byte(`
+spec:
+ template:
+ spec:
+ containers:
+ - name: backstage-backend
+ image: cr-image
+`),
+ }
+
+ os.Setenv(BackstageImageEnvVar, "envvar-image")
+
+ testObj := createBackstageTest(bs).withDefaultConfig(true)
+
+ model, err := InitObjects(context.TODO(), bsv1.Backstage{}, testObj.externalConfig, true, true, testObj.scheme)
+ assert.NoError(t, err)
+ // make sure env var works
+ assert.Equal(t, "envvar-image", model.backstageDeployment.container().Image)
+
+ model, err = InitObjects(context.TODO(), bs, testObj.externalConfig, true, true, testObj.scheme)
+ assert.NoError(t, err)
+ // make sure image defined in CR overrides
+ assert.Equal(t, "cr-image", model.backstageDeployment.container().Image)
+}
+
 // to remove when stop supporting v1alpha1
 func TestDeploymentFieldPrevailsOnDeprecated(t *testing.T) {
  bs := *deploymentTestBackstage.DeepCopy()