Merge pull request #780 from TheRealJon/CONSOLE-3719

openshift-merge-robot · web-flow · commit 653ebbc63fcd · 2023-09-05T21:31:22.000+02:00
[release-4.12] OCPBUGS-18563: OLM Pages work when copied CSVs are disabled
diff --git a/manifests/03-rbac-role-cluster.yaml b/manifests/03-rbac-role-cluster.yaml
@@ -9,13 +9,13 @@ metadata:
     capability.openshift.io/name: Console
 rules:
   - apiGroups:
-    - ""
+      - ""
     resources:
-    - nodes
+      - nodes
     verbs:
-    - get
-    - list
-    - watch
+      - get
+      - list
+      - watch
   - apiGroups:
       - oauth.openshift.io
     resources:
@@ -86,6 +86,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - operators.coreos.com
+    resources:
+      - olmconfigs
+    verbs:
+      - get
+      - list
+      - watch
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -183,15 +191,15 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
 rules:
-- apiGroups:
-  - helm.openshift.io
-  resources:
-  - projecthelmchartrepositories
-  verbs:
-  - get
-  - list
-  - update
-  - create
-  - watch 
-  - patch
-  - delete
+  - apiGroups:
+      - helm.openshift.io
+    resources:
+      - projecthelmchartrepositories
+    verbs:
+      - get
+      - list
+      - update
+      - create
+      - watch
+      - patch
+      - delete
diff --git a/manifests/03-rbac-role-ns-operator.yaml b/manifests/03-rbac-role-ns-operator.yaml
@@ -9,60 +9,68 @@ metadata:
     include.release.openshift.io/single-node-developer: "true"
     capability.openshift.io/name: Console
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - events
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - delete
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  - replicasets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - config.openshift.io
-  resources:
-  - infrastructures
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - "coordination.k8s.io"
-  resources:
-  - leases
-  verbs:
-  - get
-  - create
-  - update
-- apiGroups:
-    - console.openshift.io
-  resources:
-    - consolenotifications
-  verbs:
-    - get
-    - list
-    - watch
-    - create
-    - update
-    - delete
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - events
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - delete
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - apps
+    resources:
+      - deployments
+      - replicasets
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - config.openshift.io
+    resources:
+      - infrastructures
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - leases
+    verbs:
+      - get
+      - create
+      - update
+  - apiGroups:
+      - console.openshift.io
+    resources:
+      - consolenotifications
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - delete
+  - apiGroups:
+      - operators.coreos.com
+    resources:
+      - olmconfigs
+    verbs:
+      - get
+      - list
+      - watch
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -73,6 +73,10 @@ const (
 	ManagedClusterClaimVersionAnnotation = "version.openshift.io"
 	ManagedClusterClaimProductAnnotation = "product.open-cluster-management.io"
 
+	OLMConfigGroup    = "operators.coreos.com"
+	OLMConfigVersion  = "v1"
+	OLMConfigResource = "olmconfigs"
+
 	ConsoleContainerPortName    = "https"
 	ConsoleContainerPort        = 443
 	ConsoleContainerTargetPort  = 8443
diff --git a/pkg/console/operator/operator.go b/pkg/console/operator/operator.go
@@ -9,7 +9,10 @@ import (
 	// kube
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/dynamic/dynamicinformer"
 	corev1 "k8s.io/client-go/informers/core/v1"
 	appsclientv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
 	coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1"
@@ -55,6 +58,7 @@ type consoleOperator struct {
 	ingressConfigClient        configclientv1.IngressInterface
 	proxyConfigClient          configclientv1.ProxyInterface
 	oauthConfigClient          configclientv1.OAuthInterface
+	dynamicClient              dynamic.Interface
 	// core kube
 	secretsClient    coreclientv1.SecretsGetter
 	configMapClient  coreclientv1.ConfigMapsGetter
@@ -75,6 +79,8 @@ func NewConsoleOperator(
 	// top level config
 	configClient configclientv1.ConfigV1Interface,
 	configInformer configinformer.SharedInformerFactory,
+	dynamicClient dynamic.Interface,
+	dynamicInformers dynamicinformer.DynamicSharedInformerFactory,
 	// operator
 	operatorClient v1helpers.OperatorClient,
 	operatorConfigClient operatorclientv1.OperatorV1Interface,
@@ -116,6 +122,7 @@ func NewConsoleOperator(
 		serviceClient:    corev1Client,
 		nodeClient:       corev1Client,
 		deploymentClient: deploymentClient,
+		dynamicClient:    dynamicClient,
 		// openshift
 		routeClient:   routev1Client,
 		oauthClient:   oauthv1Client,
@@ -135,6 +142,8 @@ func NewConsoleOperator(
 	configNameFilter := util.IncludeNamesFilter(api.ConfigResourceName)
 	targetNameFilter := util.IncludeNamesFilter(api.OpenShiftConsoleName)
 
+	olmConfigInformer := dynamicInformers.ForResource(schema.GroupVersionResource{Group: api.OLMConfigGroup, Version: api.OLMConfigVersion, Resource: api.OLMConfigResource})
+
 	return factory.New().
 		WithFilteredEventsInformers( // configs
 			configNameFilter,
@@ -144,6 +153,7 @@ func NewConsoleOperator(
 			configV1Informers.Ingresses().Informer(),
 			configV1Informers.Proxies().Informer(),
 			configV1Informers.OAuths().Informer(),
+			olmConfigInformer.Informer(),
 		).WithFilteredEventsInformers( // console resources
 		targetNameFilter,
 		deploymentInformer.Informer(),
diff --git a/pkg/console/operator/sync_v400.go b/pkg/console/operator/sync_v400.go
@@ -12,6 +12,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog/v2"
 
@@ -408,6 +410,11 @@ func (co *consoleOperator) SyncConfigMap(
 		return nil, false, "FailedGetMonitoringSharedConfig", mscErr
 	}
 
+	copiedCSVsDisabled, ccdErr := co.isCopiedCSVsDisabled(ctx)
+	if ccdErr != nil {
+		return nil, false, "FailedGetOLMConfig", ccdErr
+	}
+
 	defaultConfigmap, _, err := configmapsub.DefaultConfigMap(
 		operatorConfig,
 		consoleConfig,
@@ -420,6 +427,7 @@ func (co *consoleOperator) SyncConfigMap(
 		availablePlugins,
 		managedClusterConfigFile,
 		nodeArchitectures,
+		copiedCSVsDisabled,
 	)
 	if err != nil {
 		return nil, false, "FailedConsoleConfigBuilder", err
@@ -621,3 +629,16 @@ func getNodeArchitectures(nodes *corev1.NodeList) []string {
 	}
 	return nodeArchitecturesSet.List()
 }
+
+func (co *consoleOperator) isCopiedCSVsDisabled(ctx context.Context) (bool, error) {
+	olmConfig, err := co.dynamicClient.Resource(schema.GroupVersionResource{Group: api.OLMConfigGroup, Version: api.OLMConfigVersion, Resource: api.OLMConfigResource}).Get(ctx, api.ConfigResourceName, metav1.GetOptions{})
+	if err != nil {
+		return false, err
+	}
+	copiedCSVsDisabled, found, err := unstructured.NestedBool(olmConfig.Object, "spec", "features", "disableCopiedCSVs")
+	if err != nil || !found {
+		return false, err
+	}
+
+	return copiedCSVsDisabled, nil
+}
diff --git a/pkg/console/starter/starter.go b/pkg/console/starter/starter.go
@@ -189,6 +189,8 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 		// top level config
 		configClient.ConfigV1(),
 		configInformers,
+		dynamicClient,
+		dynamicInformers,
 		// operator
 		operatorClient,
 		operatorConfigClient.OperatorV1(),
diff --git a/pkg/console/subresource/configmap/configmap.go b/pkg/console/subresource/configmap/configmap.go
@@ -52,6 +52,7 @@ func DefaultConfigMap(
 	availablePlugins []*v1.ConsolePlugin,
 	managedClusterConfigFile string,
 	nodeArchitectures []string,
+	copiedCSVsDisabled bool,
 ) (consoleConfigMap *corev1.ConfigMap, unsupportedOverridesHaveMerged bool, err error) {
 
 	defaultBuilder := &consoleserver.ConsoleServerCLIConfigBuilder{}
@@ -65,6 +66,7 @@ func DefaultConfigMap(
 		InactivityTimeout(inactivityTimeoutSeconds).
 		ReleaseVersion().
 		NodesArchitecture(nodeArchitectures).
+		CopiedCSVsDisabled(copiedCSVsDisabled).
 		ConfigYAML()
 	if err != nil {
 		klog.Errorf("failed to generate default console-config config: %v", err)
diff --git a/pkg/console/subresource/configmap/configmap_test.go b/pkg/console/subresource/configmap/configmap_test.go
diff --git a/pkg/console/subresource/consoleserver/config_builder.go b/pkg/console/subresource/consoleserver/config_builder.go
diff --git a/pkg/console/subresource/consoleserver/types.go b/pkg/console/subresource/consoleserver/types.go
