mcoa: bump logging resources to 6.0 (#1626)

PR with precedence: stolostron/multicluster-observability-addon#63 Signed-off-by: Joao Marcal <jmarcal@redhat.com>
stolostron · Oct 2, 2024 · 983141d · 983141d
1 parent 9e39f7c
commit 983141d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/...bility/controllers/multiclusterobservability/multiclusterobservability_controller_test.go b/...bility/controllers/multiclusterobservability/multiclusterobservability_controller_test.go
@@ -1129,7 +1129,7 @@ func TestNewMCOACRDEventHandler(t *testing.T) {
 		},
 		{
 			name:    "CRD created is a dependency",
-			crdName: "clusterlogforwarders.logging.openshift.io",
+			crdName: "clusterlogforwarders.observability.openshift.io",
 			expectedReqs: []reconcile.Request{
 				{
 					NamespacedName: types.NamespacedName{

diff --git a/...ervability/controllers/multiclusterobservability/multiclusterobservability_status_test.go b/...ervability/controllers/multiclusterobservability/multiclusterobservability_status_test.go
@@ -328,7 +328,7 @@ func TestUpdateMCOAStatus(t *testing.T) {
 				Type:    reasonMCOADegraded,
 				Status:  metav1.ConditionTrue,
 				Reason:  reasonMCOADegraded,
-				Message: "MultiCluster-Observability-Addon degraded because the following CRDs are not installed on the hub: clusterlogforwarders.logging.openshift.io(v1), instrumentations.opentelemetry.io(v1alpha1), opentelemetrycollectors.opentelemetry.io(v1beta1)",
+				Message: "MultiCluster-Observability-Addon degraded because the following CRDs are not installed on the hub: clusterlogforwarders.observability.openshift.io(v1), instrumentations.opentelemetry.io(v1alpha1), opentelemetrycollectors.opentelemetry.io(v1beta1)",
 			},
 		},
 		{
@@ -349,7 +349,7 @@ func TestUpdateMCOAStatus(t *testing.T) {
 			existingObjs: []runtime.Object{
 				&apiextensionsv1.CustomResourceDefinition{
 					ObjectMeta: metav1.ObjectMeta{
-						Name: "clusterlogforwarders.logging.openshift.io",
+						Name: "clusterlogforwarders.observability.openshift.io",
 					},
 					Spec: apiextensionsv1.CustomResourceDefinitionSpec{
 						Versions: []apiextensionsv1.CustomResourceDefinitionVersion{

diff --git a/...bservability/manifests/base/multicluster-observability-addon/addon_deployment_config.yaml b/...bservability/manifests/base/multicluster-observability-addon/addon_deployment_config.yaml
@@ -7,4 +7,4 @@ spec:
   customizedVariables:
   # Operator Subscription Channels
   - name: openshiftLoggingChannel
-    value: stable-5.9
+    value: stable-6.0
diff --git a/...servability/manifests/base/multicluster-observability-addon/cluster_management_addon.yaml b/...servability/manifests/base/multicluster-observability-addon/cluster_management_addon.yaml
@@ -21,7 +21,7 @@ spec:
         name: multicluster-observability-addon
         namespace: open-cluster-management-observability
     # Describes the default log forwarding outputs for each log type applied to all managed clusters.
-    - group: logging.openshift.io
+    - group: observability.openshift.io
       resource: clusterlogforwarders
     # Describes the default OpenTelemetryCollector type applied to all managed clusters.
     - group: opentelemetry.io
@@ -35,7 +35,7 @@ spec:
       - name: global
         namespace: open-cluster-management-global-set
         configs:
-          - group: logging.openshift.io
+          - group: observability.openshift.io
             resource: clusterlogforwarders
             name: instance
             namespace: open-cluster-management-observability

diff --git a/...lticlusterobservability/manifests/base/multicluster-observability-addon/cluster_role.yaml b/...lticlusterobservability/manifests/base/multicluster-observability-addon/cluster_role.yaml
@@ -61,7 +61,7 @@
       resources: ["secrets"]
       verbs: ["get", "list", "watch"]
     # Roles for addon to perform logging specific actions
-    - apiGroups: ["logging.openshift.io"]
+    - apiGroups: ["observability.openshift.io"]
       resources: ["clusterlogforwarders"]
       verbs: ["get", "list", "watch"]
     # Role for addon to perform opentelemetry specific actions

diff --git a/operators/multiclusterobservability/pkg/config/config.go b/operators/multiclusterobservability/pkg/config/config.go
@@ -226,7 +226,7 @@ const (
 )
 
 const (
-	ClusterLogForwarderCRDName    = "clusterlogforwarders.logging.openshift.io"
+	ClusterLogForwarderCRDName    = "clusterlogforwarders.observability.openshift.io"
 	OpenTelemetryCollectorCRDName = "opentelemetrycollectors.opentelemetry.io"
 	InstrumentationCRDName        = "instrumentations.opentelemetry.io"
 )

diff --git a/operators/multiclusterobservability/pkg/config/config_test.go b/operators/multiclusterobservability/pkg/config/config_test.go
@@ -806,7 +806,7 @@ func TestGetOperandName(t *testing.T) {
 
 func TestGetMCOASupportedCRDNames(t *testing.T) {
 	expected := []string{
-		"clusterlogforwarders.logging.openshift.io",
+		"clusterlogforwarders.observability.openshift.io",
 		"opentelemetrycollectors.opentelemetry.io",
 		"instrumentations.opentelemetry.io",
 	}
@@ -823,8 +823,8 @@ func TestGetMCOASupportedCRDFQDN(t *testing.T) {
 	}{
 		{
 			name:     "Valid CRD name with version",
-			crdName:  "clusterlogforwarders.logging.openshift.io",
-			expected: "clusterlogforwarders.v1.logging.openshift.io",
+			crdName:  "clusterlogforwarders.observability.openshift.io",
+			expected: "clusterlogforwarders.v1.observability.openshift.io",
 		},
 		{
 			name:     "Valid CRD name with different version",