Skip to content

Commit 6dc91ca

Browse files
efiacorefiacor
authored
Update nephio related dependencies (#872)
Update porch api to v4.0.0 Update nephio api to v4.0.0
1 parent 79e76b8 commit 6dc91ca

File tree

28 files changed

+296
-396
lines changed

28 files changed

+296
-396
lines changed

‎controllers/pkg/go.mod

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ require (
1515
github.com/go-logr/logr v1.4.2
1616
github.com/google/go-cmp v0.6.0
1717
github.com/henderiw-nephio/network v0.0.0-20230626193806-04743403261e
18-
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d
18+
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 //v4.0.0
1919
github.com/nephio-project/nephio/krm-functions/configinject-fn v0.0.0-00010101000000-000000000000
2020
github.com/nephio-project/nephio/krm-functions/ipam-fn v0.0.0-00010101000000-000000000000
2121
github.com/nephio-project/nephio/krm-functions/lib v0.0.0-20230605213956-a1e470f419a4
2222
github.com/nephio-project/nephio/krm-functions/vlan-fn v0.0.0-00010101000000-000000000000
2323
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3
24-
github.com/nephio-project/porch v1.3.1
24+
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a //v4.0.0
2525
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4
2626
github.com/openconfig/ygot v0.28.3
2727
github.com/pkg/errors v0.9.1
2828
github.com/srl-labs/ygotsrl/v22 v22.11.1
29-
github.com/stretchr/testify v1.9.0
29+
github.com/stretchr/testify v1.10.0
3030
gopkg.in/yaml.v2 v2.4.0
3131
k8s.io/api v0.30.3
3232
k8s.io/apimachinery v0.30.3
@@ -84,13 +84,13 @@ require (
8484
github.com/stretchr/objx v0.5.2 // indirect
8585
github.com/xlab/treeprint v1.2.0 // indirect
8686
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
87-
golang.org/x/crypto v0.26.0 // indirect
87+
golang.org/x/crypto v0.32.0 // indirect
8888
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
89-
golang.org/x/net v0.28.0 // indirect
89+
golang.org/x/net v0.34.0 // indirect
9090
golang.org/x/oauth2 v0.22.0 // indirect
91-
golang.org/x/sys v0.23.0 // indirect
92-
golang.org/x/term v0.23.0 // indirect
93-
golang.org/x/text v0.17.0 // indirect
91+
golang.org/x/sys v0.29.0 // indirect
92+
golang.org/x/term v0.28.0 // indirect
93+
golang.org/x/text v0.21.0 // indirect
9494
golang.org/x/time v0.6.0 // indirect
9595
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9696
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect

‎controllers/pkg/go.sum

+16-16
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
122122
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
123123
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
124124
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
125-
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d h1:hs1ml1d3MaLBLn5yhfz2RPA9B8VGXMGJhZSjyDXJDQY=
126-
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
125+
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 h1:xWvZh6xgsyxodSAmBaWOB8SPjB3hxsCDSveNtpQB8Aw=
126+
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
127127
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3 h1:RNwnrA6AmFLFZkmJa6rVX6PTpf4QxlCF5oYWdpsap1g=
128128
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3/go.mod h1:mQqKgxdpWotKvgZKbfFHPK0gLJ4Z9CsJb/tEUoeDpLs=
129-
github.com/nephio-project/porch v1.3.1 h1:CFZa6kaLViGU7vGMy9sgGGvom5HUxwGwyOiz5zfuCZ8=
130-
github.com/nephio-project/porch v1.3.1/go.mod h1:vNYwce4Vfsl5fPv3e5gmeHLBHqLLfjYKd4OItqtNwoE=
129+
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a h1:+eT2cuhkHQCQnqLIGFTxGwSxEWSo/6JCRONxDv3QL7U=
130+
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a/go.mod h1:qTSJ+76tfrMC4DsPJVp+kUf6ifON4pum9xryVzH+7sc=
131131
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4 h1:4v0n24tsumwuz1BDGKoGWxZMFtqAlYpI87gE/enMUUI=
132132
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4/go.mod h1:ZVMmhD6jllAAO3YGIZFXUQbKRtEiIYgZ772bn/1GVz4=
133133
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
@@ -176,8 +176,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
176176
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
177177
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
178178
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
179-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
180-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
179+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
180+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
181181
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
182182
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
183183
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -196,8 +196,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
196196
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
197197
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
198198
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
199-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
200-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
199+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
200+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
201201
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
202202
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
203203
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
@@ -217,8 +217,8 @@ golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLL
217217
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
218218
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
219219
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
220-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
221-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
220+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
221+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
222222
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
223223
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
224224
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -234,16 +234,16 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
234234
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
235235
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
236236
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
237-
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
238-
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
237+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
238+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
239239
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
240-
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
241-
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
240+
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
241+
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
242242
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
243243
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
244244
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
245-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
246-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
245+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
246+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
247247
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
248248
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
249249
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎controllers/pkg/porch/condition/condition.go

-21
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,3 @@ func HasSpecificTypeConditions(conditions []porchv1alpha1.Condition, conditionTy
4848
}
4949
return false
5050
}
51-
52-
// Check ReadinessGates checks if the package has met all readiness gates
53-
func PackageRevisionIsReady(readinessGates []porchv1alpha1.ReadinessGate, conditions []porchv1alpha1.Condition) bool {
54-
// Index our conditions
55-
conds := make(map[string]porchv1alpha1.Condition)
56-
for _, c := range conditions {
57-
conds[c.Type] = c
58-
}
59-
60-
// Check if the readiness gates are met
61-
for _, g := range readinessGates {
62-
if _, ok := conds[g.ConditionType]; !ok {
63-
return false
64-
}
65-
if conds[g.ConditionType].Status != "True" {
66-
return false
67-
}
68-
}
69-
70-
return true
71-
}

‎controllers/pkg/porch/condition/condition_test.go

-78
Original file line numberDiff line numberDiff line change
@@ -106,81 +106,3 @@ func TestHasSpecificTypeConditions(t *testing.T) {
106106
})
107107
}
108108
}
109-
110-
func TestPackageRevisionIsReady(t *testing.T) {
111-
cases := map[string]struct {
112-
conds []porchv1alpha1.Condition
113-
readyGates []porchv1alpha1.ReadinessGate
114-
want bool
115-
}{
116-
"Ready": {
117-
conds: []porchv1alpha1.Condition{
118-
{
119-
Type: "foo",
120-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionTrue),
121-
},
122-
{
123-
Type: "foobar",
124-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
125-
},
126-
{
127-
Type: "myterriblecondition",
128-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
129-
},
130-
},
131-
readyGates: []porchv1alpha1.ReadinessGate{
132-
{
133-
ConditionType: "foo",
134-
},
135-
},
136-
want: true,
137-
},
138-
"Condition type not present": {
139-
conds: []porchv1alpha1.Condition{
140-
{
141-
Type: "myterriblecondition",
142-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
143-
},
144-
},
145-
readyGates: []porchv1alpha1.ReadinessGate{
146-
{
147-
ConditionType: "notmyterriblecondition",
148-
},
149-
},
150-
want: false,
151-
},
152-
"Not ready": {
153-
conds: []porchv1alpha1.Condition{
154-
{
155-
Type: "bar",
156-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
157-
},
158-
},
159-
readyGates: []porchv1alpha1.ReadinessGate{
160-
{
161-
ConditionType: "bar",
162-
},
163-
},
164-
want: false,
165-
},
166-
"Empty readinessGates": {
167-
conds: []porchv1alpha1.Condition{
168-
{
169-
Type: "bar",
170-
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionTrue),
171-
},
172-
},
173-
readyGates: []porchv1alpha1.ReadinessGate{},
174-
want: true,
175-
},
176-
}
177-
178-
for name, tc := range cases {
179-
t.Run(name, func(t *testing.T) {
180-
b := PackageRevisionIsReady(tc.readyGates, tc.conds)
181-
if diff := cmp.Diff(b, tc.want); diff != "" {
182-
t.Errorf("-want, +got:\n%s", diff)
183-
}
184-
})
185-
}
186-
}

‎controllers/pkg/porch/util/packagevariant_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ status:
5252
return nil
5353
}
5454

55-
func TestPackageRevisionIsReady(t *testing.T) {
55+
func TestPackageVariantReady(t *testing.T) {
5656
tr := true
5757
cases := map[string]struct {
5858
mockClient *fakeClient

‎controllers/pkg/reconcilers/approval/reconciler.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import (
3232
"k8s.io/client-go/tools/record"
3333

3434
porchclient "github.com/nephio-project/nephio/controllers/pkg/porch/client"
35-
porchconds "github.com/nephio-project/nephio/controllers/pkg/porch/condition"
3635
porchutil "github.com/nephio-project/nephio/controllers/pkg/porch/util"
3736
"github.com/nephio-project/nephio/controllers/pkg/resource"
3837
porchv1alpha1 "github.com/nephio-project/porch/api/porch/v1alpha1"
@@ -130,7 +129,7 @@ func (r *reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
130129

131130
// All policies require readiness gates to be met, so if they
132131
// are not, we are done for now.
133-
if !porchconds.PackageRevisionIsReady(pr.Spec.ReadinessGates, pr.Status.Conditions) {
132+
if !porchv1alpha1.PackageRevisionIsReady(pr.Spec.ReadinessGates, pr.Status.Conditions) {
134133
r.recorder.Eventf(pr, corev1.EventTypeNormal,
135134
"NotApproved", "readiness gates not met for %s, in repo %s", pr.Spec.PackageName, pr.Spec.RepositoryName)
136135

‎krm-functions/configinject-fn/go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
66

77
require (
88
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
9-
github.com/nephio-project/api v1.0.0
9+
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 //v4.0.0
1010
github.com/nephio-project/nephio/krm-functions/lib v0.0.0-00010101000000-000000000000
11-
github.com/nephio-project/porch v1.3.1
11+
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a //v4.0.0
1212
k8s.io/api v0.30.3
1313
k8s.io/apimachinery v0.30.3
1414
sigs.k8s.io/controller-runtime v0.18.5
@@ -45,11 +45,11 @@ require (
4545
github.com/pkg/errors v0.9.1 // indirect
4646
github.com/xlab/treeprint v1.2.0 // indirect
4747
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
48-
golang.org/x/net v0.28.0 // indirect
48+
golang.org/x/net v0.34.0 // indirect
4949
golang.org/x/oauth2 v0.22.0 // indirect
50-
golang.org/x/sys v0.23.0 // indirect
51-
golang.org/x/term v0.23.0 // indirect
52-
golang.org/x/text v0.17.0 // indirect
50+
golang.org/x/sys v0.29.0 // indirect
51+
golang.org/x/term v0.28.0 // indirect
52+
golang.org/x/text v0.21.0 // indirect
5353
golang.org/x/time v0.6.0 // indirect
5454
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
5555
google.golang.org/grpc v1.65.0 // indirect

0 commit comments

Comments
 (0)