Remove more OpenShift 3 cruft from Helm/Bundle code

Moritz Clasmeier · Moritz Clasmeier · commit ecf43d33178f · 2026-04-09T09:44:38.000+02:00
diff --git a/image/templates/helm/stackrox-secured-cluster/internal/cluster-config.yaml.tpl.htpl b/image/templates/helm/stackrox-secured-cluster/internal/cluster-config.yaml.tpl.htpl
@@ -7,7 +7,7 @@ clusterConfig:
     {{- if not ._rox.env.openshift }}
     type: KUBERNETES_CLUSTER
     {{- else }}
-    type: {{ if eq (int ._rox.env.openshift) 4 -}} OPENSHIFT4_CLUSTER {{- else -}} OPENSHIFT_CLUSTER {{ end }}
+    type: OPENSHIFT4_CLUSTER
     {{- end }}
     mainImage: {{ coalesce ._rox.image.main._abbrevImageRef ._rox.image.main.fullRef }}
     collectorImage: {{ coalesce ._rox.image.collector._abbrevImageRef ._rox.image.collector.fullRef }}
diff --git a/image/templates/helm/stackrox-secured-cluster/internal/compatibility-translation.yaml b/image/templates/helm/stackrox-secured-cluster/internal/compatibility-translation.yaml
@@ -12,7 +12,7 @@ cluster:
     clusterName: {{ .value }}
   type: |
     env:
-      openshift: {{ if eq .rawValue "OPENSHIFT4_CLUSTER" }} 4 {{ else }} {{ eq .rawValue "OPENSHIFT_CLUSTER" }} {{ end }}
+      openshift: {{ eq .rawValue "OPENSHIFT4_CLUSTER" }}
 
 endpoint:
   central: |
diff --git a/image/templates/helm/stackrox-secured-cluster/sensor-chart-upgrade.md.htpl b/image/templates/helm/stackrox-secured-cluster/sensor-chart-upgrade.md.htpl
@@ -106,7 +106,7 @@ Here is the list of old and new configuration options:
 |Old configuration option |New configuration option |
 |-------------------------|-------------------------|
 | `cluster.name` | `clusterName` |
-| `cluster.type` | Set `env.openshift` to `true` for `cluster.type=OPENSHIFT_CLUSTER` and `false` for `cluster.type=KUBERNETES_CLUSTER`. Leave unset to automatically detect (recommended). |
+| `cluster.type` | Set `env.openshift` to `true` for `cluster.type=OPENSHIFT4_CLUSTER` and `false` for `cluster.type=KUBERNETES_CLUSTER`. Leave unset to automatically detect (recommended). |
 | `endpoint.central` | `centralEndpoint` |
 | `endpoint.advertised` | `sensor.endpoint` |
 | `image.repository.main` | `image.main.name` |
diff --git a/image/templates/helm/stackrox-secured-cluster/values.yaml.htpl b/image/templates/helm/stackrox-secured-cluster/values.yaml.htpl
@@ -21,11 +21,7 @@ admissionControl:
   [<- else >]
   failurePolicy: Ignore
   [<- end >]
-  [<- if eq .ClusterType "OPENSHIFT_CLUSTER" >]
-  listenOnEvents: false
-  [<- else >]
   listenOnEvents: true
-  [<- end >]
   enforce: [< or .AdmissionControllerEnabled .AdmissionControlEnforceOnUpdates >]
   disableBypass: [< default false .DisableBypass >]
 
