1
0
Fork 0
mirror of https://github.com/arangodb/kube-arangodb.git synced 2024-12-14 11:57:37 +00:00

[Feature] [Networking] ArangoRoute Protocol (#1773)

This commit is contained in:
Adam Janikowski 2024-11-29 10:27:30 +01:00 committed by GitHub
parent 44f2bf61e2
commit faf43e7a33
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 475 additions and 20 deletions

View file

@ -25,6 +25,7 @@
- (Feature) (Platform) Chart Integration - (Feature) (Platform) Chart Integration
- (Maintenance) Switch to google.golang.org/protobuf - (Maintenance) Switch to google.golang.org/protobuf
- (Feature) Add DebugPackage to the OPS Binary - (Feature) Add DebugPackage to the OPS Binary
- (Feature) (Networking) ArangoRoute Protocol
## [1.2.43](https://github.com/arangodb/kube-arangodb/tree/1.2.43) (2024-10-14) ## [1.2.43](https://github.com/arangodb/kube-arangodb/tree/1.2.43) (2024-10-14)
- (Feature) ArangoRoute CRD - (Feature) ArangoRoute CRD

View file

@ -83,18 +83,34 @@ UID keeps the information about object UID
### .spec.destination.path ### .spec.destination.path
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_spec_destination.go#L39)</sup> Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_spec_destination.go#L46)</sup>
Path defines service path used for overrides Path defines service path used for overrides
*** ***
### .spec.destination.protocol
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_spec_destination.go#L40)</sup>
Protocol defines http protocol used for the route
Possible Values:
* `"http1"` (default) - HTTP 1.1 Protocol
* `"http2"` - HTTP 2 Protocol
***
### .spec.destination.schema ### .spec.destination.schema
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_spec_destination.go#L33)</sup> Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_spec_destination.go#L35)</sup>
Schema defines HTTP/S schema used for connection Schema defines HTTP/S schema used for connection
Possible Values:
* `"http"` (default) - HTTP Connection
* `"https"` - HTTPS Connection (HTTP with TLS)
*** ***
### .spec.destination.service.checksum ### .spec.destination.service.checksum
@ -238,12 +254,20 @@ Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.
### .status.target.path ### .status.target.path
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_status_target.go#L43)</sup> Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_status_target.go#L46)</sup>
Path specifies request path override Path specifies request path override
*** ***
### .status.target.protocol
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_status_target.go#L40)</sup>
Protocol defines http protocol used for the route
***
### .status.target.TLS.insecure ### .status.target.TLS.insecure
Type: `boolean` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_status_target_tls.go#L27)</sup> Type: `boolean` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.43/pkg/apis/networking/v1alpha1/route_status_target_tls.go#L27)</sup>

View file

@ -30,8 +30,15 @@ type ArangoRouteSpecDestination struct {
Endpoints *ArangoRouteSpecDestinationEndpoints `json:"endpoints,omitempty"` Endpoints *ArangoRouteSpecDestinationEndpoints `json:"endpoints,omitempty"`
// Schema defines HTTP/S schema used for connection // Schema defines HTTP/S schema used for connection
// +doc/enum: http|HTTP Connection
// +doc/enum: https|HTTPS Connection (HTTP with TLS)
Schema *ArangoRouteSpecDestinationSchema `json:"schema,omitempty"` Schema *ArangoRouteSpecDestinationSchema `json:"schema,omitempty"`
// Protocol defines http protocol used for the route
// +doc/enum: http1|HTTP 1.1 Protocol
// +doc/enum: http2|HTTP 2 Protocol
Protocol *ArangoRouteDestinationProtocol `json:"protocol,omitempty"`
// TLS defines TLS Configuration // TLS defines TLS Configuration
TLS *ArangoRouteSpecDestinationTLS `json:"tls,omitempty"` TLS *ArangoRouteSpecDestinationTLS `json:"tls,omitempty"`
@ -58,6 +65,14 @@ func (a *ArangoRouteSpecDestination) GetEndpoints() *ArangoRouteSpecDestinationE
return a.Endpoints return a.Endpoints
} }
func (a *ArangoRouteSpecDestination) GetProtocol() *ArangoRouteDestinationProtocol {
if a == nil || a.Protocol == nil {
return nil
}
return a.Protocol
}
func (a *ArangoRouteSpecDestination) GetSchema() *ArangoRouteSpecDestinationSchema { func (a *ArangoRouteSpecDestination) GetSchema() *ArangoRouteSpecDestinationSchema {
if a == nil || a.Schema == nil { if a == nil || a.Schema == nil {
return nil return nil
@ -100,6 +115,7 @@ func (a *ArangoRouteSpecDestination) Validate() error {
shared.ValidateOptionalInterfacePath("service", a.Service), shared.ValidateOptionalInterfacePath("service", a.Service),
shared.ValidateOptionalInterfacePath("endpoints", a.Endpoints), shared.ValidateOptionalInterfacePath("endpoints", a.Endpoints),
shared.ValidateOptionalInterfacePath("schema", a.Schema), shared.ValidateOptionalInterfacePath("schema", a.Schema),
shared.ValidateOptionalInterfacePath("protocol", a.Protocol),
shared.ValidateOptionalInterfacePath("tls", a.TLS), shared.ValidateOptionalInterfacePath("tls", a.TLS),
shared.ValidateOptionalInterfacePath("authentication", a.Authentication), shared.ValidateOptionalInterfacePath("authentication", a.Authentication),
shared.PrefixResourceError("path", shared.ValidateAPIPath(a.GetPath())), shared.PrefixResourceError("path", shared.ValidateAPIPath(a.GetPath())),

View file

@ -0,0 +1,55 @@
//
// DISCLAIMER
//
// Copyright 2024 ArangoDB GmbH, Cologne, Germany
//
// 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.
//
// Copyright holder is ArangoDB GmbH, Cologne, Germany
//
package v1alpha1
import (
"github.com/arangodb/kube-arangodb/pkg/util/errors"
"github.com/arangodb/kube-arangodb/pkg/util/strings"
)
type ArangoRouteDestinationProtocol string
const (
ArangoRouteDestinationProtocolHTTP1 ArangoRouteDestinationProtocol = "http1"
ArangoRouteDestinationProtocolHTTP2 ArangoRouteDestinationProtocol = "http2"
ArangoRouteDestinationProtocolDefault = ArangoRouteDestinationProtocolHTTP1
)
func (a *ArangoRouteDestinationProtocol) Get() ArangoRouteDestinationProtocol {
if a == nil {
return ArangoRouteDestinationProtocolDefault
}
return ArangoRouteDestinationProtocol(strings.ToLower(string(*a)))
}
func (a *ArangoRouteDestinationProtocol) String() string {
return string(a.Get())
}
func (a *ArangoRouteDestinationProtocol) Validate() error {
switch x := a.Get(); x {
case ArangoRouteDestinationProtocolHTTP1, ArangoRouteDestinationProtocolHTTP2:
return nil
default:
return errors.Errorf("Invalid schema: %s", x.String())
}
}

View file

@ -36,6 +36,9 @@ type ArangoRouteStatusTarget struct {
// TLS Keeps target TLS Settings (if not nil, TLS is enabled) // TLS Keeps target TLS Settings (if not nil, TLS is enabled)
TLS *ArangoRouteStatusTargetTLS `json:"TLS,omitempty"` TLS *ArangoRouteStatusTargetTLS `json:"TLS,omitempty"`
// Protocol defines http protocol used for the route
Protocol ArangoRouteDestinationProtocol `json:"protocol,omitempty"`
// Authentication specifies the authentication details // Authentication specifies the authentication details
Authentication ArangoRouteStatusTargetAuthentication `json:"authentication,omitempty"` Authentication ArangoRouteStatusTargetAuthentication `json:"authentication,omitempty"`

View file

@ -147,6 +147,11 @@ func (in *ArangoRouteSpecDestination) DeepCopyInto(out *ArangoRouteSpecDestinati
*out = new(ArangoRouteSpecDestinationSchema) *out = new(ArangoRouteSpecDestinationSchema)
**out = **in **out = **in
} }
if in.Protocol != nil {
in, out := &in.Protocol, &out.Protocol
*out = new(ArangoRouteDestinationProtocol)
**out = **in
}
if in.TLS != nil { if in.TLS != nil {
in, out := &in.TLS, &out.TLS in, out := &in.TLS, &out.TLS
*out = new(ArangoRouteSpecDestinationTLS) *out = new(ArangoRouteSpecDestinationTLS)

View file

@ -49,8 +49,17 @@ v1alpha1:
path: path:
description: Path defines service path used for overrides description: Path defines service path used for overrides
type: string type: string
protocol:
description: Protocol defines http protocol used for the route
enum:
- http1
- http2
type: string
schema: schema:
description: Schema defines HTTP/S schema used for connection description: Schema defines HTTP/S schema used for connection
enum:
- http
- https
type: string type: string
service: service:
description: Service defines service upstream reference description: Service defines service upstream reference

View file

@ -24,10 +24,8 @@ import (
"time" "time"
clusterAPI "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" clusterAPI "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
coreAPI "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
endpointAPI "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" endpointAPI "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
routeAPI "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" routeAPI "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
upstreamHttpApi "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
"google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/durationpb"
@ -63,6 +61,8 @@ type ConfigDestination struct {
Type *ConfigDestinationType `json:"type,omitempty"` Type *ConfigDestinationType `json:"type,omitempty"`
Protocol *ConfigDestinationProtocol `json:"protocol,omitempty"`
Path *string `json:"path,omitempty"` Path *string `json:"path,omitempty"`
AuthExtension *ConfigAuthZExtension `json:"authExtension,omitempty"` AuthExtension *ConfigAuthZExtension `json:"authExtension,omitempty"`
@ -77,6 +77,7 @@ func (c *ConfigDestination) Validate() error {
return shared.WithErrors( return shared.WithErrors(
shared.PrefixResourceError("targets", c.Targets.Validate()), shared.PrefixResourceError("targets", c.Targets.Validate()),
shared.PrefixResourceError("type", c.Type.Validate()), shared.PrefixResourceError("type", c.Type.Validate()),
shared.PrefixResourceError("protocol", c.Protocol.Validate()),
shared.PrefixResourceError("path", shared.ValidateAPIPath(c.GetPath())), shared.PrefixResourceError("path", shared.ValidateAPIPath(c.GetPath())),
shared.PrefixResourceError("authExtension", c.AuthExtension.Validate()), shared.PrefixResourceError("authExtension", c.AuthExtension.Validate()),
shared.PrefixResourceError("upgradeConfigs", c.UpgradeConfigs.Validate()), shared.PrefixResourceError("upgradeConfigs", c.UpgradeConfigs.Validate()),
@ -130,21 +131,7 @@ func (c *ConfigDestination) getUpgradeConfigs() ConfigDestinationsUpgrade {
} }
func (c *ConfigDestination) RenderCluster(name string) (*clusterAPI.Cluster, error) { func (c *ConfigDestination) RenderCluster(name string) (*clusterAPI.Cluster, error) {
hpo, err := anypb.New(&upstreamHttpApi.HttpProtocolOptions{ hpo, err := anypb.New(c.Protocol.Options())
UpstreamProtocolOptions: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_{
ExplicitHttpConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig{
ProtocolConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{
Http2ProtocolOptions: &coreAPI.Http2ProtocolOptions{
ConnectionKeepalive: &coreAPI.KeepaliveSettings{
Interval: durationpb.New(15 * time.Second),
Timeout: durationpb.New(30 * time.Second),
ConnectionIdleInterval: durationpb.New(60 * time.Second),
},
},
},
},
},
})
if err != nil { if err != nil {
return nil, err return nil, err
} }

View file

@ -0,0 +1,101 @@
//
// DISCLAIMER
//
// Copyright 2024 ArangoDB GmbH, Cologne, Germany
//
// 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.
//
// Copyright holder is ArangoDB GmbH, Cologne, Germany
//
package gateway
import (
"time"
coreAPI "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
upstreamHttpApi "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
"google.golang.org/protobuf/types/known/durationpb"
"github.com/arangodb/kube-arangodb/pkg/util/errors"
)
type ConfigDestinationProtocol int
const (
ConfigDestinationProtocolHTTP1 ConfigDestinationProtocol = iota
ConfigDestinationProtocolHTTP2
)
func (c *ConfigDestinationProtocol) Get() ConfigDestinationProtocol {
if c == nil {
return ConfigDestinationProtocolHTTP1
}
switch v := *c; v {
case ConfigDestinationProtocolHTTP1, ConfigDestinationProtocolHTTP2:
return v
default:
return ConfigDestinationProtocolHTTP1
}
}
func (c *ConfigDestinationProtocol) Options() *upstreamHttpApi.HttpProtocolOptions {
switch c.Get() {
case ConfigDestinationProtocolHTTP1:
return &upstreamHttpApi.HttpProtocolOptions{
UpstreamProtocolOptions: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_{
ExplicitHttpConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig{
ProtocolConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_HttpProtocolOptions{
HttpProtocolOptions: &coreAPI.Http1ProtocolOptions{},
},
},
},
}
case ConfigDestinationProtocolHTTP2:
return &upstreamHttpApi.HttpProtocolOptions{
UpstreamProtocolOptions: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_{
ExplicitHttpConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig{
ProtocolConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{
Http2ProtocolOptions: &coreAPI.Http2ProtocolOptions{
ConnectionKeepalive: &coreAPI.KeepaliveSettings{
Interval: durationpb.New(15 * time.Second),
Timeout: durationpb.New(30 * time.Second),
ConnectionIdleInterval: durationpb.New(60 * time.Second),
},
},
},
},
},
}
default:
return &upstreamHttpApi.HttpProtocolOptions{
UpstreamProtocolOptions: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_{
ExplicitHttpConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig{
ProtocolConfig: &upstreamHttpApi.HttpProtocolOptions_ExplicitHttpConfig_HttpProtocolOptions{
HttpProtocolOptions: &coreAPI.Http1ProtocolOptions{},
},
},
},
}
}
}
func (c *ConfigDestinationProtocol) Validate() error {
switch c.Get() {
case ConfigDestinationProtocolHTTP1, ConfigDestinationProtocolHTTP2:
return nil
default:
return errors.Errorf("Invalid destination protocol")
}
}

View file

@ -120,6 +120,7 @@ func (h *handler) HandleArangoDestinationEndpoints(ctx context.Context, item ope
target.Path = dest.GetPath() target.Path = dest.GetPath()
target.Type = networkingApi.ArangoRouteStatusTargetEndpointsType target.Type = networkingApi.ArangoRouteStatusTargetEndpointsType
target.Protocol = dest.GetProtocol().Get()
// Render Auth Settings // Render Auth Settings

View file

@ -96,6 +96,149 @@ func Test_Handler_Destination_Endpoints_Valid(t *testing.T) {
require.Len(t, extension.Status.Target.RenderURLs(), 1) require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://127.0.0.1:10244/", extension.Status.Target.RenderURLs()[0]) require.EqualValues(t, "http://127.0.0.1:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http1", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok)
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Hash, extension.Status.Target.Hash())
}
func Test_Handler_Destination_Endpoints_Valid_HTTP1(t *testing.T) {
// Setup
handler := newFakeHandler()
// Arrange
extension := tests.NewMetaObject[*networkingApi.ArangoRoute](t, tests.FakeNamespace, "test",
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Deployment = util.NewType("deployment")
},
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Destination = &networkingApi.ArangoRouteSpecDestination{
Protocol: util.NewType(networkingApi.ArangoRouteDestinationProtocolHTTP1),
Endpoints: &networkingApi.ArangoRouteSpecDestinationEndpoints{
Object: &sharedApi.Object{
Name: "deployment",
},
Port: util.NewType(intstr.FromInt32(10244)),
},
}
})
deployment := tests.NewMetaObject[*api.ArangoDeployment](t, tests.FakeNamespace, "deployment")
svc := tests.NewMetaObject[*core.Service](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Service) {
obj.Spec.Ports = []core.ServicePort{
{
Port: 10244,
},
}
})
endpoints := tests.NewMetaObject[*core.Endpoints](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Endpoints) {
obj.Subsets = []core.EndpointSubset{
{
Addresses: []core.EndpointAddress{
{
IP: "127.0.0.1",
},
},
Ports: []core.EndpointPort{
{
Name: "",
Port: 10244,
},
},
},
}
})
refresh := tests.CreateObjects(t, handler.kubeClient, handler.client, &deployment, &extension, &svc, &endpoints)
// Test
require.NoError(t, tests.Handle(handler, tests.NewItem(t, operation.Update, extension)))
// Refresh
refresh(t)
// Assert
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.SpecValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.DestinationValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.ReadyCondition))
require.Equal(t, networkingApi.ArangoRouteStatusTargetEndpointsType, extension.Status.Target.Type)
require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://127.0.0.1:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http1", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok)
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Hash, extension.Status.Target.Hash())
}
func Test_Handler_Destination_Endpoints_Valid_HTTP2(t *testing.T) {
// Setup
handler := newFakeHandler()
// Arrange
extension := tests.NewMetaObject[*networkingApi.ArangoRoute](t, tests.FakeNamespace, "test",
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Deployment = util.NewType("deployment")
},
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Destination = &networkingApi.ArangoRouteSpecDestination{
Protocol: util.NewType(networkingApi.ArangoRouteDestinationProtocolHTTP2),
Endpoints: &networkingApi.ArangoRouteSpecDestinationEndpoints{
Object: &sharedApi.Object{
Name: "deployment",
},
Port: util.NewType(intstr.FromInt32(10244)),
},
}
})
deployment := tests.NewMetaObject[*api.ArangoDeployment](t, tests.FakeNamespace, "deployment")
svc := tests.NewMetaObject[*core.Service](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Service) {
obj.Spec.Ports = []core.ServicePort{
{
Port: 10244,
},
}
})
endpoints := tests.NewMetaObject[*core.Endpoints](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Endpoints) {
obj.Subsets = []core.EndpointSubset{
{
Addresses: []core.EndpointAddress{
{
IP: "127.0.0.1",
},
},
Ports: []core.EndpointPort{
{
Name: "",
Port: 10244,
},
},
},
}
})
refresh := tests.CreateObjects(t, handler.kubeClient, handler.client, &deployment, &extension, &svc, &endpoints)
// Test
require.NoError(t, tests.Handle(handler, tests.NewItem(t, operation.Update, extension)))
// Refresh
refresh(t)
// Assert
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.SpecValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.DestinationValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.ReadyCondition))
require.Equal(t, networkingApi.ArangoRouteStatusTargetEndpointsType, extension.Status.Target.Type)
require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://127.0.0.1:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http2", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition) c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok) require.True(t, ok)

View file

@ -119,6 +119,7 @@ func (h *handler) HandleArangoDestinationService(ctx context.Context, item opera
target.Path = dest.GetPath() target.Path = dest.GetPath()
target.Type = networkingApi.ArangoRouteStatusTargetServiceType target.Type = networkingApi.ArangoRouteStatusTargetServiceType
target.Protocol = dest.GetProtocol().Get()
// Render Auth Settings // Render Auth Settings

View file

@ -119,6 +119,115 @@ func Test_Handler_Destination_Service_Valid(t *testing.T) {
require.Len(t, extension.Status.Target.RenderURLs(), 1) require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://deployment.fake.svc:10244/", extension.Status.Target.RenderURLs()[0]) require.EqualValues(t, "http://deployment.fake.svc:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http1", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok)
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Hash, extension.Status.Target.Hash())
}
func Test_Handler_Destination_Service_Valid_HTTP1(t *testing.T) {
// Setup
handler := newFakeHandler()
// Arrange
extension := tests.NewMetaObject[*networkingApi.ArangoRoute](t, tests.FakeNamespace, "test",
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Deployment = util.NewType("deployment")
},
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Destination = &networkingApi.ArangoRouteSpecDestination{
Protocol: util.NewType(networkingApi.ArangoRouteDestinationProtocolHTTP1),
Service: &networkingApi.ArangoRouteSpecDestinationService{
Object: &sharedApi.Object{
Name: "deployment",
},
Port: util.NewType(intstr.FromInt32(10244)),
},
}
})
deployment := tests.NewMetaObject[*api.ArangoDeployment](t, tests.FakeNamespace, "deployment")
svc := tests.NewMetaObject[*core.Service](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Service) {
obj.Spec.Ports = []core.ServicePort{
{
Port: 10244,
},
}
})
refresh := tests.CreateObjects(t, handler.kubeClient, handler.client, &deployment, &extension, &svc)
// Test
require.NoError(t, tests.Handle(handler, tests.NewItem(t, operation.Update, extension)))
// Refresh
refresh(t)
// Assert
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.SpecValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.DestinationValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.ReadyCondition))
require.Equal(t, networkingApi.ArangoRouteStatusTargetServiceType, extension.Status.Target.Type)
require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://deployment.fake.svc:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http1", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok)
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Reason, "Destination Found")
require.EqualValues(t, c.Hash, extension.Status.Target.Hash())
}
func Test_Handler_Destination_Service_Valid_HTTP2(t *testing.T) {
// Setup
handler := newFakeHandler()
// Arrange
extension := tests.NewMetaObject[*networkingApi.ArangoRoute](t, tests.FakeNamespace, "test",
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Deployment = util.NewType("deployment")
},
func(t *testing.T, obj *networkingApi.ArangoRoute) {
obj.Spec.Destination = &networkingApi.ArangoRouteSpecDestination{
Protocol: util.NewType(networkingApi.ArangoRouteDestinationProtocolHTTP2),
Service: &networkingApi.ArangoRouteSpecDestinationService{
Object: &sharedApi.Object{
Name: "deployment",
},
Port: util.NewType(intstr.FromInt32(10244)),
},
}
})
deployment := tests.NewMetaObject[*api.ArangoDeployment](t, tests.FakeNamespace, "deployment")
svc := tests.NewMetaObject[*core.Service](t, tests.FakeNamespace, "deployment", func(t *testing.T, obj *core.Service) {
obj.Spec.Ports = []core.ServicePort{
{
Port: 10244,
},
}
})
refresh := tests.CreateObjects(t, handler.kubeClient, handler.client, &deployment, &extension, &svc)
// Test
require.NoError(t, tests.Handle(handler, tests.NewItem(t, operation.Update, extension)))
// Refresh
refresh(t)
// Assert
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.SpecValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.DestinationValidCondition))
require.True(t, extension.Status.Conditions.IsTrue(networkingApi.ReadyCondition))
require.Equal(t, networkingApi.ArangoRouteStatusTargetServiceType, extension.Status.Target.Type)
require.Len(t, extension.Status.Target.RenderURLs(), 1)
require.EqualValues(t, "http://deployment.fake.svc:10244/", extension.Status.Target.RenderURLs()[0])
require.EqualValues(t, "http2", extension.Status.Target.Protocol)
c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition) c, ok := extension.Status.Conditions.Get(networkingApi.DestinationValidCondition)
require.True(t, ok) require.True(t, ok)