Skip to content

Commit

Permalink
feat(): api changes for no-net slice
Browse files Browse the repository at this point in the history
Signed-off-by: Mridul Gain <[email protected]>
  • Loading branch information
mridulgain committed Mar 8, 2024
1 parent 44790f1 commit a267c97
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 13 deletions.
5 changes: 3 additions & 2 deletions api/v1beta1/slice_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package v1beta1

import (
controllerv1alpha1 "github.com/kubeslice/apis/pkg/controller/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -73,8 +74,8 @@ type SliceConfig struct {
SliceGatewayServiceType string `json:"sliceGatewayServiceType,omitempty"`
// SliceGateway Protocol Type: UDP or TCP
SliceGatewayProtocol string `json:"sliceGatewayProtocol,omitempty"`
// Slice overlay network deployment mode: single-network or multi-network
SliceOverlayNetworkDeploymentMode string `json:"sliceOverlayNetworkDeploymentMode,omitempty"`
// Slice overlay network deployment mode: single-network, multi-network or no-network
SliceOverlayNetworkDeploymentMode controllerv1alpha1.NetworkType `json:"sliceOverlayNetworkDeploymentMode,omitempty"`
}

// NamespaceIsolationProfile defines the namespace isolation policy for the slice
Expand Down
8 changes: 6 additions & 2 deletions config/crd/bases/networking.kubeslice.io_slices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,12 @@ spec:
- sliceIpamType
type: object
sliceOverlayNetworkDeploymentMode:
description: 'Slice overlay network deployment mode: single-network
or multi-network'
description: 'Slice overlay network deployment mode: single-network,
multi-network or no-network'
enum:
- single-network
- multi-network
- no-network
type: string
sliceSubnet:
description: IP subnet range of the slice.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/go-logr/zapr v1.2.4
//github.com/golang/protobuf v1.5.3
github.com/google/go-cmp v0.6.0
github.com/kubeslice/apis v0.2.2
github.com/kubeslice/apis v0.2.3-0.20240307054132-61ec44fcebc8
github.com/kubeslice/gateway-sidecar v0.2.0
github.com/kubeslice/kubeslice-monitoring v0.1.10
github.com/kubeslice/netops v0.1.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubeslice/apis v0.2.2 h1:UAxAhEZ+76545qth5Br2cGr9lnj3aV0YbJptoGf61hk=
github.com/kubeslice/apis v0.2.2/go.mod h1:YDSfpIsQM+FtQPaZVGNCTZnlp3viWuQhkjJjIHQdaYs=
github.com/kubeslice/apis v0.2.3-0.20240307054132-61ec44fcebc8 h1:+62yoUD70lT99DPdnFIaKQSH7Yx0nMN8vj4CIpd9QU8=
github.com/kubeslice/apis v0.2.3-0.20240307054132-61ec44fcebc8/go.mod h1:YDSfpIsQM+FtQPaZVGNCTZnlp3viWuQhkjJjIHQdaYs=
github.com/kubeslice/gateway-sidecar v0.2.0 h1:Ja3fIUivuSjUFQ4lPCt79ATq99BxslvAFYUwV9Urpy4=
github.com/kubeslice/gateway-sidecar v0.2.0/go.mod h1:nM1+Wjud2vk44cUg+9iwBbWTpqI+2Ecbn9NuaHEs9aY=
github.com/kubeslice/kubeslice-monitoring v0.1.10 h1:ozzGuSxr5dsouI2ATtPOLygsKfQ8w6wUI9QHkSp33TQ=
Expand Down

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

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ github.com/josharian/intern
# github.com/json-iterator/go v1.1.12
## explicit; go 1.12
github.com/json-iterator/go
# github.com/kubeslice/apis v0.2.2
# github.com/kubeslice/apis v0.2.3-0.20240307054132-61ec44fcebc8
## explicit; go 1.16
github.com/kubeslice/apis/pkg/controller/v1alpha1
github.com/kubeslice/apis/pkg/worker/v1alpha1
Expand Down

0 comments on commit a267c97

Please sign in to comment.