diff --git a/go.mod b/go.mod index 3029cf6d..95ce1720 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,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.3.1 + github.com/kubeslice/apis v0.3.3 github.com/kubeslice/gateway-sidecar v0.2.0 github.com/kubeslice/kubeslice-monitoring v0.2.1 github.com/kubeslice/netops v0.1.3 diff --git a/go.sum b/go.sum index a3a8486c..4ab90fda 100644 --- a/go.sum +++ b/go.sum @@ -383,6 +383,8 @@ 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.3.1 h1:5t8vTpyiu+2w8vLq4ATpEfhPJX4gG6mMZF+PcJQw8gM= github.com/kubeslice/apis v0.3.1/go.mod h1:YDSfpIsQM+FtQPaZVGNCTZnlp3viWuQhkjJjIHQdaYs= +github.com/kubeslice/apis v0.3.3 h1:bOu3bX4DOX2EZFYQH8WQONb3fAeEUUBimYRyDrcbqP0= +github.com/kubeslice/apis v0.3.3/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.2.1 h1:wtmIEigpQoKzuckof7QRqdsaa4lV/rqxd/FcmOj5N5Q= diff --git a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/cluster_types.go b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/cluster_types.go index 63efbe84..a2d898f1 100644 --- a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/cluster_types.go +++ b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/cluster_types.go @@ -57,6 +57,9 @@ type ClusterSpec struct { NetworkInterface string `json:"networkInterface,omitempty"` //put in an object ClusterProperty ClusterProperty `json:"clusterProperty,omitempty"` + // EnableAutoEviction is a flag to enable auto eviction feature for the given cluster + EnableAutoEviction bool `json:"enableAutoEviction,omitempty"` + RequeueOnFailure bool `json:"requeueOnFailure,omitempty"` } type ClusterProperty struct { @@ -92,6 +95,8 @@ type GeoLocation struct { // Monitoring defines the field of ClusterSpec type Monitoring struct { + // GrafanaDashboardBaseURL is the base URL for the grafana dashboard + GrafanaDashboardBaseURL string `json:"grafanaDashboardBaseURL,omitempty"` //KubernetesDashboard contains the information regarding Kubernetes Monitoring Dashboard KubernetesDashboard KubernetesDashboard `json:"kubernetesDashboard,omitempty"` } diff --git a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/project_types.go b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/project_types.go index 114a6c71..08be4a4a 100644 --- a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/project_types.go +++ b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/project_types.go @@ -24,6 +24,8 @@ import ( type ProjectSpec struct { // ServiceAccount is a field of Project. Edit project_types.go to remove/update ServiceAccount ServiceAccount `json:"serviceAccount,omitempty"` + // If defaultSliceCreation is true, then the default slice will be created + DefaultSliceCreation bool `json:"defaultSliceCreation,omitempty"` } // ServiceAccount defines the field of ProjectSpec diff --git a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/zz_generated.deepcopy.go index 0490636b..f1958398 100644 --- a/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/kubeslice/apis/pkg/controller/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright (c) 2022 Avesha, Inc. All rights reserved. SPDX-License-Identifier: Apache-2.0 @@ -209,6 +208,7 @@ func (in *ExternalGatewayConfig) DeepCopyInto(out *ExternalGatewayConfig) { *out = make([]string, len(*in)) copy(*out, *in) } + out.VPCServiceAccess = in.VPCServiceAccess } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalGatewayConfig. @@ -452,6 +452,23 @@ func (in *QOSProfile) DeepCopy() *QOSProfile { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ServiceAccess) DeepCopyInto(out *ServiceAccess) { + *out = *in + out.Ingress = in.Ingress + out.Egress = in.Egress +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceAccess. +func (in *ServiceAccess) DeepCopy() *ServiceAccess { + if in == nil { + return nil + } + out := new(ServiceAccess) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServiceAccount) DeepCopyInto(out *ServiceAccount) { *out = *in @@ -995,7 +1012,8 @@ func (in *VpnKeyRotationSpec) DeepCopyInto(out *VpnKeyRotationSpec) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make([]string, len(*in)) copy(*out, *in) } @@ -1045,7 +1063,8 @@ func (in *VpnKeyRotationStatus) DeepCopyInto(out *VpnKeyRotationStatus) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make([]StatusOfKeyRotation, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) diff --git a/vendor/github.com/kubeslice/apis/pkg/worker/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/kubeslice/apis/pkg/worker/v1alpha1/zz_generated.deepcopy.go index bda9ca32..5cd610f7 100644 --- a/vendor/github.com/kubeslice/apis/pkg/worker/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/kubeslice/apis/pkg/worker/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright (c) 2022 Avesha, Inc. All rights reserved. SPDX-License-Identifier: Apache-2.0 @@ -75,6 +74,7 @@ func (in *ExternalGatewayConfig) DeepCopyInto(out *ExternalGatewayConfig) { out.Ingress = in.Ingress out.Egress = in.Egress out.NsIngress = in.NsIngress + out.VPCServiceAccess = in.VPCServiceAccess } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExternalGatewayConfig. diff --git a/vendor/modules.txt b/vendor/modules.txt index dc94c1b5..0c0cfb03 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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.3.1 +# github.com/kubeslice/apis v0.3.3 ## explicit; go 1.16 github.com/kubeslice/apis/pkg/controller/v1alpha1 github.com/kubeslice/apis/pkg/worker/v1alpha1