Adjust kuttl tests to match StatefulSet instead of Deployment

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Oct 30, 2023 · fda8e38 · fda8e38
1 parent f940b98
commit fda8e38
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 48 deletions.
diff --git a/api/bases/glance.openstack.org_glances.yaml b/api/bases/glance.openstack.org_glances.yaml
@@ -1156,12 +1156,6 @@ spec:
                 type: array
               databaseHostname:
                 type: string
-              glanceAPIExternalReadyCount:
-                format: int32
-                type: integer
-              glanceAPIInternalReadyCount:
-                format: int32
-                type: integer
               hash:
                 additionalProperties:
                   type: string

diff --git a/api/v1beta1/glance_types.go b/api/v1beta1/glance_types.go
@@ -167,12 +167,6 @@ type GlanceStatus struct {
 
 	// Glance Database Hostname
 	DatabaseHostname string `json:"databaseHostname,omitempty"`
-
-	// ReadyCount of internal and admin Glance API instance
-	GlanceAPIInternalReadyCount int32 `json:"glanceAPIInternalReadyCount,omitempty"`
-
-	// ReadyCount of external and admin Glance API instance
-	GlanceAPIExternalReadyCount int32 `json:"glanceAPIExternalReadyCount,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/glance.openstack.org_glances.yaml b/config/crd/bases/glance.openstack.org_glances.yaml
@@ -1156,12 +1156,6 @@ spec:
                 type: array
               databaseHostname:
                 type: string
-              glanceAPIExternalReadyCount:
-                format: int32
-                type: integer
-              glanceAPIInternalReadyCount:
-                format: int32
-                type: integer
               hash:
                 additionalProperties:
                   type: string

diff --git a/controllers/glance_controller.go b/controllers/glance_controller.go
@@ -610,11 +610,10 @@ func (r *GlanceReconciler) reconcileNormal(ctx context.Context, instance *glance
 		instance.Status.APIEndpoints = map[string]string{}
 	}
 
-	// Mirror internal GlanceAPI status' APIEndpoints and ReadyCount to this parent CR
+	// Mirror internal GlanceAPI status' APIEndpoints to this parent CR
 	if glanceAPI.Status.APIEndpoints != nil {
 		instance.Status.APIEndpoints = glanceAPI.Status.APIEndpoints
 	}
-	instance.Status.GlanceAPIInternalReadyCount = glanceAPI.Status.ReadyCount
 
 	// Get internal GlanceAPI's condition status for comparison with external below
 	internalAPICondition := glanceAPI.Status.Conditions.Mirror(glancev1.GlanceAPIReadyCondition)
@@ -635,11 +634,10 @@ func (r *GlanceReconciler) reconcileNormal(ctx context.Context, instance *glance
 		r.Log.Info(fmt.Sprintf("Deployment %s successfully reconciled - operation: %s", instance.Name, string(op)))
 	}
 
-	// Mirror external GlanceAPI status' APIEndpoints and ReadyCount to this parent CR
+	// Mirror external GlanceAPI status' APIEndpoints to this parent CR
 	if glanceAPI.Status.APIEndpoints != nil {
 		instance.Status.APIEndpoints[string(endpoint.EndpointPublic)] = glanceAPI.Status.APIEndpoints[string(endpoint.EndpointPublic)]
 	}
-	instance.Status.GlanceAPIExternalReadyCount = glanceAPI.Status.ReadyCount
 
 	// Get external GlanceAPI's condition status and compare it against priority of internal GlanceAPI's condition
 	externalAPICondition := glanceAPI.Status.Conditions.Mirror(glancev1.GlanceAPIReadyCondition)

diff --git a/pkg/glanceapi/deployment.go → pkg/glanceapi/statefulset.go b/pkg/glanceapi/deployment.go → pkg/glanceapi/statefulset.go
diff --git a/test/functional/glance_controller_test.go b/test/functional/glance_controller_test.go
@@ -39,8 +39,6 @@ var _ = Describe("Glance controller", func() {
 				g.Expect(glance.Status.Conditions).To(HaveLen(12))
 				g.Expect(glance.Status.DatabaseHostname).To(Equal(""))
 				g.Expect(glance.Status.APIEndpoints).To(BeEmpty())
-				g.Expect(glance.Status.GlanceAPIExternalReadyCount).To(Equal(int32(0)))
-				g.Expect(glance.Status.GlanceAPIInternalReadyCount).To(Equal(int32(0)))
 			}, timeout, interval).Should(Succeed())
 		})
 		It("reports InputReady False as secret is not found", func() {

diff --git a/test/functional/sample_test.go b/test/functional/sample_test.go
@@ -64,8 +64,6 @@ var _ = Describe("Samples", func() {
 				g.Expect(glance.Status.Conditions).To(HaveLen(12))
 				g.Expect(glance.Status.DatabaseHostname).To(Equal(""))
 				g.Expect(glance.Status.APIEndpoints).To(BeEmpty())
-				g.Expect(glance.Status.GlanceAPIExternalReadyCount).To(Equal(int32(0)))
-				g.Expect(glance.Status.GlanceAPIInternalReadyCount).To(Equal(int32(0)))
 			}, timeout, interval).Should(Succeed())
 		})
 	})

diff --git a/test/kuttl/tests/glance_scale/01-assert.yaml b/test/kuttl/tests/glance_scale/01-assert.yaml
@@ -37,8 +37,6 @@ spec:
   storageRequest: 10G
 status:
   databaseHostname: openstack
-  glanceAPIExternalReadyCount: 1
-  glanceAPIInternalReadyCount: 1
 ---
 apiVersion: glance.openstack.org/v1beta1
 kind: GlanceAPI
@@ -55,8 +53,6 @@ spec:
     database: GlanceDatabasePassword
     service: GlancePassword
   replicas: 1
-status:
-  readyCount: 1
 ---
 apiVersion: glance.openstack.org/v1beta1
 kind: GlanceAPI
@@ -73,11 +69,9 @@ spec:
     database: GlanceDatabasePassword
     service: GlancePassword
   replicas: 1
-status:
-  readyCount: 1
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-external-api
 spec:
@@ -119,7 +113,7 @@ status:
   replicas: 1
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-internal-api
 spec:

diff --git a/test/kuttl/tests/glance_scale/02-assert.yaml b/test/kuttl/tests/glance_scale/02-assert.yaml
@@ -14,12 +14,9 @@ spec:
     replicas: 2
   glanceAPIExternal:
     replicas: 2
-status:
-  glanceAPIExternalReadyCount: 2
-  glanceAPIInternalReadyCount: 2
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-external-api
 spec:
@@ -29,7 +26,7 @@ status:
   replicas: 2
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-internal-api
 spec:

diff --git a/test/kuttl/tests/glance_scale/03-assert.yaml b/test/kuttl/tests/glance_scale/03-assert.yaml
@@ -14,12 +14,9 @@ spec:
     replicas: 1
   glanceAPIExternal:
     replicas: 1
-status:
-  glanceAPIExternalReadyCount: 1
-  glanceAPIInternalReadyCount: 1
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-external-api
 spec:
@@ -29,7 +26,7 @@ status:
   replicas: 1
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-internal-api
 spec:

diff --git a/test/kuttl/tests/glance_scale/04-assert.yaml b/test/kuttl/tests/glance_scale/04-assert.yaml
@@ -16,14 +16,14 @@ spec:
     replicas: 0
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-external-api
 spec:
   replicas: 0
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-internal-api
 spec:

diff --git a/test/kuttl/tests/glance_scale/05-errors.yaml b/test/kuttl/tests/glance_scale/05-errors.yaml
@@ -27,12 +27,12 @@ metadata:
   name: glance-internal
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-external-api
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: StatefulSet
 metadata:
   name: glance-internal-api
 ---