From ef9e7bdbcfb99d7877fe1d26b5cfd83cee32272c Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sat, 7 Oct 2023 21:27:13 -0700 Subject: [PATCH] Update ClusterStatus api Signed-off-by: Tamal Saha --- apis/meta/v1alpha1/clusterstatus_types.go | 3 +-- apis/meta/v1alpha1/openapi_generated.go | 8 +------- apis/meta/v1alpha1/zz_generated.deepcopy.go | 1 - .../core.k8s.appscode.com/v1alpha1/projects.yaml | 9 +++++++++ .../v1alpha1/projectquotas.yaml | 9 +++++++++ .../v1alpha1/resourcecalculators.yaml | 9 +++++++++ 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/apis/meta/v1alpha1/clusterstatus_types.go b/apis/meta/v1alpha1/clusterstatus_types.go index e034a2486..52f8433bd 100644 --- a/apis/meta/v1alpha1/clusterstatus_types.go +++ b/apis/meta/v1alpha1/clusterstatus_types.go @@ -35,8 +35,7 @@ const ( // +genclient:onlyVerbs=create // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type ClusterStatus struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` // +optional Response *ClusterStatusResponse `json:"response,omitempty"` } diff --git a/apis/meta/v1alpha1/openapi_generated.go b/apis/meta/v1alpha1/openapi_generated.go index dd76d74d2..ef8712248 100644 --- a/apis/meta/v1alpha1/openapi_generated.go +++ b/apis/meta/v1alpha1/openapi_generated.go @@ -14752,12 +14752,6 @@ func schema_resource_metadata_apis_meta_v1alpha1_ClusterStatus(ref common.Refere Format: "", }, }, - "metadata": { - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), - }, - }, "response": { SchemaProps: spec.SchemaProps{ Ref: ref("kmodules.xyz/resource-metadata/apis/meta/v1alpha1.ClusterStatusResponse"), @@ -14767,7 +14761,7 @@ func schema_resource_metadata_apis_meta_v1alpha1_ClusterStatus(ref common.Refere }, }, Dependencies: []string{ - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta", "kmodules.xyz/resource-metadata/apis/meta/v1alpha1.ClusterStatusResponse"}, + "kmodules.xyz/resource-metadata/apis/meta/v1alpha1.ClusterStatusResponse"}, } } diff --git a/apis/meta/v1alpha1/zz_generated.deepcopy.go b/apis/meta/v1alpha1/zz_generated.deepcopy.go index 1e2d52ef4..18bbd6505 100644 --- a/apis/meta/v1alpha1/zz_generated.deepcopy.go +++ b/apis/meta/v1alpha1/zz_generated.deepcopy.go @@ -93,7 +93,6 @@ func (in *ChartPresetQuery) DeepCopyObject() runtime.Object { func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) { *out = *in out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) if in.Response != nil { in, out := &in.Response, &out.Response *out = new(ClusterStatusResponse) diff --git a/hub/resourceeditors/core.k8s.appscode.com/v1alpha1/projects.yaml b/hub/resourceeditors/core.k8s.appscode.com/v1alpha1/projects.yaml index 67f31b30d..f3fd723d1 100644 --- a/hub/resourceeditors/core.k8s.appscode.com/v1alpha1/projects.yaml +++ b/hub/resourceeditors/core.k8s.appscode.com/v1alpha1/projects.yaml @@ -15,3 +15,12 @@ spec: name: projects scope: Cluster version: v1alpha1 + ui: + editor: + name: corek8sappscodecom-project-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: bytebuilders-ui + version: v0.4.18 + enforceQuota: false diff --git a/hub/resourceeditors/management.k8s.appscode.com/v1alpha1/projectquotas.yaml b/hub/resourceeditors/management.k8s.appscode.com/v1alpha1/projectquotas.yaml index 8be35901a..7fda968e5 100644 --- a/hub/resourceeditors/management.k8s.appscode.com/v1alpha1/projectquotas.yaml +++ b/hub/resourceeditors/management.k8s.appscode.com/v1alpha1/projectquotas.yaml @@ -15,3 +15,12 @@ spec: name: projectquotas scope: Cluster version: v1alpha1 + ui: + editor: + name: managementk8sappscodecom-projectquota-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: bytebuilders-ui + version: v0.4.18 + enforceQuota: false diff --git a/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/resourcecalculators.yaml b/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/resourcecalculators.yaml index 49272aed7..618f070af 100644 --- a/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/resourcecalculators.yaml +++ b/hub/resourceeditors/meta.k8s.appscode.com/v1alpha1/resourcecalculators.yaml @@ -15,3 +15,12 @@ spec: name: resourcecalculators scope: Namespaced version: v1alpha1 + ui: + editor: + name: metak8sappscodecom-resourcecalculator-editor + sourceRef: + apiGroup: source.toolkit.fluxcd.io + kind: HelmRepository + name: bytebuilders-ui + version: v0.4.18 + enforceQuota: false