Skip to content

Commit

Permalink
NFConfig Meta CRD (#59)
Browse files Browse the repository at this point in the history
**Description**

Created NFConfig Meta CRD (Similar to ConfigRef CRD) to contain
configuration.

**Breaking change**

I had to change the `nf_deployments` folder to workload because the
naming wasn't chosen as per the group. So we need to adjust the free5GC
tutorial before accepting this PR.
  • Loading branch information
arora-sagar authored Nov 25, 2023
1 parent 2b9d763 commit 955263f
Show file tree
Hide file tree
Showing 8 changed files with 190 additions and 6 deletions.
50 changes: 50 additions & 0 deletions config/crd/bases/workload.nephio.org_nfconfigs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
name: nfconfigs.workload.nephio.org
spec:
group: workload.nephio.org
names:
kind: NFConfig
listKind: NFConfigList
plural: nfconfigs
singular: nfconfig
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: NFConfig is the Schema for the NFConfig 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'
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'
type: string
metadata:
type: object
spec:
properties:
configRefs:
description: Config is the embedded config
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
x-kubernetes-preserve-unknown-fields: true
type: object
status:
type: object
type: object
served: true
storage: true
subresources:
status: {}
2 changes: 1 addition & 1 deletion nf_topology/v1alpha1/nf_topo_tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.
package v1alpha1

import (
nephiodeployv1alpha1 "github.com/nephio-project/api/nf_deployments/v1alpha1"
nephiodeployv1alpha1 "github.com/nephio-project/api/workload/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
5 changes: 2 additions & 3 deletions nf_topology/v1alpha1/zz_generated.deepcopy.go

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

File renamed without changes.
48 changes: 48 additions & 0 deletions workload/v1alpha1/nf_config_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
Copyright 2023 The Nephio Authors.
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.
*/
package v1alpha1

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

type NFConfigStatus struct {
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// NFConfig is the Schema for the NFConfig API
type NFConfig struct {
metav1.TypeMeta `json:",inline" yaml:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`

Spec NFConfigSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
Status NFConfigStatus `json:"status,omitempty" yaml:"status,omitempty"`
}

type NFConfigSpec struct {
// Config is the embedded config
//+kubebuilder:pruning:PreserveUnknownFields
ConfigRefs []runtime.RawExtension `json:"configRefs,omitempty" yaml:"configRefs,omitempty"`
}

// NFConfigList contains a list of ref.Config
type NFConfigList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []NFConfig `json:"items"`
}
File renamed without changes.

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

0 comments on commit 955263f

Please sign in to comment.