Skip to content

OPRUN-4439: Fix test operator controller pod probes #614

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

Open
perdasilva wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OPRUN-4439: Fix test operator controller pod probes #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions openshift/tests-extension/pkg/bindata/operator/operator.go
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions openshift/tests-extension/test/olmv1-incompatible.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
"github.com/openshift/origin/test/extended/util/image"
"sigs.k8s.io/controller-runtime/pkg/client"

catalogdata "github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/bindata/catalog"
Expand All @@ -30,7 +29,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation

// Using the shell image provided by origin as the controller image.
// The image is mirrored into disconnected environments for testing.
"{{ TEST-CONTROLLER }}": image.ShellImage(),
"{{ TEST-CONTROLLER }}": "registry.k8s.io/e2e-test-images/busybox:1.36.1-1",
Copy link
Contributor

@kuiwang02 kuiwang02 Jan 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perdasilva it seems the cases in this g.Describe will run in disc env because there is no [Skipped:Disconnected] in case title.

if you change it, I am not sure if it still support disc env. so, I suggest
1, change it to https://github.com/openshift/origin/blob/main/test/extended/util/image/image.go#L54 for trying.
2, please take prow job periodic-ci-openshift-release-master-nightly-4.22-e2e-metal-ipi-ovn-ipv6 to run this case in this PR

if it pass, it is ok. or else, it will cause component readiness red.
if it does not pass with above suggestion, I am sorry I have no idea except for adding [Skipped:Disconnected] back for this case.

}
unique, nsName, ccName, opName = helpers.NewCatalogAndClusterBundles(ctx, replacements,
catalogdata.AssetNames, catalogdata.Asset,
Expand Down
4 changes: 2 additions & 2 deletions openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ spec:
readOnly: true
livenessProbe:
httpGet:
path: /healthz
path: /live
port: 8081
initialDelaySeconds: 15
periodSeconds: 20
name: manager
readinessProbe:
httpGet:
path: /readyz
path: /ready
port: 8081
initialDelaySeconds: 5
periodSeconds: 10
Expand Down
9 changes: 5 additions & 4 deletions openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ data:
httpd.sh: |
#!/bin/sh
echo "Version 1.2.0"
echo true > /var/www/started
echo true > /var/www/ready
echo true > /var/www/live
exec httpd -f -h /var/www -p 8081
mkdir -p /tmp/www
echo true > /tmp/www/started
echo true > /tmp/www/ready
echo true > /tmp/www/live
exec httpd -f -h /tmp/www -p 8081