update apis for no net

Signed-off-by: Mridul Gain <[email protected]>
kubeslice · Mar 26, 2024 · 225f5a9 · 225f5a9
1 parent 61ec44f
commit 225f5a9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/pkg/controller/v1alpha1/cluster_types.go b/pkg/controller/v1alpha1/cluster_types.go
@@ -125,6 +125,9 @@ type ClusterStatus struct {
 	RegistrationStatus RegistrationStatus `json:"registrationStatus,omitempty"`
 	// IsDeregisterInProgress is the flag to check if the cluster deregister is InProgress
 	IsDeregisterInProgress bool `json:"isDeregisterInProgress,omitempty"`
+	// NetworkPresent denotes if the networking components (NSM, Spire) are installed on a cluster
+	//+kubebuilder:default:=false
+	NetworkPresent bool `json:"networkPresent,omitempty"`
 
 	// VCPURestriction is the restriction on the cluster disabling the creation of new pods
 	VCPURestriction *VCPURestriction `json:"vCPURestriction,omitempty"`

diff --git a/pkg/controller/v1alpha1/sliceconfig_types.go b/pkg/controller/v1alpha1/sliceconfig_types.go
@@ -44,9 +44,8 @@ type SliceConfigSpec struct {
 	OverlayNetworkDeploymentMode NetworkType `json:"overlayNetworkDeploymentMode,omitempty"`
 	SliceSubnet                  string      `json:"sliceSubnet,omitempty"`
 	//+kubebuilder:default:=Application
-	SliceType string `json:"sliceType,omitempty"`
-	// +kubebuilder:validation:Required
-	SliceGatewayProvider WorkerSliceGatewayProvider `json:"sliceGatewayProvider"`
+	SliceType            string                      `json:"sliceType,omitempty"`
+	SliceGatewayProvider *WorkerSliceGatewayProvider `json:"sliceGatewayProvider,omitempty"`
 	//+kubebuilder:default:=Local
 	SliceIpamType          string   `json:"sliceIpamType,omitempty"`
 	Clusters               []string `json:"clusters,omitempty"`
@@ -58,7 +57,7 @@ type SliceConfigSpec struct {
 	//+kubebuilder:validation:Minimum=2
 	//+kubebuilder:validation:Maximum=32
 	//+kubebuilder:default:=16
-	MaxClusters int `json:"maxClusters,omitempty"`
+	MaxClusters int `json:"maxClusters"`
 	//+kubebuilder:validation:Minimum=30
 	//+kubebuilder:validation:Maximum=90
 	//+kubebuilder:default:=30

diff --git a/pkg/controller/v1alpha1/zz_generated.deepcopy.go b/pkg/controller/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/worker/v1alpha1/workersliceconfig_types.go b/pkg/worker/v1alpha1/workersliceconfig_types.go
@@ -48,10 +48,9 @@ type WorkerSliceConfigSpec struct {
 	QosProfileDetails         QOSProfile                `json:"qosProfileDetails,omitempty"`
 	NamespaceIsolationProfile NamespaceIsolationProfile `json:"namespaceIsolationProfile,omitempty"`
 	IpamClusterOctet          int                       `json:"ipamClusterOctet,omitempty"`
-	//+kubebuilder:validation:Required
-	Octet                 *int                  `json:"octet"`
-	ClusterSubnetCIDR     string                `json:"clusterSubnetCIDR,omitempty"`
-	ExternalGatewayConfig ExternalGatewayConfig `json:"externalGatewayConfig,omitempty"`
+	Octet                     *int                      `json:"octet,omitempty"`
+	ClusterSubnetCIDR         string                    `json:"clusterSubnetCIDR,omitempty"`
+	ExternalGatewayConfig     ExternalGatewayConfig     `json:"externalGatewayConfig,omitempty"`
 	//+kubebuilder:default:=single-network
 	OverlayNetworkDeploymentMode controllerv1alpha1.NetworkType `json:"overlayNetworkDeploymentMode,omitempty"`
 }