Include Operand deprecation status in Infinispan CR .status. Resolves i…

…nfinispan#2084
ryanemerson · May 16, 2024 · d5f4335 · d5f4335
1 parent a19b424
commit d5f4335
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/api/v1/infinispan_types.go b/api/v1/infinispan_types.go
@@ -607,6 +607,9 @@ const (
 )
 
 type OperandStatus struct {
+	// Whether the Operand has been deprecated and is subject for removal in a subsequent release
+	// +optional
+	Deprecated bool `json:"deprecated,omitempty"`
 	// The Image being used by the Operand currently being reconciled
 	// +optional
 	Image string `json:"image,omitempty"`

diff --git a/config/crd/bases/infinispan.org_infinispans.yaml b/config/crd/bases/infinispan.org_infinispans.yaml
@@ -2321,6 +2321,10 @@ spec:
               operand:
                 description: The Operand status
                 properties:
+                  deprecated:
+                    description: Whether the Operand has been deprecated and is subject
+                      for removal in a subsequent release
+                    type: boolean
                   image:
                     description: The Image being used by the Operand currently being
                       reconciled

diff --git a/pkg/reconcile/pipeline/infinispan/handler/manage/conditions.go b/pkg/reconcile/pipeline/infinispan/handler/manage/conditions.go
@@ -247,8 +247,9 @@ func OperandStatus(i *ispnv1.Infinispan, phase ispnv1.OperandPhase, operand vers
 	}
 
 	return ispnv1.OperandStatus{
-		Image:   img,
-		Phase:   phase,
-		Version: operand.Ref(),
+		Deprecated: operand.Deprecated,
+		Image:      img,
+		Phase:      phase,
+		Version:    operand.Ref(),
 	}
 }
diff --git a/test/e2e/infinispan/upgrade_operand_test.go b/test/e2e/infinispan/upgrade_operand_test.go
@@ -37,6 +37,7 @@ func TestOperandUpgrade(t *testing.T) {
 	testKube.CreateInfinispan(spec, tutils.Namespace)
 	testKube.WaitForInfinispanPods(replicas, tutils.SinglePodTimeout, spec.Name, tutils.Namespace)
 	ispn := testKube.WaitForInfinispanCondition(spec.Name, spec.Namespace, ispnv1.ConditionWellFormed)
+	assert.True(t, ispn.Status.Operand.Deprecated)
 
 	// Follow the support Operand graph, updating the cluster to each non-cve release
 	for i := 1; i < len(versionManager.Operands); i++ {

diff --git a/test/e2e/utils/common.go b/test/e2e/utils/common.go
@@ -40,7 +40,8 @@ var VersionManager = func() *version.Manager {
 		_ = os.Setenv(ispnv1.OperatorOperandVersionEnvVarName, `[{
 			"downstream-version": "0.1.0",
 			"upstream-version": "13.0.10",
-			"image": "quay.io/infinispan/server:13.0.10.Final"
+			"image": "quay.io/infinispan/server:13.0.10.Final",
+			"deprecated": true
 		},{
 			"downstream-version": "0.2.0-1",
 			"upstream-version": "14.0.1",