Skip to content

Commit

Permalink
Introduce v1 api (#1236)
Browse files Browse the repository at this point in the history

Signed-off-by: Tamal Saha <tamal@appscode.com>
Signed-off-by: souravbiswassanto <saurov@appscode.com>
Signed-off-by: raihankhan <raihan@appscode.com>
Signed-off-by: sayedppqq <sayed@appscode.com>
Signed-off-by: ashraful <ashraf@appscode.com>
Signed-off-by: SK Ali Arman <arman@appscode.com>
Signed-off-by: Neaj Morshad <neaj@appscode.com>
Signed-off-by: obaydullahmhs <obaydullah@appscode.com>
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
Signed-off-by: Muhammad Raisul Islam Evan <raisul@appscode.com>
Co-authored-by: souravbiswassanto <saurov@appscode.com>
Co-authored-by: raihankhan <raihan@appscode.com>
Co-authored-by: sayedppqq <sayed@appscode.com>
Co-authored-by: ashraful <ashraf@appscode.com>
Co-authored-by: Hiranmoy Das Chowdhury <hiranmoy@appscode.com>
Co-authored-by: SK Ali Arman <arman@appscode.com>
Co-authored-by: Neaj Morshad <neaj@appscode.com>
Co-authored-by: obaydullahmhs <obaydullah@appscode.com>
Co-authored-by: Arnob kumar saha <arnob@appscode.com>
Co-authored-by: Muhammad Raisul Islam Evan <raisul@appscode.com>
  • Loading branch information
11 people authored Jul 3, 2024
1 parent 42019af commit 01fcb66
Show file tree
Hide file tree
Showing 898 changed files with 215,939 additions and 40,918 deletions.
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BIN := apimachinery
CRD_OPTIONS ?= "crd:maxDescLen=0,generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
# https://github.com/appscodelabs/gengo-builder
CODE_GENERATOR_IMAGE ?= ghcr.io/appscode/gengo:release-1.29
CORE_API_GROUPS ?= kubedb:v1alpha1 kubedb:v1alpha2 postgres:v1alpha1 catalog:v1alpha1 config:v1alpha1 ops:v1alpha1 autoscaling:v1alpha1 elasticsearch:v1alpha1 schema:v1alpha1 archiver:v1alpha1 kafka:v1alpha1
CORE_API_GROUPS ?= kubedb:v1alpha1 kubedb:v1alpha2 kubedb:v1 postgres:v1alpha1 catalog:v1alpha1 config:v1alpha1 ops:v1alpha1 autoscaling:v1alpha1 elasticsearch:v1alpha1 schema:v1alpha1 archiver:v1alpha1 kafka:v1alpha1
API_GROUPS ?= $(CORE_API_GROUPS) ui:v1alpha1

# This version-strategy uses git tags to set the version string
Expand Down Expand Up @@ -125,7 +125,6 @@ clientset:

.PHONY: gen-conversion
gen-conversion:
rm -rf ./apis/kubedb/v1alpha1/zz_generated.conversion.go
@docker run --rm \
-u $$(id -u):$$(id -g) \
-v /tmp:/.cache \
Expand All @@ -135,7 +134,7 @@ gen-conversion:
--env HTTPS_PROXY=$(HTTPS_PROXY) \
$(CODE_GENERATOR_IMAGE) \
/go/bin/conversion-gen --go-header-file ./hack/license/go.txt \
--input-dirs $(GO_PKG)/$(REPO)/apis/kubedb/v1alpha1 \
--input-dirs ./apis/kubedb/v1alpha2 \
--extra-peer-dirs "kmodules.xyz/monitoring-agent-api/api/v1" \
-O zz_generated.conversion

Expand Down Expand Up @@ -373,7 +372,7 @@ lint: $(BUILD_DIRS)
--env GO111MODULE=on \
--env GOFLAGS="-mod=vendor" \
$(BUILD_IMAGE) \
golangci-lint run --enable $(ADDTL_LINTERS) --max-same-issues=100 --timeout=10m --skip-files="generated.*\.go$\" --skip-dirs-use-default --skip-dirs=vendor
golangci-lint run --enable $(ADDTL_LINTERS) --max-same-issues=100 --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=vendor

$(BUILD_DIRS):
@mkdir -p $@
Expand Down
2 changes: 1 addition & 1 deletion apis/archiver/v1alpha1/mariadbarchiver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kmapi "kmodules.xyz/client-go/api/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/archiver/v1alpha1/mongodbarchiver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kmapi "kmodules.xyz/client-go/api/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/archiver/v1alpha1/mysqlarchiver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kmapi "kmodules.xyz/client-go/api/v1"
Expand Down
16 changes: 8 additions & 8 deletions apis/archiver/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/archiver/v1alpha1/postgresarchiver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kmapi "kmodules.xyz/client-go/api/v1"
Expand Down
10 changes: 5 additions & 5 deletions apis/archiver/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions apis/autoscaling/v1alpha1/druid_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -43,7 +43,7 @@ func (d *DruidAutoscaler) Default() {
}

func (d *DruidAutoscaler) setDefaults() {
var db dbapi.Druid
var db olddbapi.Druid
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: d.Spec.DatabaseRef.Name,
Namespace: d.Namespace,
Expand Down Expand Up @@ -124,7 +124,7 @@ func (d *DruidAutoscaler) validate() error {
if d.Spec.DatabaseRef == nil {
return errors.New("databaseRef can't be empty")
}
var dr dbapi.Druid
var dr olddbapi.Druid
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: d.Spec.DatabaseRef.Name,
Namespace: d.Namespace,
Expand Down
2 changes: 1 addition & 1 deletion apis/autoscaling/v1alpha1/elasticsearch_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion apis/autoscaling/v1alpha1/kafka_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion apis/autoscaling/v1alpha1/mongodb_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand Down
6 changes: 3 additions & 3 deletions apis/autoscaling/v1alpha1/pgpool_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -43,7 +43,7 @@ func (r *PgpoolAutoscaler) Default() {
}

func (r *PgpoolAutoscaler) setDefaults() {
var db dbapi.Pgpool
var db olddbapi.Pgpool
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: r.Spec.DatabaseRef.Name,
Namespace: r.Namespace,
Expand Down Expand Up @@ -93,7 +93,7 @@ func (r *PgpoolAutoscaler) validate() error {
if r.Spec.DatabaseRef == nil {
return errors.New("databaseRef can't be empty")
}
var pp dbapi.Pgpool
var pp olddbapi.Pgpool
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: r.Spec.DatabaseRef.Name,
Namespace: r.Namespace,
Expand Down
6 changes: 3 additions & 3 deletions apis/autoscaling/v1alpha1/rabbitmq_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -43,7 +43,7 @@ func (r *RabbitMQAutoscaler) Default() {
}

func (r *RabbitMQAutoscaler) setDefaults() {
var db dbapi.RabbitMQ
var db olddbapi.RabbitMQ
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: r.Spec.DatabaseRef.Name,
Namespace: r.Namespace,
Expand Down Expand Up @@ -97,7 +97,7 @@ func (r *RabbitMQAutoscaler) validate() error {
if r.Spec.DatabaseRef == nil {
return errors.New("databaseRef can't be empty")
}
var kf dbapi.RabbitMQ
var kf olddbapi.RabbitMQ
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: r.Spec.DatabaseRef.Name,
Namespace: r.Namespace,
Expand Down
2 changes: 1 addition & 1 deletion apis/autoscaling/v1alpha1/redis_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand Down
6 changes: 3 additions & 3 deletions apis/autoscaling/v1alpha1/singlestore_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
opsapi "kubedb.dev/apimachinery/apis/ops/v1alpha1"

"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -43,7 +43,7 @@ func (s *SinglestoreAutoscaler) Default() {
}

func (s *SinglestoreAutoscaler) setDefaults() {
var db dbapi.Singlestore
var db olddbapi.Singlestore
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: s.Spec.DatabaseRef.Name,
Namespace: s.Namespace,
Expand Down Expand Up @@ -107,7 +107,7 @@ func (s *SinglestoreAutoscaler) validate() error {
if s.Spec.DatabaseRef == nil {
return errors.New("databaseRef can't be empty")
}
var sdb dbapi.Singlestore
var sdb olddbapi.Singlestore
err := DefaultClient.Get(context.TODO(), types.NamespacedName{
Name: s.Spec.DatabaseRef.Name,
Namespace: s.Namespace,
Expand Down
2 changes: 1 addition & 1 deletion apis/autoscaling/v1alpha1/webhook_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"
"strings"

dbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
dbapi "kubedb.dev/apimachinery/apis/kubedb/v1"

core "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
14 changes: 8 additions & 6 deletions apis/catalog/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,20 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&KafkaVersionList{},
&KafkaConnectorVersion{},
&KafkaConnectorVersionList{},
&MemcachedVersion{},
&MemcachedVersionList{},
&MariaDBVersion{},
&MariaDBVersionList{},
&MemcachedVersion{},
&MemcachedVersionList{},
&MongoDBVersion{},
&MongoDBVersionList{},
&MSSQLServerVersion{},
&MSSQLServerVersionList{},
&MySQLVersion{},
&MySQLVersionList{},
&PerconaXtraDBVersion{},
&PerconaXtraDBVersionList{},
&PgBouncerVersion{},
&PgBouncerVersionList{},
&PgpoolVersion{},
&PgpoolVersionList{},
&PostgresVersion{},
Expand All @@ -88,16 +92,14 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&RabbitMQVersionList{},
&RedisVersion{},
&RedisVersionList{},
&SchemaRegistryVersion{},
&SchemaRegistryVersionList{},
&SinglestoreVersion{},
&SinglestoreVersionList{},
&SolrVersion{},
&SolrVersionList{},
&ZooKeeperVersion{},
&ZooKeeperVersionList{},
&MSSQLServerVersion{},
&MSSQLServerVersionList{},
&SchemaRegistryVersion{},
&SchemaRegistryVersionList{},
)

scheme.AddKnownTypes(SchemeGroupVersion,
Expand Down
Loading

0 comments on commit 01fcb66

Please sign in to comment.