Merge branch 'main' into listservices

kubeshop · Jun 14, 2022 · 227f13d · 227f13d
2 parents 5687b85 + 9734331
commit 227f13d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/server/go/api_create_new_static_route_service_impl.go b/server/go/api_create_new_static_route_service_impl.go
@@ -30,7 +30,7 @@ func NewCreateNewStaticRouteApiService(kuskClient kusk.Client) CreateNewStaticRo
 
 // CreateStaticRoute - create new static route
 func (s *CreateNewStaticRouteApiService) CreateStaticRoute(ctx context.Context, staticRouteItem InlineObject1) (ImplResponse, error) {
-	staticRoute, err := s.kuskClient.CreateStaticRoute(staticRouteItem.Namespace, staticRouteItem.Name, staticRouteItem.EnvoyFleetName, staticRouteItem.EnvoyFleetNamespace)
+	staticRoute, err := s.kuskClient.CreateStaticRoute(staticRouteItem.Namespace, staticRouteItem.Name, staticRouteItem.EnvoyFleetName, staticRouteItem.EnvoyFleetNamespace, staticRouteItem.Openapi)
 	if err != nil {
 		return Response(http.StatusInternalServerError, err), err
 	}

diff --git a/server/kusk/client.go b/server/kusk/client.go
@@ -2,9 +2,11 @@ package k8sclient
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/kubeshop/kusk-gateway/api/v1alpha1"
 	kuskv1 "github.com/kubeshop/kusk-gateway/api/v1alpha1"
+	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -24,7 +26,7 @@ type Client interface {
 
 	GetStaticRoute(namespace, name string) (*kuskv1.StaticRoute, error)
 	GetStaticRoutes(namespace string) (*kuskv1.StaticRouteList, error)
-	CreateStaticRoute(namespace, name, fleetName, fleetNamespace string) (*kuskv1.StaticRoute, error)
+	CreateStaticRoute(namespace, name, fleetName, fleetNamespace, specs string) (*kuskv1.StaticRoute, error)
 	DeleteStaticRoute(kuskv1.StaticRoute) error
 
 	GetSvc(namespace, name string) (*corev1.Service, error)
@@ -178,7 +180,7 @@ func (k *kuskClient) GetStaticRoutes(namespace string) (*kuskv1.StaticRouteList,
 	return list, nil
 }
 
-func (k *kuskClient) CreateStaticRoute(namespace, name, fleetName, fleetNamespace string) (*kuskv1.StaticRoute, error) {
+func (k *kuskClient) CreateStaticRoute(namespace, name, fleetName, fleetNamespace, specs string) (*kuskv1.StaticRoute, error) {
 	staticRoute := &kuskv1.StaticRoute{
 		ObjectMeta: v1.ObjectMeta{
 			Name:      name,
@@ -191,6 +193,17 @@ func (k *kuskClient) CreateStaticRoute(namespace, name, fleetName, fleetNamespac
 			},
 		},
 	}
+
+	tmp := &kuskv1.StaticRoute{}
+
+	err := yaml.Unmarshal([]byte(specs), tmp)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	staticRoute.Spec.Paths = tmp.Spec.Paths
+	staticRoute.Spec.Hosts = tmp.Spec.Hosts
+
 	if err := k.client.Create(context.TODO(), staticRoute, &client.CreateOptions{}); err != nil {
 		return nil, err
 	}

diff --git a/server/main.go b/server/main.go
@@ -42,9 +42,12 @@ func main() {
 	FleetsApiService := openapi.NewFleetsApiService(kuskClient)
 	FleetsApiController := openapi.NewFleetsApiController(FleetsApiService)
 
-	CreateNewFleetApiService := openapi.NewCreateNewFleetApiService(kuskClient)
+  CreateNewFleetApiService := openapi.NewCreateNewFleetApiService(kuskClient)
 	CreateNewFlettApiController := openapi.NewCreateNewFleetApiController(CreateNewFleetApiService)
 
+  CreateFleetService := openapi.NewCreateNewFleetApiService(kuskClient)
+	CreateFleetController := openapi.NewCreateNewFleetApiController(CreateFleetService)
+
 	ServicesApiService := openapi.NewServicesApiService(kuskClient)
 	ServicesApiController := openapi.NewServicesApiController(ServicesApiService)
 
@@ -66,6 +69,7 @@ func main() {
 		ApisApiController,
 		FleetsApiController,
 		CreateNewFlettApiController,
+		CreateFleetController,
 		ServicesApiController,
 		StaticCreateRouteApiController,
 		StaticRouteApiController,
@@ -84,6 +88,7 @@ var (
 		"Content-Language",
 		"Origin",
 		"Content-Type",
+		"Accept-Language",
 		"Content-Length",
 		"Accept-Encoding",
 		"Authorization",