Skip to content

chore(k8s): Extract common definitions #9498

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

Merged
kodiakhq merged 3 commits into from
Mar 30, 2023
Merged

chore(k8s): Extract common definitions #9498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0501120
extract common definitions
candiduslynx Mar 29, 2023
4d6ea65
workaround
candiduslynx Mar 30, 2023
722fffc
Merge branch 'main' into chore/k8s/extract-common-columns
kodiakhq[bot] Mar 30, 2023
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
19 changes: 3 additions & 16 deletions ...ns/source/k8s/resources/services/admissionregistration/mutating_webhook_configurations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func MutatingWebhookConfigurations() *schema.Table {
Name: "k8s_admissionregistration_mutating_webhook_configurations",
Resolver: fetchMutatingWebhookConfigurations,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.MutatingWebhookConfiguration{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.MutatingWebhookConfiguration{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions .../source/k8s/resources/services/admissionregistration/validating_webhook_configurations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/admissionregistration/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func ValidatingWebhookConfigurations() *schema.Table {
Name: "k8s_admissionregistration_validating_webhook_configurations",
Resolver: fetchValidatingWebhookConfigurations,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.ValidatingWebhookConfiguration{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.ValidatingWebhookConfiguration{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/apps/daemon_sets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func DaemonSets() *schema.Table {
Name: "k8s_apps_daemon_sets",
Resolver: fetchDaemonSets,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.DaemonSet{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.DaemonSet{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/apps/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func Deployments() *schema.Table {
Name: "k8s_apps_deployments",
Resolver: fetchDeployments,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.Deployment{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.Deployment{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/apps/replica_sets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func ReplicaSets() *schema.Table {
Name: "k8s_apps_replica_sets",
Resolver: fetchReplicaSets,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.ReplicaSet{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.ReplicaSet{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/apps/stateful_sets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func StatefulSets() *schema.Table {
Name: "k8s_apps_stateful_sets",
Resolver: fetchStatefulSets,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.StatefulSet{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.StatefulSet{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/autoscaling/hpas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/autoscaling/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func Hpas() *schema.Table {
Name: "k8s_autoscaling_hpas",
Resolver: fetchHpas,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.HorizontalPodAutoscaler{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.HorizontalPodAutoscaler{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/batch/cron_jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/batch/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func CronJobs() *schema.Table {
Name: "k8s_batch_cron_jobs",
Resolver: fetchCronJobs,
Multiplex: client.APIFilterContextMultiplex("/apis/batch/v1/cronjobs"),
Transform: client.TransformWithStruct(&v1.CronJob{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.CronJob{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/batch/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/batch/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func Jobs() *schema.Table {
Name: "k8s_batch_jobs",
Resolver: fetchJobs,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.Job{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.Job{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 7 additions & 12 deletions plugins/source/k8s/resources/services/certificates/signing_requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,14 @@ func SigningRequests() *schema.Table {
Resolver: fetchSigningRequests,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.CertificateSigningRequest{}),
Columns: []schema.Column{
Columns: schema.ColumnList{
client.ContextColumn,
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
// TODO: remove once https://github.com/cloudquery/plugin-sdk/pull/739 is released
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{PrimaryKey: true},
},
},
}
Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/coordination/leases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/coordination/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func Leases() *schema.Table {
Name: "k8s_coordination_leases",
Resolver: fetchLeases,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.Lease{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.Lease{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
19 changes: 3 additions & 16 deletions plugins/source/k8s/resources/services/core/component_statuses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cloudquery/cloudquery/plugins/source/k8s/client"
"github.com/cloudquery/plugin-sdk/schema"
"github.com/cloudquery/plugin-sdk/transformers"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand All @@ -14,22 +15,8 @@ func ComponentStatuses() *schema.Table {
Name: "k8s_core_component_statuses",
Resolver: fetchComponentStatuses,
Multiplex: client.ContextMultiplex,
Transform: client.TransformWithStruct(&v1.ComponentStatus{}),
Columns: []schema.Column{
{
Name: "context",
Type: schema.TypeString,
Resolver: client.ResolveContext,
},
{
Name: "uid",
Type: schema.TypeString,
Resolver: schema.PathResolver("UID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: client.TransformWithStruct(&v1.ComponentStatus{}, transformers.WithPrimaryKeys("UID")),
Columns: schema.ColumnList{client.ContextColumn},
}
}

Expand Down
Loading