Skip to content

Commit

Permalink
Merge pull request #12 from nokia/req-status
Browse files Browse the repository at this point in the history 
added status to reflect info back to the cr
  • Loading branch information
@nephio-prow
nephio-prow[bot] authored Apr 21, 2023
2 parents 2408370 + 8253c21 commit 5072553
Show file tree
Hide file tree
Showing 10 changed files with 456 additions and 44 deletions.
53 changes: 51 additions & 2 deletions config/crd/bases/req.nephio.org_datanetworks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
type: object
spec:
properties:
networkInstanceReference:
networkInstance:
description: NetworkInstance defines the networkInstance context to
which this DNN belongs Name and optionally Namespace is used here
properties:
Expand Down Expand Up @@ -87,9 +87,58 @@ spec:
type: object
type: array
required:
- networkInstanceReference
- networkInstance
type: object
status:
properties:
ipAllocationStatus:
description: IPAllocationStatus defines the observed state of IPAllocation
properties:
conditions:
description: Conditions of the resource.
items:
description: A Condition that may apply to a resource
properties:
kind:
description: Type of this condition. At most one of each
condition type may apply to a resource at any point in
time.
type: string
lastTransitionTime:
description: LastTransitionTime is the last time this condition
transitioned from one status to another.
format: date-time
type: string
message:
description: A Message containing details about this condition's
last transition from one status to another, if any.
type: string
reason:
description: A Reason for this condition's last transition
from one status to another.
type: string
status:
description: Status of this condition; is it currently True,
False, or Unknown?
type: string
required:
- kind
- lastTransitionTime
- reason
- status
type: object
type: array
expiryTime:
description: expiryTime indicated when the allocation expires
type: string
gateway:
description: Gateway identifies the gatway IP for the network
type: string
prefix:
description: AllocatedPrefix identifies the prefix that was allocated
by the IPAM system
type: string
type: object
type: object
type: object
served: true
Expand Down
98 changes: 98 additions & 0 deletions config/crd/bases/req.nephio.org_interfaces.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,104 @@ spec:
- networkInstance
type: object
status:
properties:
ipAllocationStatus:
description: IPAllocationStatus defines the observed state of IPAllocation
properties:
conditions:
description: Conditions of the resource.
items:
description: A Condition that may apply to a resource
properties:
kind:
description: Type of this condition. At most one of each
condition type may apply to a resource at any point in
time.
type: string
lastTransitionTime:
description: LastTransitionTime is the last time this condition
transitioned from one status to another.
format: date-time
type: string
message:
description: A Message containing details about this condition's
last transition from one status to another, if any.
type: string
reason:
description: A Reason for this condition's last transition
from one status to another.
type: string
status:
description: Status of this condition; is it currently True,
False, or Unknown?
type: string
required:
- kind
- lastTransitionTime
- reason
- status
type: object
type: array
expiryTime:
description: expiryTime indicated when the allocation expires
type: string
gateway:
description: Gateway identifies the gatway IP for the network
type: string
prefix:
description: AllocatedPrefix identifies the prefix that was allocated
by the IPAM system
type: string
type: object
vlanAllocationStatus:
description: VLANAllocationStatus defines the observed state of VLANAllocation
properties:
conditions:
description: Conditions of the resource.
items:
description: A Condition that may apply to a resource
properties:
kind:
description: Type of this condition. At most one of each
condition type may apply to a resource at any point in
time.
type: string
lastTransitionTime:
description: LastTransitionTime is the last time this condition
transitioned from one status to another.
format: date-time
type: string
message:
description: A Message containing details about this condition's
last transition from one status to another, if any.
type: string
reason:
description: A Reason for this condition's last transition
from one status to another.
type: string
status:
description: Status of this condition; is it currently True,
False, or Unknown?
type: string
required:
- kind
- lastTransitionTime
- reason
- status
type: object
type: array
expiryTime:
description: expiryTime indicated when the allocation expires
type: string
vlanID:
description: AllocatedVlan identifies the vlan that was allocated
by the VLAN backend
type: integer
vlanRange:
description: AllocatedVlan identifies the vlan range that was
allocated by the VLAN backend
type: string
type: object
type: object
type: object
served: true
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/workload.nephio.org_amfdeployments.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ spec:
- bgpNeighbors
- routerID
type: object
dnns:
dataNetworks:
description: DataNetworks defines the data networks assocated
with the network instance
items:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/workload.nephio.org_smfdeployments.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ spec:
- bgpNeighbors
- routerID
type: object
dnns:
dataNetworks:
description: DataNetworks defines the data networks assocated
with the network instance
items:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/workload.nephio.org_upfdeployments.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ spec:
- bgpNeighbors
- routerID
type: object
dnns:
dataNetworks:
description: DataNetworks defines the data networks assocated
with the network instance
items:
Expand Down
55 changes: 44 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,61 @@ go 1.20

require (
github.com/google/go-cmp v0.5.9
github.com/stretchr/testify v1.8.0
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.3
sigs.k8s.io/controller-runtime v0.14.5
github.com/nokia/k8s-ipam v0.0.4-0.20230416191338-dcd944a8d636
github.com/stretchr/testify v1.8.1
k8s.io/api v0.27.1
k8s.io/apimachinery v0.27.1
sigs.k8s.io/controller-runtime v0.14.6
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hansthienpondt/nipam v0.0.5 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kentik/patricia v1.2.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.0 // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/term v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/apiextensions-apiserver v0.27.1 // indirect
k8s.io/client-go v0.27.1 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 5072553

Please sign in to comment.