Skip to content

OCPBUGS-65496: Add missing relatedObjects + small refactoring #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhadvig wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-65496: Add missing relatedObjects + small refactoring #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ const (
V1Alpha1PluginI18nAnnotation = "console.openshift.io/use-i18n"
VersionResourceName = "version"

HelmChartreposViewerRoleName = "helm-chartrepos-viewer"
ProjectHelmChartrepositoryEditorRoleName = "project-helm-chartrepository-editor"
ConsoleExtensionsReaderRoleName = "console-extensions-reader"

// ingress instance named "default" is the OOTB ingresscontroller
// this is an implicit stable API
DefaultIngressController = "default"
Expand Down
42 changes: 30 additions & 12 deletions pkg/console/starter/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

// kube
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apiexensionsinformers "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -73,6 +74,18 @@ import (
"github.com/openshift/library-go/pkg/operator/loglevel"
)

const (
clusterRoleResource = "clusterroles"
namespaceResource = "namespaces"
configMapResource = "configmaps"
consoleResource = "consoles"
infrastructureResource = "infrastructures"
proxyResource = "proxies"
oauthResource = "oauths"
oauthClientResource = "oauthclients"
consolePluginResource = "consoleplugins"
)

func RunOperator(ctx context.Context, controllerContext *controllercmd.ControllerContext) error {

kubeClient, err := kubernetes.NewForConfig(controllerContext.ProtoKubeConfig)
Expand Down Expand Up @@ -436,14 +449,19 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
clusterOperatorStatus := status.NewClusterOperatorStatusController(
api.ClusterOperatorName,
[]configv1.ObjectReference{
{Group: operatorv1.GroupName, Resource: "consoles", Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: "consoles", Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: "infrastructures", Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: "proxies", Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: "oauths", Name: api.ConfigResourceName},
{Group: corev1.GroupName, Resource: "namespaces", Name: api.OpenShiftConsoleOperatorNamespace},
{Group: corev1.GroupName, Resource: "namespaces", Name: api.OpenShiftConsoleNamespace},
{Group: corev1.GroupName, Resource: "configmaps", Name: api.OpenShiftConsolePublicConfigMapName, Namespace: api.OpenShiftConfigManagedNamespace},
{Group: operatorv1.GroupName, Resource: consoleResource, Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: consoleResource, Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: infrastructureResource, Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: proxyResource, Name: api.ConfigResourceName},
{Group: configv1.GroupName, Resource: oauthResource, Name: api.ConfigResourceName},
{Group: corev1.GroupName, Resource: namespaceResource, Name: api.OpenShiftConsoleOperatorNamespace},
{Group: corev1.GroupName, Resource: namespaceResource, Name: api.OpenShiftConsoleNamespace},
{Group: corev1.GroupName, Resource: configMapResource, Name: api.OpenShiftConsolePublicConfigMapName, Namespace: api.OpenShiftConfigManagedNamespace},
{Group: rbacv1.GroupName, Resource: clusterRoleResource, Name: api.OpenShiftConsoleOperator},
{Group: rbacv1.GroupName, Resource: clusterRoleResource, Name: api.OpenShiftConsoleName},
{Group: rbacv1.GroupName, Resource: clusterRoleResource, Name: api.HelmChartreposViewerRoleName},
{Group: rbacv1.GroupName, Resource: clusterRoleResource, Name: api.ProjectHelmChartrepositoryEditorRoleName},
{Group: rbacv1.GroupName, Resource: clusterRoleResource, Name: api.ConsoleExtensionsReaderRoleName},
},
// clusteroperator client
configClient.ConfigV1(),
Expand All @@ -469,22 +487,22 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
for _, plugin := range consolePlugins.Items {
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: "console.openshift.io",
Resource: "consoleplugins",
Resource: consolePluginResource,
Name: plugin.GetName(),
})
if plugin.Spec.Backend.Service != nil {
ns := plugin.Spec.Backend.Service.Namespace
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: corev1.GroupName,
Resource: "namespaces",
Resource: namespaceResource,
Name: ns,
})
}
for _, proxy := range plugin.Spec.Proxy {
if proxy.Endpoint.Service != nil && proxy.Endpoint.Service.Namespace != "" {
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: corev1.GroupName,
Resource: "namespaces",
Resource: namespaceResource,
Name: proxy.Endpoint.Service.Namespace,
})
}
Expand All @@ -499,7 +517,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
case "", configv1.AuthenticationTypeIntegratedOAuth:
relatedObjects = append(relatedObjects, configv1.ObjectReference{
Group: oauth.GroupName,
Resource: "oauthclients",
Resource: oauthClientResource,
Name: api.OAuthClientName})
}

Expand Down