From 862aff43fe06721093a46a4d8368132f12fa208e Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Thu, 17 Oct 2024 14:41:02 +0200 Subject: [PATCH] Describing tf resourece --- cmd/agent/agent.go | 47 ++++++++++++++++++--- web/src/views/footer/capacitor/Describe.jsx | 4 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index cdcd905df..94bef93f7 100644 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -31,8 +31,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" - appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/meta" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" @@ -463,17 +463,52 @@ func describeResource( gimletHost string, agentKey string, ) { - var gk schema.GroupKind + var gvr schema.GroupVersionResource + var gvk schema.GroupVersionKind switch resource { case "Deployment": - gk = schema.GroupKind{Group: appsv1.GroupName, Kind: "Deployment"} + gvr = schema.GroupVersionResource{ + Group: "apps", + Version: "v1", + Resource: "deployments", + } + gvk = schema.GroupVersionKind{ + Group: "apps", + Version: "v1", + Kind: "Deployment", + } case "Pod": - gk = schema.GroupKind{Group: v1.GroupName, Kind: "Pod"} + gvr = schema.GroupVersionResource{ + Group: "", + Version: "v1", + Resource: "pods", + } + gvk = schema.GroupVersionKind{ + Group: "", + Version: "v1", + Kind: "Pod", + } case "Terraform": - gk = schema.GroupKind{Group: "infra.contrib.fluxcd.io", Kind: "Terraform"} + gvr = schema.GroupVersionResource{ + Group: "infra.contrib.fluxcd.io", + Version: "v1alpha2", + Resource: "terraforms", + } + gvk = schema.GroupVersionKind{ + Group: "infra.contrib.fluxcd.io", + Version: "v1alpha2", + Kind: "Terraform", + } } - describer, ok := describe.DescriberFor(gk, kubeEnv.Config) + describer, ok := describe.GenericDescriberFor( + &meta.RESTMapping{ + Resource: gvr, + GroupVersionKind: gvk, + Scope: meta.RESTScopeNamespace, + }, + kubeEnv.Config, + ) if !ok { logrus.Errorf("could not get describer for %s", resource) return diff --git a/web/src/views/footer/capacitor/Describe.jsx b/web/src/views/footer/capacitor/Describe.jsx index 11d92120b..022745fdd 100644 --- a/web/src/views/footer/capacitor/Describe.jsx +++ b/web/src/views/footer/capacitor/Describe.jsx @@ -55,7 +55,7 @@ export function Describe(props) { setSelected={setSelected} />} > - + {content ?? } @@ -63,7 +63,7 @@ export function Describe(props) {