• X
• Mastodon
• LinkedIn
• Facebook

central/telemetry/centralclient/client.go (1)

117-119: Inconsistency: code rejects OpenShift 3.x clusters but telemetry still reports deprecated enum value.

OpenShift 3.x is explicitly rejected in validation logic (pkg/cluster/validation.go rejects clusters with this type, stating "OpenShift 3.x is not supported anymore"). However, telemetry here continues using the deprecated OPENSHIFT_CLUSTER enum instead of OPENSHIFT4_CLUSTER.

This same pattern appears in sensor/kubernetes/telemetry/gatherers/cluster.go and other codebase locations still referencing the deprecated enum. Since OpenShift 3.x clusters won't be accepted by the system, the telemetry can safely migrate to OPENSHIFT4_CLUSTER to:

• Provide accurate metrics (no confusion about OpenShift 3 vs 4)
• Align with the system's actual support scope
• Remove deprecated enum usage across the codebase

Update to OPENSHIFT4_CLUSTER and audit other locations using the deprecated enum value for consistency.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@central/telemetry/centralclient/client.go` around lines 117 - 119, Telemetry
is reporting the deprecated enum value OPENSHIFT_CLUSTER while validation
rejects OpenShift 3.x; change the value assigned to orchestrator from
storage.ClusterType_OPENSHIFT_CLUSTER.String() to
storage.ClusterType_OPENSHIFT4_CLUSTER.String() in the client.go code (update
the orchestrator assignment), and audit other usages such as
sensor/kubernetes/telemetry/gatherers/cluster.go to replace
storage.ClusterType_OPENSHIFT_CLUSTER with
storage.ClusterType_OPENSHIFT4_CLUSTER so telemetry accurately reflects
OpenShift 4.x and removes the deprecated enum.

image/embed_charts.go (1)

272-279: Return a specific error for deprecated OPENSHIFT_CLUSTER.

OPENSHIFT_CLUSTER currently falls through to a generic “invalid cluster type” message. An explicit branch improves operator diagnostics and aligns with the new OpenShift 3 deprecation messaging.

Proposed patch

 func (i *Image) addScripts(values *charts.MetaValues) ([]*loader.BufferedFile, error) {
 	if values.ClusterType == storage.ClusterType_KUBERNETES_CLUSTER.String() {
 		return i.scripts(values, k8sScriptsFileMap)
 	} else if values.ClusterType == storage.ClusterType_OPENSHIFT4_CLUSTER.String() {
 		return i.scripts(values, osScriptsFileMap)
+	} else if values.ClusterType == storage.ClusterType_OPENSHIFT_CLUSTER.String() {
+		return nil, errors.Errorf("unable to create sensor bundle for cluster %s: OpenShift 3.x is not supported anymore",
+			values.ClusterName)
 	}
 	return nil, errors.Errorf("unable to create sensor bundle, invalid cluster type for cluster %s",
 		values.ClusterName)
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@image/embed_charts.go` around lines 272 - 279, The current branch logic
treats storage.ClusterType_OPENSHIFT_CLUSTER as falling through to a generic
"invalid cluster type" error; update the branching in the function handling
values.ClusterType to add an explicit else-if for
storage.ClusterType_OPENSHIFT_CLUSTER.String() that returns a clear, specific
deprecation error (e.g., indicating OpenShift 3 is deprecated and directing
operators to upgrade), while keeping the existing OPENSHIFT4 and KUBERNETES
branches (references: values.ClusterType, storage.ClusterType_OPENSHIFT_CLUSTER,
storage.ClusterType_OPENSHIFT4_CLUSTER, storage.ClusterType_KUBERNETES_CLUSTER,
and the error return at the end).

pkg/helm/charts/tests/securedclusterservices/testdata/helmtest/scanner-slim.test.yaml (1)

20-22: Add a negative case asserting OpenShift 3 is rejected.

This block now only tests OpenShift 4. Given the de-support change, keep a regression test that env.openshift: 3 fails.

Proposed patch

   tests:
   - name: "on openshift 4"
+  - name: "on openshift 3 should fail"
+    set:
+      env.openshift: 3
+    expectError: true
+    expect: |
+      .error | assertThat(contains("OpenShift 3"))

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In
`@pkg/helm/charts/tests/securedclusterservices/testdata/helmtest/scanner-slim.test.yaml`
around lines 20 - 22, Add a negative test case next to the existing "on
openshift 4" entry that sets env.openshift: 3 and asserts the chart/template
fails validation; specifically, under the same tests: array add an entry with
name "on openshift 3" and a values block containing env.openshift: 3 and an
expectation that rendering or validation fails (e.g., expectFailure /
shouldRender: false / an assert that error is returned) so the test suite
verifies OpenShift 3 is rejected. Ensure the new test mirrors the structure of
the "on openshift 4" entry but uses env.openshift: 3 and the negative assertion.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes