alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

chore: bump github.com/cosi-project/runtime

Browse Source 
Replace resource.Resource with meta.ResourceWithRD where possible.

Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
This commit is contained in:
Dmitriy Matrenichev 2023-06-09 17:53:08 -04:00
parent dbaf5c6997
commit c74d937280
No known key found for this signature in database
GPG Key ID: D3363CF894E68892
20 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -37,7 +37,7 @@ require (
github.com/containernetworking/plugins v1.3.0
github.com/coreos/go-iptables v0.6.0
github.com/coreos/go-semver v0.3.1
github.com/cosi-project/runtime v0.3.1-alpha.4
github.com/cosi-project/runtime v0.3.1-alpha.5
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v24.0.2+incompatible
github.com/docker/go-connections v0.4.0

4
go.sum
View File

@ -458,8 +458,8 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cosi-project/runtime v0.3.1-alpha.4 h1:TXrn1ka+pw2YeywKZjA9b4mNoz4a9HBX9ovR4YtkDGc=
github.com/cosi-project/runtime v0.3.1-alpha.4/go.mod h1:GubXzK7vQFe4VyrWL/eXaMU4T1pXBx9KoDj0GJz6miw=
github.com/cosi-project/runtime v0.3.1-alpha.5 h1:HhL/lf2Jd+xEqHkIIeMqEkVuAGctR3h/2F0mmCtq8Zc=
github.com/cosi-project/runtime v0.3.1-alpha.5/go.mod h1:GubXzK7vQFe4VyrWL/eXaMU4T1pXBx9KoDj0GJz6miw=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=

4
internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_state.go
View File

@ -7,7 +7,7 @@ package v1alpha2
import (
"context"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -93,7 +93,7 @@ func NewState() (*State, error) {
}
// register Talos resources
for _, r := range []resource.Resource{
for _, r := range []meta.ResourceWithRD{
&v1alpha1.Service{},
&cluster.Affiliate{},
&cluster.Config{},

2
pkg/machinery/go.mod
View File

@ -8,7 +8,7 @@ replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20220527175918-f17b
require (
github.com/containerd/go-cni v1.1.9
github.com/cosi-project/runtime v0.3.1-alpha.4
github.com/cosi-project/runtime v0.3.1-alpha.5
github.com/dustin/go-humanize v1.0.1
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/ghodss/yaml v1.0.0

4
pkg/machinery/go.sum
View File

@ -21,8 +21,8 @@ github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9
github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM=
github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ=
github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
github.com/cosi-project/runtime v0.3.1-alpha.4 h1:TXrn1ka+pw2YeywKZjA9b4mNoz4a9HBX9ovR4YtkDGc=
github.com/cosi-project/runtime v0.3.1-alpha.4/go.mod h1:GubXzK7vQFe4VyrWL/eXaMU4T1pXBx9KoDj0GJz6miw=
github.com/cosi-project/runtime v0.3.1-alpha.5 h1:HhL/lf2Jd+xEqHkIIeMqEkVuAGctR3h/2F0mmCtq8Zc=
github.com/cosi-project/runtime v0.3.1-alpha.5/go.mod h1:GubXzK7vQFe4VyrWL/eXaMU4T1pXBx9KoDj0GJz6miw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

4
pkg/machinery/resources/cluster/cluster_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -25,7 +25,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&cluster.Affiliate{},
&cluster.Config{},
&k8s.APIServerEndpoints{},

4
pkg/machinery/resources/config/config_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&config.MachineType{},
&config.MachineConfig{},
} {

4
pkg/machinery/resources/cri/cri_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&cri.SeccompProfile{},
} {
assert.NoError(t, resourceRegistry.Register(ctx, resource))

4
pkg/machinery/resources/etcd/etcd_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -25,7 +25,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&etcd.PKIStatus{},
} {
assert.NoError(t, resourceRegistry.Register(ctx, resource))

4
pkg/machinery/resources/files/files_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&files.EtcFileSpec{},
&files.EtcFileStatus{},
} {

4
pkg/machinery/resources/hardware/hardware_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&hardware.Processor{},
&hardware.MemoryModule{},
} {

4
pkg/machinery/resources/k8s/k8s_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/resource/protobuf"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
@ -27,7 +27,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&k8s.AdmissionControlConfig{},
&k8s.APIServerConfig{},
&k8s.AuditPolicyConfig{},

4
pkg/machinery/resources/kubeaccess/kubeaccess_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&kubeaccess.Config{},
} {
assert.NoError(t, resourceRegistry.Register(ctx, resource))

4
pkg/machinery/resources/kubespan/kubespan_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&kubespan.Config{},
&kubespan.Endpoint{},
&kubespan.Identity{},

4
pkg/machinery/resources/network/network_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&network.AddressStatus{},
&network.AddressSpec{},
&network.HardwareAddr{},

4
pkg/machinery/resources/perf/perf_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&perf.Memory{},
&perf.CPU{},
} {

4
pkg/machinery/resources/runtime/runtime_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&runtime.DevicesStatus{},
&runtime.EventSinkConfig{},
&runtime.ExtensionStatus{},

4
pkg/machinery/resources/secrets/secrets_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&secrets.API{},
&secrets.CertSAN{},
&secrets.Etcd{},

4
pkg/machinery/resources/time/time_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&time.Status{},
} {
assert.NoError(t, resourceRegistry.Register(ctx, resource))

4
pkg/machinery/resources/v1alpha1/v1alpha1_test.go
View File

@ -8,7 +8,7 @@ import (
"context"
"testing"
"github.com/cosi-project/runtime/pkg/resource"
"github.com/cosi-project/runtime/pkg/resource/meta"
"github.com/cosi-project/runtime/pkg/state"
"github.com/cosi-project/runtime/pkg/state/impl/inmem"
"github.com/cosi-project/runtime/pkg/state/impl/namespaced"
@ -24,7 +24,7 @@ func TestRegisterResource(t *testing.T) {
resources := state.WrapCore(namespaced.NewState(inmem.Build))
resourceRegistry := registry.NewResourceRegistry(resources)
for _, resource := range []resource.Resource{
for _, resource := range []meta.ResourceWithRD{
&v1alpha1.Service{},
} {
assert.NoError(t, resourceRegistry.Register(ctx, resource))