Skip to content

ROX-12637: make kuttl tests tolerate pause reconcile status condition #17023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 30, 2025
Merged

ROX-12637: make kuttl tests tolerate pause reconcile status condition #17023

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4301634
ROX-12637: re-implement CR checks using CEL
porridge Sep 25, 2025
e5a571e
break one of the checks on purpose to make sure the logic works
porridge Sep 25, 2025
7e24b53
Revert "break one of the checks on purpose to make sure the logic works"
porridge Sep 25, 2025
41a6c00
before upgrade, assert using CEL, add a describe
porridge Sep 25, 2025
01c41c9
assert the Paused condition in upgraded cases
porridge Sep 25, 2025
258c5a1
Use lib with pause condition.
porridge Sep 25, 2025
a4ca604
flip to the merged commit
porridge Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ replace github.com/nxadm/tail => github.com/stackrox/tail v1.4.9-0.2024080613095
// we currently depend on.
// It includes a number of features and bug fixes which we faced in StackRox. We use this fork
// primarily to iterate faster. See https://issues.redhat.com/browse/ROX-7911
replace github.com/operator-framework/helm-operator-plugins => github.com/stackrox/helm-operator v0.0.12-0.20250211113659-1b2840226a8b
replace github.com/operator-framework/helm-operator-plugins => github.com/stackrox/helm-operator v0.8.1-0.20250925110425-984a0356c488

// @stackrox/sensor-ecosystem
replace (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions operator/tests/central/central-misc/064-assert-after-unset-expose-monitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand Down
29 changes: 12 additions & 17 deletions operator/tests/common/central-cr-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,19 @@ collectors:
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=scanner-v4-matcher
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=scanner-v4-db
# Please keep the above lists in sync with pods-debug.yaml
timeout: 1500
---
apiVersion: platform.stackrox.io/v1alpha1
kind: Central
metadata:
- command: retry-kubectl.sh describe central.platform.stackrox.io -n $NAMESPACE stackrox-central-services
resourceRefs:
- apiVersion: platform.stackrox.io/v1alpha1
kind: Central
name: stackrox-central-services
status:
conditions:
- status: "True"
type: Deployed
- status: "True"
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: ProxyConfigFailed
- status: "False"
type: ReleaseFailed
ref: central_cr
assertAll:
- celExpr: "central_cr.status.conditions.filter(c, c.type=='Deployed').exists(c, c.status=='True')"
- celExpr: "central_cr.status.conditions.filter(c, c.type=='Initialized').exists(c, c.status=='True')"
- celExpr: "central_cr.status.conditions.filter(c, c.type=='Irreconcilable').exists(c, c.status=='False')"
- celExpr: "central_cr.status.conditions.filter(c, c.type=='ProxyConfigFailed').exists(c, c.status=='False')"
- celExpr: "central_cr.status.conditions.filter(c, c.type=='ReleaseFailed').exists(c, c.status=='False')"
timeout: 1500
---
apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 2 additions & 0 deletions operator/tests/common/central-cr-without-scanner-v4-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand Down
2 changes: 2 additions & 0 deletions operator/tests/common/monitoring-auth-reader-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand Down
2 changes: 2 additions & 0 deletions operator/tests/common/secured-cluster-cr-assert-no-scanner-v4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand Down
30 changes: 12 additions & 18 deletions operator/tests/common/secured-cluster-cr-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,19 @@ collectors:
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=admission-control
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=collector
# Please keep the above lists in sync with pods-debug.yaml
timeout: 1500
---
apiVersion: platform.stackrox.io/v1alpha1
kind: SecuredCluster
metadata:
- command: retry-kubectl.sh describe securedcluster.platform.stackrox.io -n $NAMESPACE stackrox-secured-cluster-services
resourceRefs:
- apiVersion: platform.stackrox.io/v1alpha1
kind: SecuredCluster
name: stackrox-secured-cluster-services
status:
clusterName: testing-cluster
conditions:
- status: "True"
type: Deployed
- status: "True"
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: ProxyConfigFailed
- status: "False"
type: ReleaseFailed
ref: sc_cr
assertAll:
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Deployed').exists(c, c.status=='True')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Initialized').exists(c, c.status=='True')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Irreconcilable').exists(c, c.status=='False')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='ProxyConfigFailed').exists(c, c.status=='False')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='ReleaseFailed').exists(c, c.status=='False')"
timeout: 1500
---
apiVersion: apps/v1
kind: Deployment
Expand Down
4 changes: 4 additions & 0 deletions operator/tests/common/upgrade-assert.envsubst.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand All @@ -29,6 +31,8 @@ status:
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "False"
Expand Down
2 changes: 2 additions & 0 deletions operator/tests/securedcluster/sc-basic/020-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ status:
type: Initialized
- status: "True"
type: Irreconcilable
- status: "False"
type: Paused
- status: "False"
type: ProxyConfigFailed
- status: "Unknown"
Expand Down
30 changes: 12 additions & 18 deletions ...tests/upgrade/upgrade/010-assert-central-cr-with-pre-4-9-admission-controller-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,19 @@ collectors:
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=admission-control
- command: retry-kubectl.sh describe pod -n $NAMESPACE -l app=collector
# Please keep the above lists in sync with pods-debug.yaml
timeout: 1500
---
apiVersion: platform.stackrox.io/v1alpha1
kind: SecuredCluster
metadata:
- command: retry-kubectl.sh describe securedcluster.platform.stackrox.io -n $NAMESPACE stackrox-secured-cluster-services
resourceRefs:
- apiVersion: platform.stackrox.io/v1alpha1
kind: SecuredCluster
name: stackrox-secured-cluster-services
status:
clusterName: testing-cluster
conditions:
- status: "True"
type: Deployed
- status: "True"
type: Initialized
- status: "False"
type: Irreconcilable
- status: "False"
type: ProxyConfigFailed
- status: "False"
type: ReleaseFailed
ref: sc_cr
assertAll:
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Deployed').exists(c, c.status=='True')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Initialized').exists(c, c.status=='True')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='Irreconcilable').exists(c, c.status=='False')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='ProxyConfigFailed').exists(c, c.status=='False')"
- celExpr: "sc_cr.status.conditions.filter(c, c.type=='ReleaseFailed').exists(c, c.status=='False')"
timeout: 1500
---
apiVersion: apps/v1
kind: Deployment
Expand Down
Loading