openshift · dfajmon · Jul 29, 2026
diff --git a/...or/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-main.yaml b/...or/config/openshift/cluster-storage-operator/openshift-cluster-storage-operator-main.yaml
@@ -7,6 +7,10 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
+  tls-scanner-tool:
+    name: tls-scanner
+    namespace: tls-scanner
+    tag: tls-scanner-tool
 build_root:
   from_repository: true
 images:
@@ -218,6 +222,21 @@ tests:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: eastus
     workflow: hypershift-azure-aks-e2e
+- always_run: false
+  as: tls-scanner-vsphere-problem-detector
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      SCAN_NAMESPACE: openshift-cluster-storage-operator
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: main
   org: openshift

diff --git a/...g/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.23.yaml b/...g/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-4.23.yaml
@@ -7,6 +7,10 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
+  tls-scanner-tool:
+    name: tls-scanner
+    namespace: tls-scanner
+    tag: tls-scanner-tool
 build_root:
   from_repository: true
 images:
@@ -218,6 +222,21 @@ tests:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: eastus
     workflow: hypershift-azure-aks-e2e
+- always_run: false
+  as: tls-scanner-vsphere-problem-detector
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      SCAN_NAMESPACE: openshift-cluster-storage-operator
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-4.23
   org: openshift

diff --git a/...ig/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-5.0.yaml b/...ig/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-5.0.yaml
@@ -7,6 +7,10 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
+  tls-scanner-tool:
+    name: tls-scanner
+    namespace: tls-scanner
+    tag: tls-scanner-tool
 build_root:
   from_repository: true
 images:
@@ -219,6 +223,21 @@ tests:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: eastus
     workflow: hypershift-azure-aks-e2e
+- always_run: false
+  as: tls-scanner-vsphere-problem-detector
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      SCAN_NAMESPACE: openshift-cluster-storage-operator
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-5.0
   org: openshift

diff --git a/...ig/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-5.1.yaml b/...ig/openshift/cluster-storage-operator/openshift-cluster-storage-operator-release-5.1.yaml
@@ -7,6 +7,10 @@ base_images:
     name: hypershift-tests
     namespace: hypershift
     tag: latest
+  tls-scanner-tool:
+    name: tls-scanner
+    namespace: tls-scanner
+    tag: tls-scanner-tool
 build_root:
   from_repository: true
 images:
@@ -218,6 +222,21 @@ tests:
       ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true"
       HYPERSHIFT_AZURE_LOCATION: eastus
     workflow: hypershift-azure-aks-e2e
+- always_run: false
+  as: tls-scanner-vsphere-problem-detector
+  optional: true
+  steps:
+    cluster_profile: vsphere-elastic
+    env:
+      SCAN_NAMESPACE: openshift-cluster-storage-operator
+      SCANNER_CPU: "1"
+      SCANNER_MEMORY: 1Gi
+      TLS_13_ENABLE_TLS_ADHERENCE: "true"
+      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
+    test:
+    - ref: tls-13
+    - ref: tls-scanner-run
+    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-5.1
   org: openshift

diff --git a/...or/config/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-main.yaml b/...or/config/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-main.yaml
@@ -7,10 +7,6 @@ base_images:
     name: tests-private
     namespace: ci
     tag: "4.22"
-  tls-scanner-tool:
-    name: tls-scanner
-    namespace: tls-scanner
-    tag: tls-scanner-tool
 binary_build_commands: make
 build_root:
   from_repository: true
@@ -84,21 +80,6 @@ tests:
     env:
       PROJECT_NAME: vsphere-problem-detector
     workflow: openshift-ci-security
-- always_run: false
-  as: tls-scanner-vsphere-problem-detector
-  optional: true
-  steps:
-    cluster_profile: vsphere-elastic
-    env:
-      SCAN_NAMESPACE: openshift-cluster-storage-operator
-      SCANNER_CPU: "1"
-      SCANNER_MEMORY: 1Gi
-      TLS_13_ENABLE_TLS_ADHERENCE: "true"
-      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
-    test:
-    - ref: tls-13
-    - ref: tls-scanner-run
-    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: main
   org: openshift

diff --git a/...g/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-4.23.yaml b/...g/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-4.23.yaml
@@ -7,10 +7,6 @@ base_images:
     name: tests-private
     namespace: ci
     tag: "4.22"
-  tls-scanner-tool:
-    name: tls-scanner
-    namespace: tls-scanner
-    tag: tls-scanner-tool
 binary_build_commands: make
 build_root:
   from_repository: true
@@ -84,21 +80,6 @@ tests:
     env:
       PROJECT_NAME: vsphere-problem-detector
     workflow: openshift-ci-security
-- always_run: false
-  as: tls-scanner-vsphere-problem-detector
-  optional: true
-  steps:
-    cluster_profile: vsphere-elastic
-    env:
-      SCAN_NAMESPACE: openshift-cluster-storage-operator
-      SCANNER_CPU: "1"
-      SCANNER_MEMORY: 1Gi
-      TLS_13_ENABLE_TLS_ADHERENCE: "true"
-      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
-    test:
-    - ref: tls-13
-    - ref: tls-scanner-run
-    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-4.23
   org: openshift

diff --git a/...ig/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-5.0.yaml b/...ig/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-5.0.yaml
@@ -7,10 +7,6 @@ base_images:
     name: tests-private
     namespace: ci
     tag: "4.22"
-  tls-scanner-tool:
-    name: tls-scanner
-    namespace: tls-scanner
-    tag: tls-scanner-tool
 binary_build_commands: make
 build_root:
   from_repository: true
@@ -85,21 +81,6 @@ tests:
     env:
       PROJECT_NAME: vsphere-problem-detector
     workflow: openshift-ci-security
-- always_run: false
-  as: tls-scanner-vsphere-problem-detector
-  optional: true
-  steps:
-    cluster_profile: vsphere-elastic
-    env:
-      SCAN_NAMESPACE: openshift-cluster-storage-operator
-      SCANNER_CPU: "1"
-      SCANNER_MEMORY: 1Gi
-      TLS_13_ENABLE_TLS_ADHERENCE: "true"
-      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
-    test:
-    - ref: tls-13
-    - ref: tls-scanner-run
-    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-5.0
   org: openshift

diff --git a/...ig/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-5.1.yaml b/...ig/openshift/vsphere-problem-detector/openshift-vsphere-problem-detector-release-5.1.yaml
@@ -7,10 +7,6 @@ base_images:
     name: tests-private
     namespace: ci
     tag: "4.22"
-  tls-scanner-tool:
-    name: tls-scanner
-    namespace: tls-scanner
-    tag: tls-scanner-tool
 binary_build_commands: make
 build_root:
   from_repository: true
@@ -84,21 +80,6 @@ tests:
     env:
       PROJECT_NAME: vsphere-problem-detector
     workflow: openshift-ci-security
-- always_run: false
-  as: tls-scanner-vsphere-problem-detector
-  optional: true
-  steps:
-    cluster_profile: vsphere-elastic
-    env:
-      SCAN_NAMESPACE: openshift-cluster-storage-operator
-      SCANNER_CPU: "1"
-      SCANNER_MEMORY: 1Gi
-      TLS_13_ENABLE_TLS_ADHERENCE: "true"
-      TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
-    test:
-    - ref: tls-13
-    - ref: tls-scanner-run
-    workflow: ipi-vsphere
 zz_generated_metadata:
   branch: release-5.1
   org: openshift

diff --git a/...penshift/cluster-storage-operator/openshift-cluster-storage-operator-main-presubmits.yaml b/...penshift/cluster-storage-operator/openshift-cluster-storage-operator-main-presubmits.yaml
@@ -2064,6 +2064,91 @@ presubmits:
         secret:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )security,?($|\s.*)
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^main$
+    - ^main-
+    cluster: vsphere02
+    context: ci/prow/tls-scanner-vsphere-problem-detector
+    decorate: true
+    decoration_config:
+      sparse_checkout_files:
+      - .ci-operator.yaml
+      - Dockerfile
+    labels:
+      ci-operator.openshift.io/cloud: vsphere
+      ci-operator.openshift.io/cloud-cluster-profile: vsphere-elastic
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-cluster-storage-operator-main-tls-scanner-vsphere-problem-detector
+    optional: true
+    rerun_command: /test tls-scanner-vsphere-problem-detector
+    spec:
+      containers:
+      - args:
+        - --gcs-upload-secret=/secrets/gcs/service-account.json
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=tls-scanner-vsphere-problem-detector
+        command:
+        - ci-operator
+        env:
+        - name: HTTP_SERVER_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
+        imagePullPolicy: Always
+        name: ""
+        ports:
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )tls-scanner-vsphere-problem-detector,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: