Skip to content

Commit 5072553

Browse files
nephio-prow[bot]nephio-prow[bot]
authored
Merge pull request #12 from nokia/req-status
added status to reflect info back to the cr
2 parents 2408370 + 8253c21 commit 5072553

10 files changed

+456
-44
lines changed

‎config/crd/bases/req.nephio.org_datanetworks.yaml‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
type: object
3434
spec:
3535
properties:
36-
networkInstanceReference:
36+
networkInstance:
3737
description: NetworkInstance defines the networkInstance context to
3838
which this DNN belongs Name and optionally Namespace is used here
3939
properties:
@@ -87,9 +87,58 @@ spec:
8787
type: object
8888
type: array
8989
required:
90-
- networkInstanceReference
90+
- networkInstance
9191
type: object
9292
status:
93+
properties:
94+
ipAllocationStatus:
95+
description: IPAllocationStatus defines the observed state of IPAllocation
96+
properties:
97+
conditions:
98+
description: Conditions of the resource.
99+
items:
100+
description: A Condition that may apply to a resource
101+
properties:
102+
kind:
103+
description: Type of this condition. At most one of each
104+
condition type may apply to a resource at any point in
105+
time.
106+
type: string
107+
lastTransitionTime:
108+
description: LastTransitionTime is the last time this condition
109+
transitioned from one status to another.
110+
format: date-time
111+
type: string
112+
message:
113+
description: A Message containing details about this condition's
114+
last transition from one status to another, if any.
115+
type: string
116+
reason:
117+
description: A Reason for this condition's last transition
118+
from one status to another.
119+
type: string
120+
status:
121+
description: Status of this condition; is it currently True,
122+
False, or Unknown?
123+
type: string
124+
required:
125+
- kind
126+
- lastTransitionTime
127+
- reason
128+
- status
129+
type: object
130+
type: array
131+
expiryTime:
132+
description: expiryTime indicated when the allocation expires
133+
type: string
134+
gateway:
135+
description: Gateway identifies the gatway IP for the network
136+
type: string
137+
prefix:
138+
description: AllocatedPrefix identifies the prefix that was allocated
139+
by the IPAM system
140+
type: string
141+
type: object
93142
type: object
94143
type: object
95144
served: true

‎config/crd/bases/req.nephio.org_interfaces.yaml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,104 @@ spec:
9191
- networkInstance
9292
type: object
9393
status:
94+
properties:
95+
ipAllocationStatus:
96+
description: IPAllocationStatus defines the observed state of IPAllocation
97+
properties:
98+
conditions:
99+
description: Conditions of the resource.
100+
items:
101+
description: A Condition that may apply to a resource
102+
properties:
103+
kind:
104+
description: Type of this condition. At most one of each
105+
condition type may apply to a resource at any point in
106+
time.
107+
type: string
108+
lastTransitionTime:
109+
description: LastTransitionTime is the last time this condition
110+
transitioned from one status to another.
111+
format: date-time
112+
type: string
113+
message:
114+
description: A Message containing details about this condition's
115+
last transition from one status to another, if any.
116+
type: string
117+
reason:
118+
description: A Reason for this condition's last transition
119+
from one status to another.
120+
type: string
121+
status:
122+
description: Status of this condition; is it currently True,
123+
False, or Unknown?
124+
type: string
125+
required:
126+
- kind
127+
- lastTransitionTime
128+
- reason
129+
- status
130+
type: object
131+
type: array
132+
expiryTime:
133+
description: expiryTime indicated when the allocation expires
134+
type: string
135+
gateway:
136+
description: Gateway identifies the gatway IP for the network
137+
type: string
138+
prefix:
139+
description: AllocatedPrefix identifies the prefix that was allocated
140+
by the IPAM system
141+
type: string
142+
type: object
143+
vlanAllocationStatus:
144+
description: VLANAllocationStatus defines the observed state of VLANAllocation
145+
properties:
146+
conditions:
147+
description: Conditions of the resource.
148+
items:
149+
description: A Condition that may apply to a resource
150+
properties:
151+
kind:
152+
description: Type of this condition. At most one of each
153+
condition type may apply to a resource at any point in
154+
time.
155+
type: string
156+
lastTransitionTime:
157+
description: LastTransitionTime is the last time this condition
158+
transitioned from one status to another.
159+
format: date-time
160+
type: string
161+
message:
162+
description: A Message containing details about this condition's
163+
last transition from one status to another, if any.
164+
type: string
165+
reason:
166+
description: A Reason for this condition's last transition
167+
from one status to another.
168+
type: string
169+
status:
170+
description: Status of this condition; is it currently True,
171+
False, or Unknown?
172+
type: string
173+
required:
174+
- kind
175+
- lastTransitionTime
176+
- reason
177+
- status
178+
type: object
179+
type: array
180+
expiryTime:
181+
description: expiryTime indicated when the allocation expires
182+
type: string
183+
vlanID:
184+
description: AllocatedVlan identifies the vlan that was allocated
185+
by the VLAN backend
186+
type: integer
187+
vlanRange:
188+
description: AllocatedVlan identifies the vlan range that was
189+
allocated by the VLAN backend
190+
type: string
191+
type: object
94192
type: object
95193
type: object
96194
served: true

‎config/crd/bases/workload.nephio.org_amfdeployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spec:
226226
- bgpNeighbors
227227
- routerID
228228
type: object
229-
dnns:
229+
dataNetworks:
230230
description: DataNetworks defines the data networks assocated
231231
with the network instance
232232
items:

‎config/crd/bases/workload.nephio.org_smfdeployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spec:
226226
- bgpNeighbors
227227
- routerID
228228
type: object
229-
dnns:
229+
dataNetworks:
230230
description: DataNetworks defines the data networks assocated
231231
with the network instance
232232
items:

‎config/crd/bases/workload.nephio.org_upfdeployments.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ spec:
226226
- bgpNeighbors
227227
- routerID
228228
type: object
229-
dnns:
229+
dataNetworks:
230230
description: DataNetworks defines the data networks assocated
231231
with the network instance
232232
items:

‎go.mod‎

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,61 @@ go 1.20
44

55
require (
66
github.com/google/go-cmp v0.5.9
7-
github.com/stretchr/testify v1.8.0
8-
k8s.io/api v0.26.1
9-
k8s.io/apimachinery v0.26.3
10-
sigs.k8s.io/controller-runtime v0.14.5
7+
github.com/nokia/k8s-ipam v0.0.4-0.20230416191338-dcd944a8d636
8+
github.com/stretchr/testify v1.8.1
9+
k8s.io/api v0.27.1
10+
k8s.io/apimachinery v0.27.1
11+
sigs.k8s.io/controller-runtime v0.14.6
1112
)
1213

1314
require (
1415
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/go-logr/logr v1.2.3 // indirect
16+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
17+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
18+
github.com/go-logr/logr v1.2.4 // indirect
19+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
20+
github.com/go-openapi/jsonreference v0.20.2 // indirect
21+
github.com/go-openapi/swag v0.22.3 // indirect
1622
github.com/gogo/protobuf v1.3.2 // indirect
17-
github.com/google/gofuzz v1.1.0 // indirect
23+
github.com/golang/protobuf v1.5.3 // indirect
24+
github.com/google/gnostic v0.6.9 // indirect
25+
github.com/google/gofuzz v1.2.0 // indirect
26+
github.com/google/uuid v1.3.0 // indirect
27+
github.com/hansthienpondt/nipam v0.0.5 // indirect
28+
github.com/imdario/mergo v0.3.15 // indirect
29+
github.com/josharian/intern v1.0.0 // indirect
1830
github.com/json-iterator/go v1.1.12 // indirect
31+
github.com/kentik/patricia v1.2.0 // indirect
32+
github.com/kr/pretty v0.3.1 // indirect
33+
github.com/mailru/easyjson v0.7.7 // indirect
1934
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2035
github.com/modern-go/reflect2 v1.0.2 // indirect
36+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
37+
github.com/pkg/errors v0.9.1 // indirect
2138
github.com/pmezard/go-difflib v1.0.0 // indirect
22-
golang.org/x/net v0.7.0 // indirect
23-
golang.org/x/text v0.7.0 // indirect
39+
github.com/prometheus/client_golang v1.15.0 // indirect
40+
go.uber.org/atomic v1.10.0 // indirect
41+
go.uber.org/multierr v1.11.0 // indirect
42+
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
43+
golang.org/x/net v0.9.0 // indirect
44+
golang.org/x/oauth2 v0.7.0 // indirect
45+
golang.org/x/sys v0.7.0 // indirect
46+
golang.org/x/term v0.7.0 // indirect
47+
golang.org/x/text v0.9.0 // indirect
48+
golang.org/x/time v0.3.0 // indirect
49+
google.golang.org/appengine v1.6.7 // indirect
50+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
51+
google.golang.org/grpc v1.54.0 // indirect
52+
google.golang.org/protobuf v1.30.0 // indirect
2453
gopkg.in/inf.v0 v0.9.1 // indirect
2554
gopkg.in/yaml.v2 v2.4.0 // indirect
2655
gopkg.in/yaml.v3 v3.0.1 // indirect
27-
k8s.io/klog/v2 v2.80.1 // indirect
28-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
29-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
56+
k8s.io/apiextensions-apiserver v0.27.1 // indirect
57+
k8s.io/client-go v0.27.1 // indirect
58+
k8s.io/klog/v2 v2.90.1 // indirect
59+
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
60+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
61+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
3062
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
63+
sigs.k8s.io/yaml v1.3.0 // indirect
3164
)

0 commit comments

Comments
 (0)