Skip to content
GitLab
Unverified Commit 5448ab2d authored by Wayne Witzel III's avatar Wayne Witzel III Committed by GitHub
Browse files

Merge pull request #1146 from scothis/api-server-aggregate 

Move "Namespaces" and "Custom Resource Definitions" under "API Server"
parents ad9c242a 9d85a3ab
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 43 deletions
+48 -43
internal/modules/clusteroverview/clusteroverview.go
+ 14
- 16
View file @ 5448ab2d
......@@ -180,10 +180,10 @@ func (co *ClusterOverview) Navigation(ctx context.Context, _ string, root string
navigationEntries := octant.NavigationEntries{
Lookup: map[string]string{
"Namespaces": "namespaces",
"API Server": "api-server",
"Custom Resources": "custom-resources",
"Custom Resource Definitions": "custom-resource-definitions",
"RBAC": "rbac",
"Webhooks": "webhooks",
"Nodes": "nodes",
"Storage": "storage",
"Port Forwards": "port-forward",
......@@ -191,10 +191,10 @@ func (co *ClusterOverview) Navigation(ctx context.Context, _ string, root string
EntriesFuncs: map[string]octant.EntriesFunc{
"Cluster Overview": nil,
"Namespaces": nil,
"API Server": apiServerEntries,
"Custom Resources": navigation.CRDEntries,
"Custom Resource Definitions": nil,
"RBAC": rbacEntries,
"Webhooks": webhookEntries,
"Nodes": nil,
"Storage": storageEntries,
"Port Forwards": nil,
......@@ -202,10 +202,10 @@ func (co *ClusterOverview) Navigation(ctx context.Context, _ string, root string
IconMap: map[string]string{
"Cluster Overview": icon.Overview,
"Namespaces": icon.Namespaces,
"API Server": icon.ApiServer,
"Custom Resources": icon.CustomResources,
"Custom Resource Definitions": icon.CustomResourceDefinition,
"RBAC": icon.RBAC,
"Webhooks": icon.Webhooks,
"Nodes": icon.Nodes,
"Storage": icon.ConfigAndStorage,
"Port Forwards": icon.PortForwards,
......@@ -213,10 +213,10 @@ func (co *ClusterOverview) Navigation(ctx context.Context, _ string, root string
Order: []string{
"Cluster Overview",
"Namespaces",
"API Server",
"Custom Resources",
"Custom Resource Definitions",
"RBAC",
"Webhooks",
"Nodes",
"Storage",
"Port Forwards",
......@@ -251,15 +251,13 @@ func (co *ClusterOverview) Generators() []octant.Generator {
return []octant.Generator{}
}
func apiServerEntries(ctx context.Context, prefix, namespace string, objectStore store.Store, _ bool) ([]navigation.Navigation, bool, error) {
func rbacEntries(ctx context.Context, prefix, namespace string, objectStore store.Store, _ bool) ([]navigation.Navigation, bool, error) {
neh := navigation.EntriesHelper{}
neh.Add("API Services", "api-services",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.APIService), objectStore))
neh.Add("Mutating Webhooks", "mutating-webhooks",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.MutatingWebhookConfiguration), objectStore))
neh.Add("Validating Webhooks", "validating-webhooks",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ValidatingWebhookConfiguration), objectStore))
neh.Add("Cluster Roles", "cluster-roles",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ClusterRole), objectStore))
neh.Add("Cluster Role Bindings", "cluster-role-bindings",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ClusterRoleBinding), objectStore))
children, err := neh.Generate(prefix, namespace, "")
if err != nil {
......@@ -269,13 +267,13 @@ func apiServerEntries(ctx context.Context, prefix, namespace string, objectStore
return children, false, nil
}
func rbacEntries(ctx context.Context, prefix, namespace string, objectStore store.Store, _ bool) ([]navigation.Navigation, bool, error) {
func webhookEntries(ctx context.Context, prefix, namespace string, objectStore store.Store, _ bool) ([]navigation.Navigation, bool, error) {
neh := navigation.EntriesHelper{}
neh.Add("Cluster Roles", "cluster-roles",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ClusterRole), objectStore))
neh.Add("Cluster Role Bindings", "cluster-role-bindings",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ClusterRoleBinding), objectStore))
neh.Add("Mutating Webhooks", "mutating-webhooks",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.MutatingWebhookConfiguration), objectStore))
neh.Add("Validating Webhooks", "validating-webhooks",
loading.IsObjectLoading(ctx, namespace, store.KeyFromGroupVersionKind(gvk.ValidatingWebhookConfiguration), objectStore))
children, err := neh.Generate(prefix, namespace, "")
if err != nil {
......
internal/modules/clusteroverview/objects.go
+ 31
- 25
View file @ 5448ab2d
......@@ -64,6 +64,35 @@ var (
rbacClusterRoleBindings,
)
webhooksDescriber = describer.NewSection(
"/webhooks",
"Webhooks",
webhooksMutatingWebhooks,
webhooksValidatingWebhooks,
)
webhooksValidatingWebhooks = describer.NewResource(describer.ResourceOptions{
Path: "/webhooks/validating-webhooks",
ObjectStoreKey: store.Key{APIVersion: "admissionregistration.k8s.io/v1beta1", Kind: "ValidatingWebhookConfiguration"},
ListType: &admissionregistrationv1beta1.ValidatingWebhookConfigurationList{},
ObjectType: &admissionregistrationv1beta1.ValidatingWebhookConfiguration{},
Titles: describer.ResourceTitle{List: "Validating Webhook Configurations", Object: "Validating Webhook Configuration"},
ClusterWide: true,
IconName: icon.Webhooks,
RootPath: describer.ResourceLink{Title: "Cluster Overview", Url: "/cluster-overview"},
})
webhooksMutatingWebhooks = describer.NewResource(describer.ResourceOptions{
Path: "/webhooks/mutating-webhooks",
ObjectStoreKey: store.Key{APIVersion: "admissionregistration.k8s.io/v1beta1", Kind: "MutatingWebhookConfiguration"},
ListType: &admissionregistrationv1beta1.MutatingWebhookConfigurationList{},
ObjectType: &admissionregistrationv1beta1.MutatingWebhookConfiguration{},
Titles: describer.ResourceTitle{List: "Mutating Webhook Configurations", Object: "Mutating Webhook Configuration"},
ClusterWide: true,
IconName: icon.Webhooks,
RootPath: describer.ResourceLink{Title: "Cluster Overview", Url: "/cluster-overview"},
})
nodesDescriber = describer.NewResource(describer.ResourceOptions{
Path: "/nodes",
ObjectStoreKey: store.Key{APIVersion: "v1", Kind: "Node"},
......@@ -111,8 +140,6 @@ var (
"/api-server",
"API Server",
apiServerApiServices,
apiServerMutatingWebhooks,
apiServerValidatingWebhooks,
)
apiServerApiServices = describer.NewResource(describer.ResourceOptions{
......@@ -126,38 +153,17 @@ var (
RootPath: describer.ResourceLink{Title: "Cluster Overview", Url: "/cluster-overview"},
})
apiServerValidatingWebhooks = describer.NewResource(describer.ResourceOptions{
Path: "/api-server/validating-webhooks",
ObjectStoreKey: store.Key{APIVersion: "admissionregistration.k8s.io/v1beta1", Kind: "ValidatingWebhookConfiguration"},
ListType: &admissionregistrationv1beta1.ValidatingWebhookConfigurationList{},
ObjectType: &admissionregistrationv1beta1.ValidatingWebhookConfiguration{},
Titles: describer.ResourceTitle{List: "Validating Webhook Configurations", Object: "Validating Webhook Configuration"},
ClusterWide: true,
IconName: icon.ApiServer,
RootPath: describer.ResourceLink{Title: "Cluster Overview", Url: "/cluster-overview"},
})
apiServerMutatingWebhooks = describer.NewResource(describer.ResourceOptions{
Path: "/api-server/mutating-webhooks",
ObjectStoreKey: store.Key{APIVersion: "admissionregistration.k8s.io/v1beta1", Kind: "MutatingWebhookConfiguration"},
ListType: &admissionregistrationv1beta1.MutatingWebhookConfigurationList{},
ObjectType: &admissionregistrationv1beta1.MutatingWebhookConfiguration{},
Titles: describer.ResourceTitle{List: "Mutating Webhook Configurations", Object: "Mutating Webhook Configuration"},
ClusterWide: true,
IconName: icon.ApiServer,
RootPath: describer.ResourceLink{Title: "Cluster Overview", Url: "/cluster-overview"},
})
rootDescriber = describer.NewSection(
"/",
"Cluster Overview",
namespacesDescriber,
apiServerDescriber,
customResourcesDescriber,
crdsDescriber,
rbacDescriber,
webhooksDescriber,
nodesDescriber,
storageDescriber,
portForwardDescriber,
apiServerDescriber,
)
)
internal/modules/clusteroverview/path.go
+ 2
- 2
View file @ 5448ab2d
......@@ -54,9 +54,9 @@ func gvkPath(namespace, apiVersion, kind, name string) (string, error) {
case apiVersion == "apiregistration.k8s.io/v1" && kind == "APIService":
p = "/api-server/api-services"
case apiVersion == "admissionregistration.k8s.io/v1beta1" && kind == "MutatingWebhookConfiguration":
p = "/api-server/mutating-webhooks"
p = "/webhooks/mutating-webhooks"
case apiVersion == "admissionregistration.k8s.io/v1beta1" && kind == "ValidatingWebhookConfiguration":
p = "/api-server/validating-webhooks"
p = "/webhooks/validating-webhooks"
default:
return "", fmt.Errorf("unknown object %s %s", apiVersion, kind)
}
......
pkg/icon/icon.go
+ 1
- 0
View file @ 5448ab2d
......@@ -18,6 +18,7 @@ const (
Namespaces = "namespace"
ApiServer = "hard-disk"
CustomResources = "file-group"
Webhooks = "animation"
Nodes = "nodes"
PortForwards = "router"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全