Skip to content

Commit

Permalink
Add UI chart info & remove status.gateway from db (#1256)
Browse files Browse the repository at this point in the history 

Signed-off-by: Tamal Saha <tamal@appscode.com>
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
Co-authored-by: souravbiswassanto <saurov@appscode.com>
Co-authored-by: Arnob kumar saha <arnob@appscode.com>
  • Loading branch information
@tamalsaha @souravbiswassanto @ArnobKumarSaha
3 people authored Jul 11, 2024
1 parent 88ec29e commit 0fdb807
Show file tree
Hide file tree
Showing 120 changed files with 27,954 additions and 11,947 deletions.
17 changes: 17 additions & 0 deletions .config/api-rules/violation_exceptions.list
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
API rule violation: list_type_missing,k8s.io/api/core/v1,RangeAllocation,Data
API rule violation: list_type_missing,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSON,Raw
API rule violation: list_type_missing,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,WebhookClientConfig,CABundle
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
Expand Down Expand Up @@ -91,6 +93,21 @@ API rule violation: names_match,k8s.io/api/core/v1,RBDVolumeSource,RBDPool
API rule violation: names_match,k8s.io/api/core/v1,RBDVolumeSource,RadosUser
API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,CephFS
API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,StorageOS
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XIntOrString
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListMapKeys
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XListType
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XMapType
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XPreserveUnknownFields
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XValidations
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,JSONSchemas
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrArray,Schema
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Allows
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema
API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,Format
API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,d
API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,i
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ openapi-%:
openapi-gen \
--v 1 --logtostderr \
--go-header-file "./hack/license/go.txt" \
--input-dirs "$(GO_PKG)/$(REPO)/apis/$(subst _,/,$*),k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,k8s.io/api/core/v1,k8s.io/api/apps/v1,kmodules.xyz/offshoot-api/api/v1,kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1,kmodules.xyz/monitoring-agent-api/api/v1,k8s.io/api/rbac/v1,k8s.io/api/autoscaling/v2beta2,kmodules.xyz/objectstore-api/api/v1,kmodules.xyz/client-go/api/v1" \
--input-dirs "$(GO_PKG)/$(REPO)/apis/$(subst _,/,$*),k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,k8s.io/api/core/v1,k8s.io/api/apps/v1,kmodules.xyz/offshoot-api/api/v1,kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1,kmodules.xyz/monitoring-agent-api/api/v1,k8s.io/api/rbac/v1,k8s.io/api/autoscaling/v2beta2,kmodules.xyz/objectstore-api/api/v1,kmodules.xyz/client-go/api/v1,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" \
--output-package "$(GO_PKG)/$(REPO)/apis/$(subst _,/,$*)" \
--report-filename .config/api-rules/violation_exceptions.list

Expand Down
2,418 changes: 1,962 additions & 456 deletions apis/archiver/v1alpha1/openapi_generated.go
View file

Large diffs are not rendered by default.

2,606 changes: 2,056 additions & 550 deletions apis/autoscaling/v1alpha1/openapi_generated.go
View file

Large diffs are not rendered by default.

96 changes: 30 additions & 66 deletions apis/catalog/install/pruning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,77 +19,41 @@ package install
import (
"testing"

"kubedb.dev/apimachinery/apis/catalog/fuzzer"
"kubedb.dev/apimachinery/apis/catalog/v1alpha1"

clientsetscheme "k8s.io/client-go/kubernetes/scheme"
crdfuzz "kmodules.xyz/crd-schema-fuzz"
)

func TestPruneTypes(t *testing.T) {
Install(clientsetscheme.Scheme)

// CRD v1
if crd := (v1alpha1.ElasticsearchVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.EtcdVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.MariaDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.MemcachedVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.MongoDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.MySQLVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.PerconaXtraDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.PostgresVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.ProxySQLVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}
if crd := (v1alpha1.RedisVersion{}).CustomResourceDefinition(); crd.V1 != nil {
crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
}

// CRD v1beta1
if crd := (v1alpha1.ElasticsearchVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.EtcdVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.MariaDBVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.MemcachedVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.MongoDBVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.MySQLVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.PerconaXtraDBVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.PostgresVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.ProxySQLVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
if crd := (v1alpha1.RedisVersion{}).CustomResourceDefinition(); crd.V1beta1 != nil {
crdfuzz.SchemaFuzzTestForV1beta1CRD(t, clientsetscheme.Scheme, crd.V1beta1, fuzzer.Funcs)
}
// if crd := (v1alpha1.ElasticsearchVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.EtcdVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.MariaDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.MemcachedVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.MongoDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.MySQLVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.PerconaXtraDBVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.PostgresVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.ProxySQLVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
// if crd := (v1alpha1.RedisVersion{}).CustomResourceDefinition(); crd.V1 != nil {
// crdfuzz.SchemaFuzzTestForV1CRD(t, clientsetscheme.Scheme, crd.V1, fuzzer.Funcs)
// }
}
6 changes: 3 additions & 3 deletions apis/catalog/v1alpha1/clickhouse_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ const (
ResourcePluralClickHouseVersion = "clickhouseversions"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

// ClickHouseVersion defines a ClickHouse database version.

// +genclient
Expand Down Expand Up @@ -69,6 +66,9 @@ type ClickHouseVersionSpec struct {
// SecurityContext is for the additional config for the DB container
// +optional
SecurityContext SecurityContext `json:"securityContext"`

// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// ClickHouseVersionDatabase is the ClickHouse Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/druid_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ type DruidVersionSpec struct {
// SecurityContext is for the additional security information for the Druid container
// +optional
SecurityContext SecurityContext `json:"securityContext"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// DruidVersionDatabase is the Druid Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/elasticsearch_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ type ElasticsearchVersionSpec struct {
UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
// +optional
GitSyncer GitSyncer `json:"gitSyncer,omitempty"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// ElasticsearchVersionDatabase is the Elasticsearch Database image
Expand Down
3 changes: 3 additions & 0 deletions apis/catalog/v1alpha1/ferretdb_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ type FerretDBVersionSpec struct {
// SecurityContext is for the additional security information for the FerretDB container
// +optional
SecurityContext SecurityContext `json:"securityContext"`

// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// FerretDBVersionDatabase is the FerretDB Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/kafka_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ type KafkaVersionSpec struct {
// SecurityContext is for the additional config for the DB container
// +optional
SecurityContext SecurityContext `json:"securityContext"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// KafkaVersionDatabase is the Kafka Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/mariadb_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ type MariaDBVersionSpec struct {
SecurityContext SecurityContext `json:"securityContext"`
// Archiver defines the walg & stash-addon related specifications
Archiver ArchiverSpec `json:"archiver,omitempty"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// MariaDBVersionDatabase is the mariadb image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/memcached_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ type MemcachedVersionSpec struct {
// SecurityContext is for the additional config for the DB container
// +optional
SecurityContext SecurityContext `json:"securityContext"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// MemcachedVersionDatabase is the Memcached Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/mongodb_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ type MongoDBVersionSpec struct {
SecurityContext MongoDBSecurityContext `json:"securityContext"`
// Archiver defines the walg & kube-stash-addon related specifications
Archiver ArchiverSpec `json:"archiver,omitempty"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// MongoDBVersionDatabase is the MongoDB Database image
Expand Down
2 changes: 2 additions & 0 deletions apis/catalog/v1alpha1/mssql_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ type MSSQLServerVersionSpec struct {
SecurityContext SecurityContext `json:"securityContext"`
// update constraints
UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// MSSQLServerDatabase is the MSSQLServer Database image
Expand Down
3 changes: 2 additions & 1 deletion apis/catalog/v1alpha1/mysql_version_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,10 @@ type MySQLVersionSpec struct {
// SecurityContext is for the additional config for the DB container
// +optional
SecurityContext SecurityContext `json:"securityContext"`

// Archiver defines the walg & kube-stash-addon related specifications
Archiver ArchiverSpec `json:"archiver,omitempty"`
// +optional
UI []ChartInfo `json:"ui,omitempty"`
}

// MySQLVersionDatabase is the MySQL Database image
Expand Down
Loading

0 comments on commit 0fdb807

Please sign in to comment.