Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(): add default slice support #231

Closed
wants to merge 17 commits into from
Closed

feat(): add default slice support #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c8b9922
fix(): add default slice creation flag in project
RohanKumarMainali Nov 13, 2024
b145af2
fix(): create bases
priyank-upadhyay Nov 13, 2024
86eeb72
feat(): add default slice creation
RohanKumarMainali Nov 14, 2024
842d755
fix(): debug logs
RohanKumarMainali Nov 15, 2024
63297b0
fix(): change controller-gen version
RohanKumarMainali Nov 15, 2024
c6a6018
fix(): handle ns addition and removal
RohanKumarMainali Nov 15, 2024
c32253b
fix(): handle namespace removal
RohanKumarMainali Nov 18, 2024
9c58e29
feat(): filter defaultsliceconfig appns
RohanKumarMainali Nov 18, 2024
ab5b2e0
fix(): refactor code
RohanKumarMainali Nov 19, 2024
bea4e01
fix(): move default-slice-creation logic to project
RohanKumarMainali Nov 20, 2024
dd5a284
fix(): revert slice creation to cluster
RohanKumarMainali Nov 20, 2024
f0e518d
fix(): add webhook validation for default slice edit
RohanKumarMainali Nov 20, 2024
51b312d
fix(): avoid multiple cluster reconciliation
RohanKumarMainali Nov 21, 2024
0f1d314
fix(): deregister cluster from defaultsliceconfig during deletion
RohanKumarMainali Nov 25, 2024
7e05c5d
fix(): add check for deregisterInProgress
RohanKumarMainali Nov 25, 2024
9bf4140
fix(): cleanup for project and refactor code
RohanKumarMainali Nov 26, 2024
8c40642
fix(): fix slice and cluster UTs and increate maxCluster to 32
RohanKumarMainali Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.11.1
CONTROLLER_TOOLS_VERSION ?= v0.15.0
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION ?= 1.26.0

Expand Down
6 changes: 4 additions & 2 deletions apis/controller/v1alpha1/project_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ 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
//+kubebuilder:validation:Optional
DefaultSliceCreation bool `json:"defaultSliceCreation,omitemtpy"`
}

// ServiceAccount defines the field of ProjectSpec
Expand All @@ -33,8 +36,7 @@ type ServiceAccount struct {
}

// ProjectStatus defines the observed state of Project
type ProjectStatus struct {
}
type ProjectStatus struct{}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
Expand Down
7 changes: 4 additions & 3 deletions apis/controller/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

1 change: 0 additions & 1 deletion apis/worker/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

13 changes: 11 additions & 2 deletions cleanup/service/cleanup-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ var (
logger = util.NewLogger().With("controller", "GracefulCleanup")
)

type CleanupService struct {
}
type CleanupService struct{}

func (cs *CleanupService) CleanupResources(ctx context.Context) {
controllerManagerNamespace = os.Getenv("KUBESLICE_CONTROLLER_MANAGER_NAMESPACE")
Expand Down Expand Up @@ -63,6 +62,16 @@ func (cs *CleanupService) CleanupResources(ctx context.Context) {
for _, project := range projects.Items {

projectNamespace := project.Labels["kubeslice-project-namespace"]
if project.Spec.DefaultSliceCreation == true {
logger.Info("default slice creation is enabled for project %s. Disable defaultSliceCreation for cleanup", project.Name)
project.Spec.DefaultSliceCreation = false
err := util.CleanupUpdateResource(ctx, &project)
if err != nil {
hasErrors = true
logger.Errorf("%s Error disabling defaultSliceCreation in project ", util.Err, project.Name, err.Error())
}
}

// Delete all ServiceExports
logger.Infof("%s Fetching all ServiceExports for Project %s", util.Find, project.GetName())

Expand Down
20 changes: 12 additions & 8 deletions config/crd/bases/controller.kubeslice.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: clusters.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -21,14 +20,19 @@ spec:
description: Cluster is the Schema for the clusters API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
24 changes: 16 additions & 8 deletions config/crd/bases/controller.kubeslice.io_projects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: projects.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -21,20 +20,29 @@ spec:
description: Project is the Schema for the projects API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: ProjectSpec defines the desired state of Project
properties:
defaultSliceCreation:
description: If defaultSliceCreation is true, then the default slice
will be created
type: boolean
serviceAccount:
description: ServiceAccount is a field of Project. Edit project_types.go
to remove/update
Expand Down
25 changes: 15 additions & 10 deletions config/crd/bases/controller.kubeslice.io_serviceexportconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: serviceexportconfigs.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -22,23 +21,29 @@ spec:
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: ServiceExportConfigSpec defines the desired state of ServiceExportConfig
properties:
aliases:
description: Alias names for the exported service. The service could
be addressed by the alias names in addition to the slice.local name.
description: |-
Alias names for the exported service. The service could be addressed by the alias names
in addition to the slice.local name.
items:
type: string
type: array
Expand Down
20 changes: 12 additions & 8 deletions config/crd/bases/controller.kubeslice.io_sliceconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: sliceconfigs.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -21,14 +20,19 @@ spec:
description: SliceConfig is the Schema for the sliceconfig API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
20 changes: 12 additions & 8 deletions config/crd/bases/controller.kubeslice.io_sliceqosconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: sliceqosconfigs.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -21,14 +20,19 @@ spec:
description: SliceQoSConfig is the Schema for the sliceqosconfigs API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
26 changes: 15 additions & 11 deletions config/crd/bases/controller.kubeslice.io_vpnkeyrotations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: vpnkeyrotations.controller.kubeslice.io
spec:
group: controller.kubeslice.io
Expand All @@ -21,14 +20,19 @@ spec:
description: VpnKeyRotation is the Schema for the vpnkeyrotations API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -50,9 +54,9 @@ spec:
items:
type: string
type: array
description: ClusterGatewayMapping represents a map where key is cluster
name and value is array of gateways present on that cluster. This
is used to avoid unnecessary reconciliation in worker-operator.
description: |-
ClusterGatewayMapping represents a map where key is cluster name and value is array of gateways present on that cluster.
This is used to avoid unnecessary reconciliation in worker-operator.
type: object
clusters:
description: clusters contains the list of clusters attached to this
Expand Down
25 changes: 15 additions & 10 deletions config/crd/bases/worker.kubeslice.io_workerserviceimports.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: workerserviceimports.worker.kubeslice.io
spec:
group: worker.kubeslice.io
Expand All @@ -22,23 +21,29 @@ spec:
API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: WorkerServiceImportSpec defines the desired state of WorkerServiceImport
properties:
aliases:
description: Alias names for the exported service. The service could
be addressed by the alias names in addition to the slice.local name.
description: |-
Alias names for the exported service. The service could be addressed by the alias names
in addition to the slice.local name.
items:
type: string
type: array
Expand Down
Loading
Loading