UPSTREAM: <carry>: Update test-operator startup script to fix pod probe endpoints

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

Author: Per Goncalves da Silva

openshift/tests-extension/pkg/bindata/operator/operator.go

@@ -9,6 +9,7 @@ import (
 	//nolint:staticcheck // ST1001: dot-imports for readability
 	. "github.com/onsi/gomega"
 
+	"github.com/openshift/origin/test/extended/util/image"
 	corev1 "k8s.io/api/core/v1"
 	apiextclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -133,7 +134,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 }}": "registry.k8s.io/e2e-test-images/busybox:1.36.1-1",
+			"{{ TEST-CONTROLLER }}": image.ShellImage(),
 		}
 		unique, nsName, ccName, opName = helpers.NewCatalogAndClusterBundles(ctx, replacements,
 			catalogdata.AssetNames, catalogdata.Asset,

openshift/tests-extension/test/olmv1.go

@@ -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

openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml

@@ -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
+    python3 -m http.server 8081 --directory /tmp/www