Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha committed Dec 14, 2024
1 parent 72a3368 commit ee0980a
Show file tree
Hide file tree
Showing 65 changed files with 1,678 additions and 333 deletions.
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
github.com/zeebo/xxh3 v1.0.2
go.bytebuilders.dev/catalog v0.0.11-0.20241125004308-e689253557ef
go.bytebuilders.dev/catalog v0.0.11
go.bytebuilders.dev/catalog-manager v0.1.1
go.bytebuilders.dev/license-verifier v0.14.3
go.openviz.dev/apimachinery v0.0.7
golang.org/x/sync v0.8.0
golang.org/x/sync v0.10.0
gomodules.xyz/jsonpath v0.0.2
gomodules.xyz/logs v0.0.7
gomodules.xyz/password-generator v0.2.9
Expand All @@ -47,7 +47,7 @@ require (
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
kmodules.xyz/apiversion v0.2.0
kmodules.xyz/authorizer v0.29.1
kmodules.xyz/client-go v0.30.40
kmodules.xyz/client-go v0.30.42
kmodules.xyz/custom-resources v0.30.0
kmodules.xyz/go-containerregistry v0.0.12
kmodules.xyz/monitoring-agent-api v0.30.4
Expand Down Expand Up @@ -215,13 +215,13 @@ require (
go.starlark.net v0.0.0-20240520160348-046347dcd104 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/atomic-writer v0.0.2 // indirect
gomodules.xyz/bits v0.0.0-20241124114357-b668409c1b67 // indirect
Expand Down Expand Up @@ -257,7 +257,7 @@ require (
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
voyagermesh.dev/gateway-api v0.0.2-0.20241124132233-ced3a99a7eae // indirect
voyagermesh.dev/installer v0.0.0-20241102060616-ff1e91bfcef8 // indirect
voyagermesh.dev/installer v0.0.0-20241127160952-d7800071f7ce // indirect

)

Expand Down
36 changes: 18 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -558,10 +558,10 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.bytebuilders.dev/catalog v0.0.11-0.20241125004308-e689253557ef h1:p0/sjTEk9NGBeJxkMHXITamqX+Dwp+KwNKtQtjGoTk4=
go.bytebuilders.dev/catalog v0.0.11-0.20241125004308-e689253557ef/go.mod h1:bgVJYI6YYhklFEhtetWKM7iyle61cC6UpXV64GhIXLk=
go.bytebuilders.dev/catalog-manager v0.1.1 h1:+v2QYZkwD7ZgDojfOys3ilt6s50vEysce76whfF7UQk=
go.bytebuilders.dev/catalog-manager v0.1.1/go.mod h1:IwN9qBECmr9jY2zCcT2mS6EEhtKUzuUK4eYFMnN66hg=
go.bytebuilders.dev/catalog v0.0.11 h1:XXYItSsTJe8XOE+SLI0b25RsmRwQ53YmOn0ozzusOw0=
go.bytebuilders.dev/catalog v0.0.11/go.mod h1:B3dacrh9g2sAP3STfiSfw+XPjTeHZlTvCb2C7t26SlE=
go.bytebuilders.dev/catalog-manager v0.1.1 h1:4P2XcPKS4I/imS5XfXMUrjuDyeusvgPTmWwI+X4p6NI=
go.bytebuilders.dev/catalog-manager v0.1.1/go.mod h1:hiLjSu61dQCik86r3Oejf7FMavI8wz8qr6eJXS8Oo10=
go.bytebuilders.dev/license-verifier v0.14.3 h1:5BTwmFEgCjSlAs2Nzh3/7+u//VoF93xjqywrJiqmZsg=
go.bytebuilders.dev/license-verifier v0.14.3/go.mod h1:bNNaVbry3TZbu54pf57LkhjsFX94T6O62w0roiy1yiE=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
Expand Down Expand Up @@ -633,8 +633,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -702,8 +702,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand All @@ -725,23 +725,23 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.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.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.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.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
Expand Down Expand Up @@ -927,8 +927,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
kmodules.xyz/authorizer v0.29.1 h1:uByGGoryKbZcfiEAhjcK/Y345I9mygNQP7DVpkMbNQQ=
kmodules.xyz/authorizer v0.29.1/go.mod h1:kZRhclL8twzyt2bQuJQJbpYww2sc+qFr8I5PPoq/sWY=
kmodules.xyz/client-go v0.30.40 h1:X9Ic8D19D5Gy4C5UvQWSU/kyIObULFHG0B2HHx8ZW+E=
kmodules.xyz/client-go v0.30.40/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
kmodules.xyz/client-go v0.30.42 h1:79x66I8betRJtmFzKS46ujXzXVKAxpXNsm32ayNxTEA=
kmodules.xyz/client-go v0.30.42/go.mod h1:ZOxyEdoSZByjZLkzSM3Q8p1zXMayflK7jQQnWMG2Yj8=
kmodules.xyz/crd-schema-fuzz v0.29.1 h1:zJTlWYOrT5dsVVHW8HGcnR/vaWfxQfNh11QwTtkYpcs=
kmodules.xyz/crd-schema-fuzz v0.29.1/go.mod h1:n708z9YQqLMP2KNLQVgBcRJw1QpSWLvpNCEi+KJDOYE=
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
Expand Down Expand Up @@ -986,7 +986,7 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
voyagermesh.dev/gateway-api v0.0.2-0.20241124132233-ced3a99a7eae h1:uGJ1TlESAq9fMXlHIlTtgly3tUeNS/eapVzlXoFmdcU=
voyagermesh.dev/gateway-api v0.0.2-0.20241124132233-ced3a99a7eae/go.mod h1:pMW02a7dAp5E8uZI3qEGS988yhzb4O88tzYaeFMu+3A=
voyagermesh.dev/installer v0.0.0-20241102060616-ff1e91bfcef8 h1:dFbzua0lodMBm/NFaaL/NdkElKm9jHJ1VL17/T4l6w4=
voyagermesh.dev/installer v0.0.0-20241102060616-ff1e91bfcef8/go.mod h1:Ie4YBydkmwa8lN4bi+vZY7gzc02jjzpwOS9vyeEhgnU=
voyagermesh.dev/installer v0.0.0-20241127160952-d7800071f7ce h1:EDTYadG5r2yZgt0dmGyd5GZk5+lhqo9elWfKJJmXpB8=
voyagermesh.dev/installer v0.0.0-20241127160952-d7800071f7ce/go.mod h1:Ie4YBydkmwa8lN4bi+vZY7gzc02jjzpwOS9vyeEhgnU=
x-helm.dev/apimachinery v0.0.16 h1:Eb160xcdH9fMVHak5QSWYWxoaReytch+A7kk25QWjx0=
x-helm.dev/apimachinery v0.0.16/go.mod h1:05brgFw5oWOX7OTXT090SQojqXjbttqWfqoJo+ejBU4=
123 changes: 0 additions & 123 deletions vendor/go.bytebuilders.dev/catalog-manager/pkg/gateway/gateway.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,126 +140,3 @@ func FindDefaultGatewayConfig(ctx context.Context, kc client.Client) (*catgwapi.
return nil, fmt.Errorf("multiple defult gateway configs found: %+v", names)
}
}

/*
func GatewayClassName(gwps *catgwapi.GatewayPreset) string {
return gwps.Name
}
func FrontendTLSRef(gwps *catgwapi.GatewayPreset) types.NamespacedName {
return types.NamespacedName{
Namespace: gwps.Namespace,
Name: fmt.Sprintf("%s-gw-cert", gwps.Name),
}
}
func FindGatewayPreset(ctx context.Context, kc client.Client, bindingNamespace string) (*catgwapi.GatewayPreset, error) {
var gwps catgwapi.GatewayPreset
key := client.ObjectKey{Name: bindingNamespace, Namespace: bindingNamespace}
if strings.HasSuffix(bindingNamespace, "-gw") {
key.Name = strings.TrimSuffix(bindingNamespace, "-gw")
var ns core.Namespace
err := kc.Get(ctx, client.ObjectKey{Name: key.Name}, &ns)
if err != nil {
return nil, err
}
if ns.Labels[kmapi.ClientOrgKey] == "true" {
if err := kc.Get(ctx, key, &gwps); err == nil {
return &gwps, nil
}
}
} else {
key.Namespace += "-gw"
var ns core.Namespace
err := kc.Get(ctx, client.ObjectKey{Name: key.Name}, &ns)
if err != nil {
return nil, err
}
if ns.Labels[kmapi.ClientOrgKey] == "true" {
if err := kc.Get(ctx, key, &gwps); err == nil {
return &gwps, nil
}
}
}
return FindDefaultGatewayPreset(ctx, kc)
}
func FindDefaultGatewayPreset(ctx context.Context, kc client.Client) (*catgwapi.GatewayPreset, error) {
var list catgwapi.GatewayPresetList
if err := kc.List(ctx, &list); err != nil {
return nil, err
}
var objs []catgwapi.GatewayPreset
for _, preset := range list.Items {
if preset.Annotations[catgwapi.DefaultPresetKey] == "true" {
objs = append(objs, preset)
}
}
switch len(objs) {
case 0:
return nil, nil
case 1:
return &objs[0], nil
default:
var names []string
for _, obj := range objs {
names = append(names, client.ObjectKeyFromObject(&obj).String())
}
return nil, fmt.Errorf("multiple defult gateway presets found: %+v", names)
}
}
func FindGatewayConfig(ctx context.Context, kc client.Client, bindingNamespace string) (*catgwapi.GatewayPreset, *catgwapi.GatewayConfig, error) {
gwps, err := FindGatewayPreset(ctx, kc, bindingNamespace)
if err != nil {
return nil, nil, err
}
gwcfg, err := GetGatewayConfig(ctx, kc, gwps)
return gwps, gwcfg, err
}
func GetGatewayConfig(ctx context.Context, kc client.Client, gwps *catgwapi.GatewayPreset) (*catgwapi.GatewayConfig, error) {
if gwps.Spec.ParametersRef == nil {
return nil, fmt.Errorf("GatewayPreset %s/%s is missing parametersRef", gwps.Namespace, gwps.Name)
}
var gwcfg catgwapi.GatewayConfig
if err := kc.Get(ctx, client.ObjectKey{
Namespace: gwps.Spec.ParametersRef.Namespace,
Name: gwps.Spec.ParametersRef.Name,
}, &gwcfg); err != nil {
return nil, err
}
return &gwcfg, nil
}
func FindEnvoyServiceSpec(ctx context.Context, kc client.Client, gwclass string) (*catgwapi.EnvoyServiceSpec, error) {
var ns core.Namespace
err := kc.Get(ctx, client.ObjectKey{Name: gwclass}, &ns)
if err != nil {
return nil, err
}
var gwps catgwapi.GatewayPreset
if ns.Labels[kmapi.ClientOrgKey] == "true" {
if err := kc.Get(ctx, client.ObjectKey{Name: gwclass, Namespace: gwclass + "-gw"}, &gwps); err != nil {
return nil, err
}
} else {
if err := kc.Get(ctx, client.ObjectKey{Name: gwclass, Namespace: gwclass}, &gwps); err != nil {
return nil, err
}
}
gwcfg, err := GetGatewayConfig(ctx, kc, &gwps)
if err != nil {
return nil, err
}
return &gwcfg.Spec.Envoy.Service, nil
}
*/
Original file line number Diff line number Diff line change
Expand Up @@ -828,10 +828,6 @@ spec:
type: object
ttlSecondsAfterFinished:
type: integer
required:
- annotations
- resources
- ttlSecondsAfterFinished
type: object
rbac:
properties:
Expand All @@ -849,7 +845,6 @@ spec:
type: object
required:
- job
- rbac
type: object
config:
properties:
Expand Down Expand Up @@ -3835,10 +3830,6 @@ spec:
type: object
tag:
type: string
required:
- registry
- repository
- tag
type: object
serviceAccount:
properties:
Expand Down
2 changes: 1 addition & 1 deletion vendor/golang.org/x/crypto/chacha20/chacha_noasm.go

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

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

Loading

0 comments on commit ee0980a

Please sign in to comment.