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

Update nephio related dependencies #872

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+296 −396
Open

Update nephio related dependencies #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions controllers/pkg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ require (
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
github.com/henderiw-nephio/network v0.0.0-20230626193806-04743403261e
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 //v4.0.0
github.com/nephio-project/nephio/krm-functions/configinject-fn v0.0.0-00010101000000-000000000000
github.com/nephio-project/nephio/krm-functions/ipam-fn v0.0.0-00010101000000-000000000000
github.com/nephio-project/nephio/krm-functions/lib v0.0.0-20230605213956-a1e470f419a4
github.com/nephio-project/nephio/krm-functions/vlan-fn v0.0.0-00010101000000-000000000000
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3
github.com/nephio-project/porch v1.3.1
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a //v4.0.0
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4
github.com/openconfig/ygot v0.28.3
github.com/pkg/errors v0.9.1
github.com/srl-labs/ygotsrl/v22 v22.11.1
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
Expand Down Expand Up @@ -84,13 +84,13 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
Expand Down
32 changes: 16 additions & 16 deletions controllers/pkg/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d h1:hs1ml1d3MaLBLn5yhfz2RPA9B8VGXMGJhZSjyDXJDQY=
github.com/nephio-project/api v1.0.1-0.20231127124455-cf14bd57b08d/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 h1:xWvZh6xgsyxodSAmBaWOB8SPjB3hxsCDSveNtpQB8Aw=
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3 h1:RNwnrA6AmFLFZkmJa6rVX6PTpf4QxlCF5oYWdpsap1g=
github.com/nephio-project/nephio/testing/mockeryutils v0.0.0-20240112001535-96b08ff4acb3/go.mod h1:mQqKgxdpWotKvgZKbfFHPK0gLJ4Z9CsJb/tEUoeDpLs=
github.com/nephio-project/porch v1.3.1 h1:CFZa6kaLViGU7vGMy9sgGGvom5HUxwGwyOiz5zfuCZ8=
github.com/nephio-project/porch v1.3.1/go.mod h1:vNYwce4Vfsl5fPv3e5gmeHLBHqLLfjYKd4OItqtNwoE=
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a h1:+eT2cuhkHQCQnqLIGFTxGwSxEWSo/6JCRONxDv3QL7U=
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a/go.mod h1:qTSJ+76tfrMC4DsPJVp+kUf6ifON4pum9xryVzH+7sc=
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4 h1:4v0n24tsumwuz1BDGKoGWxZMFtqAlYpI87gE/enMUUI=
github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4/go.mod h1:ZVMmhD6jllAAO3YGIZFXUQbKRtEiIYgZ772bn/1GVz4=
github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0=
Expand Down Expand Up @@ -176,8 +176,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand All @@ -196,8 +196,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
Expand All @@ -217,8 +217,8 @@ golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
Expand All @@ -234,16 +234,16 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
Expand Down
21 changes: 0 additions & 21 deletions controllers/pkg/porch/condition/condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,3 @@ func HasSpecificTypeConditions(conditions []porchv1alpha1.Condition, conditionTy
}
return false
}

// Check ReadinessGates checks if the package has met all readiness gates
func PackageRevisionIsReady(readinessGates []porchv1alpha1.ReadinessGate, conditions []porchv1alpha1.Condition) bool {
// Index our conditions
conds := make(map[string]porchv1alpha1.Condition)
for _, c := range conditions {
conds[c.Type] = c
}

// Check if the readiness gates are met
for _, g := range readinessGates {
if _, ok := conds[g.ConditionType]; !ok {
return false
}
if conds[g.ConditionType].Status != "True" {
return false
}
}

return true
}
78 changes: 0 additions & 78 deletions controllers/pkg/porch/condition/condition_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,81 +106,3 @@ func TestHasSpecificTypeConditions(t *testing.T) {
})
}
}

func TestPackageRevisionIsReady(t *testing.T) {
cases := map[string]struct {
conds []porchv1alpha1.Condition
readyGates []porchv1alpha1.ReadinessGate
want bool
}{
"Ready": {
conds: []porchv1alpha1.Condition{
{
Type: "foo",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionTrue),
},
{
Type: "foobar",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
},
{
Type: "myterriblecondition",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
},
},
readyGates: []porchv1alpha1.ReadinessGate{
{
ConditionType: "foo",
},
},
want: true,
},
"Condition type not present": {
conds: []porchv1alpha1.Condition{
{
Type: "myterriblecondition",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
},
},
readyGates: []porchv1alpha1.ReadinessGate{
{
ConditionType: "notmyterriblecondition",
},
},
want: false,
},
"Not ready": {
conds: []porchv1alpha1.Condition{
{
Type: "bar",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionFalse),
},
},
readyGates: []porchv1alpha1.ReadinessGate{
{
ConditionType: "bar",
},
},
want: false,
},
"Empty readinessGates": {
conds: []porchv1alpha1.Condition{
{
Type: "bar",
Status: porchv1alpha1.ConditionStatus(porchv1alpha1.ConditionTrue),
},
},
readyGates: []porchv1alpha1.ReadinessGate{},
want: true,
},
}

for name, tc := range cases {
t.Run(name, func(t *testing.T) {
b := PackageRevisionIsReady(tc.readyGates, tc.conds)
if diff := cmp.Diff(b, tc.want); diff != "" {
t.Errorf("-want, +got:\n%s", diff)
}
})
}
}
2 changes: 1 addition & 1 deletion controllers/pkg/porch/util/packagevariant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ status:
return nil
}

func TestPackageRevisionIsReady(t *testing.T) {
func TestPackageVariantReady(t *testing.T) {
tr := true
cases := map[string]struct {
mockClient *fakeClient
Expand Down
3 changes: 1 addition & 2 deletions controllers/pkg/reconcilers/approval/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"k8s.io/client-go/tools/record"

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

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

Expand Down
12 changes: 6 additions & 6 deletions krm-functions/configinject-fn/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ replace github.com/nephio-project/nephio/krm-functions/lib => ../lib

require (
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
github.com/nephio-project/api v1.0.0
github.com/nephio-project/api v1.0.1-0.20250218114915-854faaf69fd0 //v4.0.0
github.com/nephio-project/nephio/krm-functions/lib v0.0.0-00010101000000-000000000000
github.com/nephio-project/porch v1.3.1
github.com/nephio-project/porch v1.3.2-0.20250218094517-254bf735735a //v4.0.0
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
sigs.k8s.io/controller-runtime v0.18.5
Expand Down Expand Up @@ -45,11 +45,11 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/grpc v1.65.0 // indirect
Expand Down
Loading