fix: update k8 prefix to tables

Arta Asadi · Arta Asadi · commit 8c28108babc7 · 2025-04-18T18:11:57.000+02:00
diff --git a/cloudql/kubernetes/plugin.go b/cloudql/kubernetes/plugin.go
@@ -19,74 +19,40 @@ func Plugin(ctx context.Context) *plugin.Plugin {
 		},
 		DefaultTransform: transform.FromCamel(),
 		TableMap: map[string]*plugin.Table{
-			"k8_cluster":                            tableKubernetesCluster(ctx),
-			"k8_cluster_role":                       tableKubernetesClusterRole(ctx),
-			"k8_cluster_role_binding":               tableKubernetesClusterRoleBinding(ctx),
-			"k8_config_map":                         tableKubernetesConfigMap(ctx),
-			"k8_cronjob":                            tableKubernetesCronJob(ctx),
-			"k8_custom_resource":                    tableKubernetesCustomResource(ctx),
-			"k8_custom_resource_definition":         tableKubernetesCustomResourceDefinition(ctx),
-			"k8_daemonset":                          tableKubernetesDaemonset(ctx),
-			"k8_deployment":                         tableKubernetesDeployment(ctx),
-			"k8_endpoint_slice":                     tableKubernetesEndpointSlice(ctx),
-			"k8_endpoints":                          tableKubernetesEndpoints(ctx),
-			"k8_event":                              tableKubernetesEvent(ctx),
-			"k8_horizontal_pod_autoscaler":          tableKubernetesHorizontalPodAutoscaler(ctx),
-			"k8_ingress":                            tableKubernetesIngress(ctx),
-			"k8_job":                                tableKubernetesJob(ctx),
-			"k8_limit_range":                        tableKubernetesLimitRange(ctx),
-			"k8_namespace":                          tableKubernetesNamespace(ctx),
-			"k8_network_policy":                     tableKubernetesNetworkPolicy(ctx),
-			"k8_node":                               tableKubernetesNode(ctx),
-			"k8_persistent_volume_claim":            tableKubernetesPersistentVolumeClaim(ctx),
-			"k8_persistent_volume":                  tableKubernetesPersistentVolume(ctx),
-			"k8_pod":                                tableKubernetesPod(ctx),
-			"k8_pod_disruption_budget":              tableKubernetesPDB(ctx),
-			"k8_pod_template":                       tableKubernetesPodTemplate(ctx),
-			"k8_replicaset":                         tableKubernetesReplicaSet(ctx),
-			"k8_replication_controller":             tableKubernetesReplicaController(ctx),
-			"k8_resource_quota":                     tableKubernetesResourceQuota(ctx),
-			"k8_role":                               tableKubernetesRole(ctx),
-			"k8_role_binding":                       tableKubernetesRoleBinding(ctx),
-			"k8_secret":                             tableKubernetesSecret(ctx),
-			"k8_service":                            tableKubernetesService(ctx),
-			"k8_service_account":                    tableKubernetesServiceAccount(ctx),
-			"k8_stateful_set":                       tableKubernetesStatefulSet(ctx),
-			"k8_storage_class":                      tableKubernetesStorageClass(ctx),
-			"kubernetes_cluster":                    tableKubernetesCluster(ctx),
-			"kubernetes_cluster_role":               tableKubernetesClusterRole(ctx),
-			"kubernetes_cluster_role_binding":       tableKubernetesClusterRoleBinding(ctx),
-			"kubernetes_config_map":                 tableKubernetesConfigMap(ctx),
-			"kubernetes_cronjob":                    tableKubernetesCronJob(ctx),
-			"kubernetes_custom_resource":            tableKubernetesCustomResource(ctx),
-			"kubernetes_custom_resource_definition": tableKubernetesCustomResourceDefinition(ctx),
-			"kubernetes_daemonset":                  tableKubernetesDaemonset(ctx),
-			"kubernetes_deployment":                 tableKubernetesDeployment(ctx),
-			"kubernetes_endpoint_slice":             tableKubernetesEndpointSlice(ctx),
-			"kubernetes_endpoints":                  tableKubernetesEndpoints(ctx),
-			"kubernetes_event":                      tableKubernetesEvent(ctx),
-			"kubernetes_horizontal_pod_autoscaler":  tableKubernetesHorizontalPodAutoscaler(ctx),
-			"kubernetes_ingress":                    tableKubernetesIngress(ctx),
-			"kubernetes_job":                        tableKubernetesJob(ctx),
-			"kubernetes_limit_range":                tableKubernetesLimitRange(ctx),
-			"kubernetes_namespace":                  tableKubernetesNamespace(ctx),
-			"kubernetes_network_policy":             tableKubernetesNetworkPolicy(ctx),
-			"kubernetes_node":                       tableKubernetesNode(ctx),
-			"kubernetes_persistent_volume_claim":    tableKubernetesPersistentVolumeClaim(ctx),
-			"kubernetes_persistent_volume":          tableKubernetesPersistentVolume(ctx),
-			"kubernetes_pod":                        tableKubernetesPod(ctx),
-			"kubernetes_pod_disruption_budget":      tableKubernetesPDB(ctx),
-			"kubernetes_pod_template":               tableKubernetesPodTemplate(ctx),
-			"kubernetes_replicaset":                 tableKubernetesReplicaSet(ctx),
-			"kubernetes_replication_controller":     tableKubernetesReplicaController(ctx),
-			"kubernetes_resource_quota":             tableKubernetesResourceQuota(ctx),
-			"kubernetes_role":                       tableKubernetesRole(ctx),
-			"kubernetes_role_binding":               tableKubernetesRoleBinding(ctx),
-			"kubernetes_secret":                     tableKubernetesSecret(ctx),
-			"kubernetes_service":                    tableKubernetesService(ctx),
-			"kubernetes_service_account":            tableKubernetesServiceAccount(ctx),
-			"kubernetes_stateful_set":               tableKubernetesStatefulSet(ctx),
-			"kubernetes_storage_class":              tableKubernetesStorageClass(ctx),
+			"k8_cluster":                    tableKubernetesCluster(ctx),
+			"k8_cluster_role":               tableKubernetesClusterRole(ctx),
+			"k8_cluster_role_binding":       tableKubernetesClusterRoleBinding(ctx),
+			"k8_config_map":                 tableKubernetesConfigMap(ctx),
+			"k8_cronjob":                    tableKubernetesCronJob(ctx),
+			"k8_custom_resource":            tableKubernetesCustomResource(ctx),
+			"k8_custom_resource_definition": tableKubernetesCustomResourceDefinition(ctx),
+			"k8_daemonset":                  tableKubernetesDaemonset(ctx),
+			"k8_deployment":                 tableKubernetesDeployment(ctx),
+			"k8_endpoint_slice":             tableKubernetesEndpointSlice(ctx),
+			"k8_endpoints":                  tableKubernetesEndpoints(ctx),
+			"k8_event":                      tableKubernetesEvent(ctx),
+			"k8_horizontal_pod_autoscaler":  tableKubernetesHorizontalPodAutoscaler(ctx),
+			"k8_ingress":                    tableKubernetesIngress(ctx),
+			"k8_job":                        tableKubernetesJob(ctx),
+			"k8_limit_range":                tableKubernetesLimitRange(ctx),
+			"k8_namespace":                  tableKubernetesNamespace(ctx),
+			"k8_network_policy":             tableKubernetesNetworkPolicy(ctx),
+			"k8_node":                       tableKubernetesNode(ctx),
+			"k8_persistent_volume_claim":    tableKubernetesPersistentVolumeClaim(ctx),
+			"k8_persistent_volume":          tableKubernetesPersistentVolume(ctx),
+			"k8_pod":                        tableKubernetesPod(ctx),
+			"k8_pod_disruption_budget":      tableKubernetesPDB(ctx),
+			"k8_pod_template":               tableKubernetesPodTemplate(ctx),
+			"k8_replicaset":                 tableKubernetesReplicaSet(ctx),
+			"k8_replication_controller":     tableKubernetesReplicaController(ctx),
+			"k8_resource_quota":             tableKubernetesResourceQuota(ctx),
+			"k8_role":                       tableKubernetesRole(ctx),
+			"k8_role_binding":               tableKubernetesRoleBinding(ctx),
+			"k8_secret":                     tableKubernetesSecret(ctx),
+			"k8_service":                    tableKubernetesService(ctx),
+			"k8_service_account":            tableKubernetesServiceAccount(ctx),
+			"k8_stateful_set":               tableKubernetesStatefulSet(ctx),
+			"k8_storage_class":              tableKubernetesStorageClass(ctx),
 		},
 	}
 	for key, table := range p.TableMap {
diff --git a/cloudql/kubernetes/table_kubernetes_cluster.go b/cloudql/kubernetes/table_kubernetes_cluster.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesCluster(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_cluster",
+		Name:        "k8_cluster",
 		Description: "ClusterRole contains rules that represent a set of permissions.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesCluster,
diff --git a/cloudql/kubernetes/table_kubernetes_cluster_role.go b/cloudql/kubernetes/table_kubernetes_cluster_role.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesClusterRole(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_cluster_role",
+		Name:        "k8_cluster_role",
 		Description: "ClusterRole contains rules that represent a set of permissions.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesClusterRole,
diff --git a/cloudql/kubernetes/table_kubernetes_cluster_role_binding.go b/cloudql/kubernetes/table_kubernetes_cluster_role_binding.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesClusterRoleBinding(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_cluster_role_binding",
+		Name:        "k8_cluster_role_binding",
 		Description: "A ClusterRoleBinding grants the permissions defined in a cluster role to a user or set of users. Access granted by ClusterRoleBinding is cluster-wide.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesClusterRoleBinding,
diff --git a/cloudql/kubernetes/table_kubernetes_config_map.go b/cloudql/kubernetes/table_kubernetes_config_map.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesConfigMap(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_config_map",
+		Name:        "k8_config_map",
 		Description: "Config Map can be used to store fine-grained information like individual properties or coarse-grained information like entire config files or JSON blobs.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesConfigMap,
diff --git a/cloudql/kubernetes/table_kubernetes_cronjob.go b/cloudql/kubernetes/table_kubernetes_cronjob.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesCronJob(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_cronjob",
+		Name:        "k8_cronjob",
 		Description: "Cron jobs are useful for creating periodic and recurring tasks, like running backups or sending emails.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesCronJob,
diff --git a/cloudql/kubernetes/table_kubernetes_custom_resource.go b/cloudql/kubernetes/table_kubernetes_custom_resource.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesCustomResource(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_custom_resource",
+		Name:        "k8_custom_resource",
 		Description: "Custom resources are extensions of the Kubernetes API.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesCustomResource,
diff --git a/cloudql/kubernetes/table_kubernetes_custom_resource_definition.go b/cloudql/kubernetes/table_kubernetes_custom_resource_definition.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesCustomResourceDefinition(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_custom_resource_definition",
+		Name:        "k8_custom_resource_definition",
 		Description: "Kubernetes Custom Resource Definition.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesCustomResourceDefinition,
diff --git a/cloudql/kubernetes/table_kubernetes_daemonset.go b/cloudql/kubernetes/table_kubernetes_daemonset.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesDaemonset(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_daemonset",
+		Name:        "k8_daemonset",
 		Description: "A DaemonSet ensures that all (or some) Nodes run a copy of a Pod.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesDaemonSet,
diff --git a/cloudql/kubernetes/table_kubernetes_deployment.go b/cloudql/kubernetes/table_kubernetes_deployment.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesDeployment(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_deployment",
+		Name:        "k8_deployment",
 		Description: "Kubernetes Deployment enables declarative updates for Pods and ReplicaSets.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesDeployment,
diff --git a/cloudql/kubernetes/table_kubernetes_endpoint_slice.go b/cloudql/kubernetes/table_kubernetes_endpoint_slice.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesEndpointSlice(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_endpoint_slice",
+		Name:        "k8_endpoint_slice",
 		Description: "EndpointSlice represents a subset of the endpoints that implement a service.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesEndpointSlice,
diff --git a/cloudql/kubernetes/table_kubernetes_endpoints.go b/cloudql/kubernetes/table_kubernetes_endpoints.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesEndpoints(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_endpoints",
+		Name:        "k8_endpoints",
 		Description: "Set of addresses and ports that comprise a service. More info: https://kubernetes.io/docs/concepts/services-networking/service/#services-without-selectors.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesEndpoint,
diff --git a/cloudql/kubernetes/table_kubernetes_event.go b/cloudql/kubernetes/table_kubernetes_event.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesEvent(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_event",
+		Name:        "k8_event",
 		Description: "Kubernetes Event is a report of an event somewhere in the cluster.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesEvent,
diff --git a/cloudql/kubernetes/table_kubernetes_horizontal_pod_autoscaler.go b/cloudql/kubernetes/table_kubernetes_horizontal_pod_autoscaler.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesHorizontalPodAutoscaler(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_horizontal_pod_autoscaler",
+		Name:        "k8_horizontal_pod_autoscaler",
 		Description: "Kubernetes HorizontalPodAutoscaler is the configuration for a horizontal pod autoscaler, which automatically manages the replica count of any resource implementing the scale subresource based on the metrics specified.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesHorizontalPodAutoscaler,
diff --git a/cloudql/kubernetes/table_kubernetes_ingress.go b/cloudql/kubernetes/table_kubernetes_ingress.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesIngress(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_ingress",
+		Name:        "k8_ingress",
 		Description: "Ingress exposes HTTP and HTTPS routes from outside the cluster to services within the cluster. Traffic routing is controlled by rules defined on the Ingress resource.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesIngress,
diff --git a/cloudql/kubernetes/table_kubernetes_job.go b/cloudql/kubernetes/table_kubernetes_job.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesJob(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_job",
+		Name:        "k8_job",
 		Description: "A Job creates one or more Pods and will continue to retry execution of the Pods until a specified number of them successfully terminate.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesIngress,
diff --git a/cloudql/kubernetes/table_kubernetes_limit_range.go b/cloudql/kubernetes/table_kubernetes_limit_range.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesLimitRange(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_limit_range",
+		Name:        "k8_limit_range",
 		Description: "Kubernetes Limit Range",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesLimitRange,
diff --git a/cloudql/kubernetes/table_kubernetes_namespace.go b/cloudql/kubernetes/table_kubernetes_namespace.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesNamespace(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_namespace",
+		Name:        "k8_namespace",
 		Description: "Kubernetes Namespace provides a scope for Names.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesNamespace,
diff --git a/cloudql/kubernetes/table_kubernetes_network_policy.go b/cloudql/kubernetes/table_kubernetes_network_policy.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesNetworkPolicy(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_network_policy",
+		Name:        "k8_network_policy",
 		Description: "Network policy specifiy how pods are allowed to communicate with each other and with other network endpoints.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesNetworkPolicy,
diff --git a/cloudql/kubernetes/table_kubernetes_node.go b/cloudql/kubernetes/table_kubernetes_node.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesNode(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_node",
+		Name:        "k8_node",
 		Description: "Kubernetes Node is a worker node in Kubernetes.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesNode,
diff --git a/cloudql/kubernetes/table_kubernetes_persistent_volume.go b/cloudql/kubernetes/table_kubernetes_persistent_volume.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesPersistentVolume(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_persistent_volume",
+		Name:        "k8_persistent_volume",
 		Description: "A PersistentVolume (PV) is a piece of storage in the cluster that has been provisioned by an administrator or dynamically provisioned using Storage Classes. PVs are volume plugins like Volumes, but have a lifecycle independent of any individual Pod that uses the PV.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesPersistentVolume,
diff --git a/cloudql/kubernetes/table_kubernetes_persistent_volume_claim.go b/cloudql/kubernetes/table_kubernetes_persistent_volume_claim.go
@@ -11,7 +11,7 @@ import (
 
 func tableKubernetesPersistentVolumeClaim(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_persistent_volume_claim",
+		Name:        "k8_persistent_volume_claim",
 		Description: "A PersistentVolumeClaim (PVC) is a request for storage by a user.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesPersistentVolumeClaim,
diff --git a/cloudql/kubernetes/table_kubernetes_pod.go b/cloudql/kubernetes/table_kubernetes_pod.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesPod(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_pod",
+		Name:        "k8_pod",
 		Description: "Kubernetes Pod is a collection of containers that can run on a host. This resource is created by clients and scheduled onto hosts.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesPod,
@@ -422,7 +422,7 @@ func transformPodCpuAndMemoryUnit(ctx context.Context, d *transform.TransformDat
 			if limit.Cpu().String() != "" && !limit.Cpu().IsZero() {
 				cpu, err := normalizeCPUToMilliCores(limit.Cpu().String())
 				if err != nil {
-					plugin.Logger(ctx).Error("kubernetes_pod.transformPodCpuAndMemoryUnit", "error in parsing the CPU value", err)
+					plugin.Logger(ctx).Error("k8_pod.transformPodCpuAndMemoryUnit", "error in parsing the CPU value", err)
 					return nil, err
 				}
 				limitCPUMemoryMap["cpu"] = cpu
@@ -431,7 +431,7 @@ func transformPodCpuAndMemoryUnit(ctx context.Context, d *transform.TransformDat
 			if limit.Memory().String() != "" && !limit.Memory().IsZero() {
 				memory, err := normalizeMemoryToBytes(limit.Memory().String())
 				if err != nil {
-					plugin.Logger(ctx).Error("kubernetes_pod.transformPodCpuAndMemoryUnit", "error in parsing the memory value", err)
+					plugin.Logger(ctx).Error("k8_pod.transformPodCpuAndMemoryUnit", "error in parsing the memory value", err)
 					return nil, err
 				}
 				limitCPUMemoryMap["memory"] = memory
@@ -453,7 +453,7 @@ func transformPodCpuAndMemoryUnit(ctx context.Context, d *transform.TransformDat
 			if request.Cpu().String() != "" && !request.Cpu().IsZero() {
 				cpu, err := normalizeCPUToMilliCores(request.Cpu().String())
 				if err != nil {
-					plugin.Logger(ctx).Error("kubernetes_pod.transformPodCpuAndMemoryUnit", "error in parsing the CPU value", err)
+					plugin.Logger(ctx).Error("k8_pod.transformPodCpuAndMemoryUnit", "error in parsing the CPU value", err)
 					return nil, err
 				}
 				requestCPUMemoryMap["cpu"] = cpu
@@ -462,7 +462,7 @@ func transformPodCpuAndMemoryUnit(ctx context.Context, d *transform.TransformDat
 			if request.Memory().String() != "" && !request.Memory().IsZero() {
 				memory, err := normalizeMemoryToBytes(request.Memory().String())
 				if err != nil {
-					plugin.Logger(ctx).Error("kubernetes_pod.transformPodCpuAndMemoryUnit", "error in parsing the memory value", err)
+					plugin.Logger(ctx).Error("k8_pod.transformPodCpuAndMemoryUnit", "error in parsing the memory value", err)
 					return nil, err
 				}
 				requestCPUMemoryMap["memory"] = memory
diff --git a/cloudql/kubernetes/table_kubernetes_pod_disruption_budget.go b/cloudql/kubernetes/table_kubernetes_pod_disruption_budget.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesPDB(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_pod_disruption_budget",
+		Name:        "k8_pod_disruption_budget",
 		Description: "A Pod Disruption Budget limits the number of Pods of a replicated application that are down simultaneously from voluntary disruptions.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesPodDisruptionBudget,
diff --git a/cloudql/kubernetes/table_kubernetes_pod_template.go b/cloudql/kubernetes/table_kubernetes_pod_template.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesPodTemplate(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_pod_template",
+		Name:        "k8_pod_template",
 		Description: "Kubernetes Pod Template is a collection of templates for creating copies of a predefined pod.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesPodTemplate,
diff --git a/cloudql/kubernetes/table_kubernetes_replicaset.go b/cloudql/kubernetes/table_kubernetes_replicaset.go
@@ -10,7 +10,7 @@ import (
 
 func tableKubernetesReplicaSet(ctx context.Context) *plugin.Table {
 	return &plugin.Table{
-		Name:        "kubernetes_replicaset",
+		Name:        "k8_replicaset",
 		Description: "Kubernetes replica set ensures that a specified number of pod replicas are running at any given time.",
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListKubernetesReplicaSet,
diff --git a/cloudql/kubernetes/table_kubernetes_replication_controller.go b/cloudql/kubernetes/table_kubernetes_replication_controller.go
diff --git a/cloudql/kubernetes/table_kubernetes_resource_quota.go b/cloudql/kubernetes/table_kubernetes_resource_quota.go
diff --git a/cloudql/kubernetes/table_kubernetes_role.go b/cloudql/kubernetes/table_kubernetes_role.go
diff --git a/cloudql/kubernetes/table_kubernetes_role_binding.go b/cloudql/kubernetes/table_kubernetes_role_binding.go
diff --git a/cloudql/kubernetes/table_kubernetes_secret.go b/cloudql/kubernetes/table_kubernetes_secret.go
diff --git a/cloudql/kubernetes/table_kubernetes_service.go b/cloudql/kubernetes/table_kubernetes_service.go
diff --git a/cloudql/kubernetes/table_kubernetes_service_account.go b/cloudql/kubernetes/table_kubernetes_service_account.go
diff --git a/cloudql/kubernetes/table_kubernetes_stateful_set.go b/cloudql/kubernetes/table_kubernetes_stateful_set.go
diff --git a/cloudql/kubernetes/table_kubernetes_storage_class.go b/cloudql/kubernetes/table_kubernetes_storage_class.go
