Fix catalog api openapi schema

Signed-off-by: Tamal Saha <[email protected]>

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	github.com/zeebo/xxh3 v1.0.2
-	go.bytebuilders.dev/catalog v0.0.7
+	go.bytebuilders.dev/catalog v0.0.8-0.20240831022339-c58880360336
 	go.bytebuilders.dev/license-verifier v0.14.1
 	go.openviz.dev/apimachinery v0.0.7
 	golang.org/x/sync v0.7.0
@@ -49,7 +49,7 @@ require (
 	kmodules.xyz/custom-resources v0.30.0
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/monitoring-agent-api v0.29.0
-	kmodules.xyz/resource-metadata v0.18.13-0.20240831011752-f53d8b2924e9
+	kmodules.xyz/resource-metadata v0.18.13-0.20240831024742-1a1dfb93a811
 	kmodules.xyz/resource-metrics v0.30.4
 	kmodules.xyz/resource-metrics/utils v0.30.4
 	kmodules.xyz/sets v0.29.0

go.sum

@@ -545,8 +545,8 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-go.bytebuilders.dev/catalog v0.0.7 h1:RY2H7L9CoG779oCZjlZkU+f7FNSRSD2m4mdvLvuK2qA=
-go.bytebuilders.dev/catalog v0.0.7/go.mod h1:zKCfHWFNHEaZV6BWC8vo6CYBwPDQsl3IIXW1P9Q62QA=
+go.bytebuilders.dev/catalog v0.0.8-0.20240831022339-c58880360336 h1:e+UAamNBo+zqUlk5e6LZ3zYbcgH4W1YLyTC+T9fXmro=
+go.bytebuilders.dev/catalog v0.0.8-0.20240831022339-c58880360336/go.mod h1:zKCfHWFNHEaZV6BWC8vo6CYBwPDQsl3IIXW1P9Q62QA=
 go.bytebuilders.dev/license-verifier v0.14.1 h1:Pk0a4NKgRjMt6eBZATHwLmPUuTQL00kQB3AQoxhCsUE=
 go.bytebuilders.dev/license-verifier v0.14.1/go.mod h1:GB9XTSQUcllJ4AVq29TdJI6yRjoI86HGz0XMqq9nLwY=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -922,8 +922,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9
 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
 kmodules.xyz/offshoot-api v0.30.0 h1:dq9F93pu4Q8rL9oTcCk+vGGy8vpS7RNt0GSwx7Bvhec=
 kmodules.xyz/offshoot-api v0.30.0/go.mod h1:o9VoA3ImZMDBp3lpLb8+kc2d/KBxioRwCpaKDfLIyDw=
-kmodules.xyz/resource-metadata v0.18.13-0.20240831011752-f53d8b2924e9 h1:iajL2aPvVZPVabUxALrmMBAGjVQJ2iJ2mGQjT3Ye1xM=
-kmodules.xyz/resource-metadata v0.18.13-0.20240831011752-f53d8b2924e9/go.mod h1:bRVan42dRX/6FOb1Z4qK3s9o8M9q5I3XPakKbEGAHi4=
+kmodules.xyz/resource-metadata v0.18.13-0.20240831024742-1a1dfb93a811 h1:c3RfolMdmm1t9H7IJRdv217cXFJXDkKOZAhe1T2t4JQ=
+kmodules.xyz/resource-metadata v0.18.13-0.20240831024742-1a1dfb93a811/go.mod h1:KC8yk1AaAMRht7mLVPA6iP2U6n9qIAzR89I8IMejLgs=
 kmodules.xyz/resource-metrics v0.30.4 h1:8HBPtYmo9ETY91gsc55JE8Z986+3ZuRq57M0wZ9npqI=
 kmodules.xyz/resource-metrics v0.30.4/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
 kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac=

pkg/cmds/server/start.go

@@ -36,6 +36,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/pflag"
+	catalogapi "go.bytebuilders.dev/catalog/api/v1alpha1"
 	v "gomodules.xyz/x/version"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -177,6 +178,7 @@ func (o *UIServerOptions) Config() (*apiserver.Config, error) {
 			kmapi.GetOpenAPIDefinitions,
 			identityapi.GetOpenAPIDefinitions,
 			rscoreapi.GetOpenAPIDefinitions,
+			catalogapi.GetOpenAPIDefinitions,
 		),
 		openapi.NewDefinitionNamer(apiserver.Scheme))
 	serverConfig.OpenAPIConfig.Info.Title = "kube-ui-server"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/clickhousebinding_types.go

@@ -0,0 +1,65 @@
+/*
+Copyright AppsCode Inc. and Contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	kmapi "kmodules.xyz/client-go/api/v1"
+)
+
+const (
+	ResourceKindClickHouseBinding = "ClickHouseBinding"
+	ResourceClickHouseBinding     = "clickhousebinding"
+	ResourceClickHouseBindings    = "clickhousebindings"
+)
+
+// ClickHouseBindingSpec defines the desired state of ClickHouseBinding
+type ClickHouseBindingSpec struct {
+	// SourceRef refers to the source app instance.
+	SourceRef kmapi.ObjectReference `json:"sourceRef"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=chbinding,categories={binding,kubedb,appscode}
+// +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
+// +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
+// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+
+// ClickHouseBinding is the Schema for the clickhousebindings API
+type ClickHouseBinding struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClickHouseBindingSpec `json:"spec,omitempty"`
+	Status BindingStatus         `json:"status,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// ClickHouseBindingList contains a list of ClickHouseBinding
+type ClickHouseBindingList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ClickHouseBinding `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&ClickHouseBinding{}, &ClickHouseBindingList{})
+}

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/druidbinding_types.go

@@ -36,7 +36,7 @@ type DruidBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=drbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/elasticsearchbinding_types.go

@@ -36,7 +36,7 @@ type ElasticsearchBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=esbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/ferretdbbinding_types.go

@@ -36,7 +36,7 @@ type FerretDBBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=frbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/kafkabinding_types.go

@@ -36,7 +36,7 @@ type KafkaBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=kfbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/mariadbbinding_types.go

@@ -36,7 +36,7 @@ type MariaDBBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=mdbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/memcachedbinding_types.go

@@ -36,7 +36,7 @@ type MemcachedBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=mcbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/mongodbbinding_types.go

@@ -36,7 +36,7 @@ type MongoDBBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=mgbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/mssqlserverbinding_types.go

@@ -36,7 +36,7 @@ type MSSQLServerBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=msbinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"

vendor/go.bytebuilders.dev/catalog/api/v1alpha1/mysqlbinding_types.go

@@ -36,7 +36,7 @@ type MySQLBindingSpec struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:categories={kubedb,appscode}
+// +kubebuilder:resource:shortName=mybinding,categories={binding,kubedb,appscode}
 // +kubebuilder:printcolumn:name="Src_NS",type="string",JSONPath=".spec.sourceRef.namespace"
 // +kubebuilder:printcolumn:name="Src_Name",type="string",JSONPath=".spec.sourceRef.name"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase"