diff --git a/pkg/tests/tasks/observability/federated_openshift_monitoring_test.go b/pkg/tests/tasks/observability/federated_openshift_monitoring_test.go index 74c6d836..af60d174 100644 --- a/pkg/tests/tasks/observability/federated_openshift_monitoring_test.go +++ b/pkg/tests/tasks/observability/federated_openshift_monitoring_test.go @@ -21,10 +21,11 @@ import ( // See the comment on TestOpenShiftMonitoring for help setting up on crc func TestFederatedOpenShiftMonitoring(t *testing.T) { test.NewTest(t).Id("federated-openshift-monitoring-integration").Groups(test.Full, test.ARM).Run(func(t test.TestHelper) { - meshValues := map[string]string{ + meshValues := map[string]interface{}{ "Name": smcpName, "Version": env.GetSMCPVersion().String(), "Member": ns.Foo, + "Rosa": env.IsRosa(), } t.Cleanup(func() { diff --git a/pkg/tests/tasks/observability/openshift_monitoring_test.go b/pkg/tests/tasks/observability/openshift_monitoring_test.go index 4dfbc34f..403cb116 100644 --- a/pkg/tests/tasks/observability/openshift_monitoring_test.go +++ b/pkg/tests/tasks/observability/openshift_monitoring_test.go @@ -36,11 +36,12 @@ func TestOpenShiftMonitoring(t *testing.T) { if smcpVer.LessThan(version.SMCP_2_4) { t.Skip("integration with OpenShift Monitoring stack is not supported in OSSM older than v2.4.0") } - meshValues := map[string]string{ + meshValues := map[string]interface{}{ "Name": smcpName, "Version": smcpVer.String(), "Member": ns.Foo, "manageNetworkPolicy": "false", + "Rosa": env.IsRosa(), } kialiValues := map[string]string{ "SmcpName": smcpName, diff --git a/pkg/tests/tasks/observability/yaml/federated-monitoring-mesh.tmpl.yaml b/pkg/tests/tasks/observability/yaml/federated-monitoring-mesh.tmpl.yaml index 30b2016d..d8a63a5d 100644 --- a/pkg/tests/tasks/observability/yaml/federated-monitoring-mesh.tmpl.yaml +++ b/pkg/tests/tasks/observability/yaml/federated-monitoring-mesh.tmpl.yaml @@ -16,6 +16,10 @@ spec: security: dataPlane: mtls: true + {{ if .Rosa }} + identity: + type: ThirdParty + {{ end }} tracing: type: None version: {{ .Version }} diff --git a/pkg/tests/tasks/observability/yaml/mesh.tmpl.yaml b/pkg/tests/tasks/observability/yaml/mesh.tmpl.yaml index b17d2787..ed7df64a 100644 --- a/pkg/tests/tasks/observability/yaml/mesh.tmpl.yaml +++ b/pkg/tests/tasks/observability/yaml/mesh.tmpl.yaml @@ -23,6 +23,10 @@ spec: dataPlane: mtls: true manageNetworkPolicy: {{ .manageNetworkPolicy }} + {{ if .Rosa }} + identity: + type: ThirdParty + {{ end }} tracing: type: None version: {{ .Version }}