Merge pull request #567 from tmshort/use-httpd

OPRUN-4300: Use busybox/httpd to simulate probes

Author: openshift-merge-bot[bot]

openshift/tests-extension/test/olmv1.go

@@ -9,7 +9,6 @@ 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"
@@ -134,7 +133,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",
 		}
 		unique, nsName, ccName, opName = helpers.NewCatalogAndClusterBundles(ctx, replacements,
 			catalogdata.AssetNames, catalogdata.Asset,

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

@@ -52,12 +52,21 @@ spec:
               labels:
                 control-plane: controller-manager
             spec:
+              volumes:
+              - name: scripts
+                configMap:
+                  name: httpd-script
+                  defaultMode: 0755
               containers:
               - args:
-                command:
-                - sleep
-                - "1000"
+                command: ["/scripts/httpd.sh"]
                 image: "{{ TEST-CONTROLLER }}"
+                ports:
+                  - containerPort: 8081
+                volumeMounts:
+                  - name: scripts
+                    mountPath: /scripts
+                    readOnly: true
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -83,6 +92,12 @@ spec:
                   capabilities:
                     drop:
                     - ALL
+                startupProbe:
+                  httpGet:
+                    path: /started
+                    port: 8081
+                  failureThreshold: 30
+                  periodSeconds: 10
               securityContext:
                 runAsNonRoot: true
               serviceAccountName: default

openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: httpd-script
+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