diff --git a/Dockerfile b/Dockerfile index 058f2e80c..f8aeceafe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -188,8 +188,8 @@ COPY --from=generate-build /api/storage/*.pb.go /pkg/machinery/api/storage/ COPY --from=generate-build /api/resource/*.pb.go /pkg/machinery/api/resource/ COPY --from=generate-build /api/resource/secrets/*.pb.go /pkg/machinery/api/resource/secrets/ COPY --from=generate-build /api/inspect/*.pb.go /pkg/machinery/api/inspect/ -COPY --from=go-generate /src/pkg/resources/kubespan/ /pkg/resources/kubespan/ -COPY --from=go-generate /src/pkg/resources/network/ /pkg/resources/network/ +COPY --from=go-generate /src/pkg/machinery/resources/kubespan/ /pkg/machinery/resources/kubespan/ +COPY --from=go-generate /src/pkg/machinery/resources/network/ /pkg/machinery/resources/network/ COPY --from=go-generate /src/pkg/machinery/config/types/v1alpha1/ /pkg/machinery/config/types/v1alpha1/ COPY --from=go-generate /src/pkg/machinery/nethelpers/ /pkg/machinery/nethelpers/ diff --git a/cmd/talosctl/cmd/talos/edit.go b/cmd/talosctl/cmd/talos/edit.go index bea13f356..26e30d9d6 100644 --- a/cmd/talosctl/cmd/talos/edit.go +++ b/cmd/talosctl/cmd/talos/edit.go @@ -22,7 +22,7 @@ import ( "github.com/talos-systems/talos/pkg/cli" "github.com/talos-systems/talos/pkg/machinery/api/machine" "github.com/talos-systems/talos/pkg/machinery/client" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) var editCmdFlags struct { diff --git a/cmd/talosctl/cmd/talos/patch.go b/cmd/talosctl/cmd/talos/patch.go index 861239f1a..349335a01 100644 --- a/cmd/talosctl/cmd/talos/patch.go +++ b/cmd/talosctl/cmd/talos/patch.go @@ -22,7 +22,7 @@ import ( "github.com/talos-systems/talos/pkg/machinery/api/machine" "github.com/talos-systems/talos/pkg/machinery/client" "github.com/talos-systems/talos/pkg/machinery/config/configpatcher" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) var patchCmdFlags struct { diff --git a/cmd/talosctl/cmd/talos/support.go b/cmd/talosctl/cmd/talos/support.go index 20587e73c..b32b3a193 100644 --- a/cmd/talosctl/cmd/talos/support.go +++ b/cmd/talosctl/cmd/talos/support.go @@ -25,7 +25,7 @@ import ( "github.com/talos-systems/talos/pkg/cluster" "github.com/talos-systems/talos/pkg/machinery/client" - clusterresource "github.com/talos-systems/talos/pkg/resources/cluster" + clusterresource "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) var supportCmdFlags struct { diff --git a/internal/app/apid/pkg/provider/provider.go b/internal/app/apid/pkg/provider/provider.go index 89ba23711..5245f3a69 100644 --- a/internal/app/apid/pkg/provider/provider.go +++ b/internal/app/apid/pkg/provider/provider.go @@ -16,7 +16,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/talos-systems/crypto/tls" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // TLSConfig provides client & server TLS configs for apid. diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go index 693169e8d..eb1c959a6 100644 --- a/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go +++ b/internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go @@ -74,8 +74,8 @@ import ( "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate" machinetype "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" "github.com/talos-systems/talos/pkg/machinery/role" - timeresource "github.com/talos-systems/talos/pkg/resources/time" "github.com/talos-systems/talos/pkg/version" ) diff --git a/internal/app/machined/pkg/adapters/cluster/identity.go b/internal/app/machined/pkg/adapters/cluster/identity.go index d0c8d2d17..848977920 100644 --- a/internal/app/machined/pkg/adapters/cluster/identity.go +++ b/internal/app/machined/pkg/adapters/cluster/identity.go @@ -11,7 +11,7 @@ import ( "github.com/jxskiss/base62" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) // IdentitySpec adapter provides identity generation. diff --git a/internal/app/machined/pkg/adapters/cluster/identity_test.go b/internal/app/machined/pkg/adapters/cluster/identity_test.go index 4e2ab4c8d..e24225b2a 100644 --- a/internal/app/machined/pkg/adapters/cluster/identity_test.go +++ b/internal/app/machined/pkg/adapters/cluster/identity_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" clusteradapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/cluster" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) func TestIdentityGenerate(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/k8s/manifest.go b/internal/app/machined/pkg/adapters/k8s/manifest.go index 011ce01b3..7bac83bbc 100644 --- a/internal/app/machined/pkg/adapters/k8s/manifest.go +++ b/internal/app/machined/pkg/adapters/k8s/manifest.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/yaml" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // Manifest adapter provides conversion from procfs. diff --git a/internal/app/machined/pkg/adapters/k8s/manifest_test.go b/internal/app/machined/pkg/adapters/k8s/manifest_test.go index 701e15653..e52b86f47 100644 --- a/internal/app/machined/pkg/adapters/k8s/manifest_test.go +++ b/internal/app/machined/pkg/adapters/k8s/manifest_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) func TestManifestSetYAML(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/k8s/static_pod.go b/internal/app/machined/pkg/adapters/k8s/static_pod.go index 93eb6abaa..1e2d2a316 100644 --- a/internal/app/machined/pkg/adapters/k8s/static_pod.go +++ b/internal/app/machined/pkg/adapters/k8s/static_pod.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // StaticPod adapter provides conversion from *v1.Pod. diff --git a/internal/app/machined/pkg/adapters/k8s/static_pod_status.go b/internal/app/machined/pkg/adapters/k8s/static_pod_status.go index 991042638..878936294 100644 --- a/internal/app/machined/pkg/adapters/k8s/static_pod_status.go +++ b/internal/app/machined/pkg/adapters/k8s/static_pod_status.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // StaticPodStatus adapter provides conversion from *v1.PodStatus. diff --git a/internal/app/machined/pkg/adapters/kubespan/identity.go b/internal/app/machined/pkg/adapters/kubespan/identity.go index 0afb1e772..2120bb26c 100644 --- a/internal/app/machined/pkg/adapters/kubespan/identity.go +++ b/internal/app/machined/pkg/adapters/kubespan/identity.go @@ -12,8 +12,8 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // IdentitySpec adapter provides identity generation. diff --git a/internal/app/machined/pkg/adapters/kubespan/identity_test.go b/internal/app/machined/pkg/adapters/kubespan/identity_test.go index b5d91d07b..e1d570864 100644 --- a/internal/app/machined/pkg/adapters/kubespan/identity_test.go +++ b/internal/app/machined/pkg/adapters/kubespan/identity_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" kubespanadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/kubespan" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) func TestIdentityGenerateKey(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/kubespan/peer_status.go b/internal/app/machined/pkg/adapters/kubespan/peer_status.go index ecdd1523f..e4243d92b 100644 --- a/internal/app/machined/pkg/adapters/kubespan/peer_status.go +++ b/internal/app/machined/pkg/adapters/kubespan/peer_status.go @@ -10,7 +10,7 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) // PeerStatusSpec adapter provides Wiregard integration and state management. diff --git a/internal/app/machined/pkg/adapters/kubespan/peer_status_test.go b/internal/app/machined/pkg/adapters/kubespan/peer_status_test.go index 1dc61fe33..16b6a81d4 100644 --- a/internal/app/machined/pkg/adapters/kubespan/peer_status_test.go +++ b/internal/app/machined/pkg/adapters/kubespan/peer_status_test.go @@ -12,7 +12,7 @@ import ( "inet.af/netaddr" kubespanadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/kubespan" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) func TestPeerStatus_PickNewEndpoint(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/network/bond_master_spec.go b/internal/app/machined/pkg/adapters/network/bond_master_spec.go index e582e2d9c..052907845 100644 --- a/internal/app/machined/pkg/adapters/network/bond_master_spec.go +++ b/internal/app/machined/pkg/adapters/network/bond_master_spec.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/unix" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // BondMasterSpec adapter provides encoding/decoding to netlink structures. diff --git a/internal/app/machined/pkg/adapters/network/bond_master_spec_test.go b/internal/app/machined/pkg/adapters/network/bond_master_spec_test.go index 79c3faada..b1c5f307c 100644 --- a/internal/app/machined/pkg/adapters/network/bond_master_spec_test.go +++ b/internal/app/machined/pkg/adapters/network/bond_master_spec_test.go @@ -11,7 +11,7 @@ import ( networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestBondMasterSpec(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/network/vlan_spec.go b/internal/app/machined/pkg/adapters/network/vlan_spec.go index 189b26403..b00f4eb23 100644 --- a/internal/app/machined/pkg/adapters/network/vlan_spec.go +++ b/internal/app/machined/pkg/adapters/network/vlan_spec.go @@ -11,7 +11,7 @@ import ( "golang.org/x/sys/unix" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // VLANSpec adapter provides encoding/decoding to netlink structures. diff --git a/internal/app/machined/pkg/adapters/network/vlan_spec_test.go b/internal/app/machined/pkg/adapters/network/vlan_spec_test.go index f92b86d81..27741b503 100644 --- a/internal/app/machined/pkg/adapters/network/vlan_spec_test.go +++ b/internal/app/machined/pkg/adapters/network/vlan_spec_test.go @@ -11,7 +11,7 @@ import ( networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestVLANSpec(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/network/wireguard_spec.go b/internal/app/machined/pkg/adapters/network/wireguard_spec.go index 00f254fab..0c9e863ab 100644 --- a/internal/app/machined/pkg/adapters/network/wireguard_spec.go +++ b/internal/app/machined/pkg/adapters/network/wireguard_spec.go @@ -10,7 +10,7 @@ import ( "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // WireguardSpec adapter provides encoding/decoding to netlink structures. diff --git a/internal/app/machined/pkg/adapters/network/wireguard_spec_test.go b/internal/app/machined/pkg/adapters/network/wireguard_spec_test.go index 799ab4f8d..f0f6353d2 100644 --- a/internal/app/machined/pkg/adapters/network/wireguard_spec_test.go +++ b/internal/app/machined/pkg/adapters/network/wireguard_spec_test.go @@ -15,7 +15,7 @@ import ( "inet.af/netaddr" networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestWireguardSpecDecode(t *testing.T) { diff --git a/internal/app/machined/pkg/adapters/perf/cpu.go b/internal/app/machined/pkg/adapters/perf/cpu.go index 58c321a5e..4bbde9302 100644 --- a/internal/app/machined/pkg/adapters/perf/cpu.go +++ b/internal/app/machined/pkg/adapters/perf/cpu.go @@ -7,7 +7,7 @@ package perf import ( "github.com/prometheus/procfs" - "github.com/talos-systems/talos/pkg/resources/perf" + "github.com/talos-systems/talos/pkg/machinery/resources/perf" ) // CPU adapter provides conversion from procfs. diff --git a/internal/app/machined/pkg/adapters/perf/mem.go b/internal/app/machined/pkg/adapters/perf/mem.go index 9e94cf80a..c1e2e1e06 100644 --- a/internal/app/machined/pkg/adapters/perf/mem.go +++ b/internal/app/machined/pkg/adapters/perf/mem.go @@ -8,7 +8,7 @@ import ( "github.com/AlekSi/pointer" "github.com/prometheus/procfs" - "github.com/talos-systems/talos/pkg/resources/perf" + "github.com/talos-systems/talos/pkg/machinery/resources/perf" ) // Memory adapter provides conversion from procfs. diff --git a/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go b/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go index 449d18a70..e82cd4b6e 100644 --- a/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go +++ b/internal/app/machined/pkg/controllers/cluster/affiliate_merge.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) // AffiliateMergeController merges raw Affiliates from the RawNamespaceName into final representation in the NamespaceName. diff --git a/internal/app/machined/pkg/controllers/cluster/affiliate_merge_test.go b/internal/app/machined/pkg/controllers/cluster/affiliate_merge_test.go index 6b3f8bda9..aef8d449b 100644 --- a/internal/app/machined/pkg/controllers/cluster/affiliate_merge_test.go +++ b/internal/app/machined/pkg/controllers/cluster/affiliate_merge_test.go @@ -15,7 +15,7 @@ import ( clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) type AffiliateMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/cluster_test.go b/internal/app/machined/pkg/controllers/cluster/cluster_test.go index ce2ed78a2..fc0df15bf 100644 --- a/internal/app/machined/pkg/controllers/cluster/cluster_test.go +++ b/internal/app/machined/pkg/controllers/cluster/cluster_test.go @@ -20,7 +20,7 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) type ClusterSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/config.go b/internal/app/machined/pkg/controllers/cluster/config.go index 9c6dbb251..b3a55bf36 100644 --- a/internal/app/machined/pkg/controllers/cluster/config.go +++ b/internal/app/machined/pkg/controllers/cluster/config.go @@ -17,8 +17,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // ConfigController watches v1alpha1.Config, updates discovery config. diff --git a/internal/app/machined/pkg/controllers/cluster/config_test.go b/internal/app/machined/pkg/controllers/cluster/config_test.go index ca3a1ae78..11e741e36 100644 --- a/internal/app/machined/pkg/controllers/cluster/config_test.go +++ b/internal/app/machined/pkg/controllers/cluster/config_test.go @@ -15,8 +15,8 @@ import ( clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) type ConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/discovery_service.go b/internal/app/machined/pkg/controllers/cluster/discovery_service.go index b0ecf60c5..cf07c86b6 100644 --- a/internal/app/machined/pkg/controllers/cluster/discovery_service.go +++ b/internal/app/machined/pkg/controllers/cluster/discovery_service.go @@ -23,9 +23,9 @@ import ( "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/proto" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" "github.com/talos-systems/talos/pkg/version" ) diff --git a/internal/app/machined/pkg/controllers/cluster/discovery_service_test.go b/internal/app/machined/pkg/controllers/cluster/discovery_service_test.go index c535c2020..fc907f32a 100644 --- a/internal/app/machined/pkg/controllers/cluster/discovery_service_test.go +++ b/internal/app/machined/pkg/controllers/cluster/discovery_service_test.go @@ -28,9 +28,9 @@ import ( "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/proto" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) type DiscoveryServiceSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/endpoint.go b/internal/app/machined/pkg/controllers/cluster/endpoint.go index e0fcd0bc3..f0286a543 100644 --- a/internal/app/machined/pkg/controllers/cluster/endpoint.go +++ b/internal/app/machined/pkg/controllers/cluster/endpoint.go @@ -16,8 +16,8 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // EndpointController looks up control plane endpoints. diff --git a/internal/app/machined/pkg/controllers/cluster/endpoint_test.go b/internal/app/machined/pkg/controllers/cluster/endpoint_test.go index 5b4f836e0..7187bb230 100644 --- a/internal/app/machined/pkg/controllers/cluster/endpoint_test.go +++ b/internal/app/machined/pkg/controllers/cluster/endpoint_test.go @@ -16,8 +16,8 @@ import ( clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) type EndpointSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go index 822752543..c9f3c3539 100644 --- a/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go +++ b/internal/app/machined/pkg/controllers/cluster/kubernetes_pull.go @@ -18,9 +18,9 @@ import ( "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/kubernetes" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // KubernetesPullController pulls list of Affiliate resource from the Kubernetes registry. diff --git a/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go b/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go index 94caa6859..9379279f8 100644 --- a/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go +++ b/internal/app/machined/pkg/controllers/cluster/kubernetes_push.go @@ -18,8 +18,8 @@ import ( "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/kubernetes" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // KubernetesPushController pushes Affiliate resource to the Kubernetes registry. diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go index 596ce3dab..e0ce06687 100644 --- a/internal/app/machined/pkg/controllers/cluster/local_affiliate.go +++ b/internal/app/machined/pkg/controllers/cluster/local_affiliate.go @@ -16,11 +16,11 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" "github.com/talos-systems/talos/pkg/version" ) diff --git a/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go b/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go index 59e51c794..b3b254307 100644 --- a/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go +++ b/internal/app/machined/pkg/controllers/cluster/local_affiliate_test.go @@ -18,11 +18,11 @@ import ( kubespanadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/kubespan" clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type LocalAffiliateSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/member.go b/internal/app/machined/pkg/controllers/cluster/member.go index 16ab15587..f4bb906e5 100644 --- a/internal/app/machined/pkg/controllers/cluster/member.go +++ b/internal/app/machined/pkg/controllers/cluster/member.go @@ -13,7 +13,7 @@ import ( "go.uber.org/zap" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) // MemberController converts Affiliates which have Nodename set into Members. diff --git a/internal/app/machined/pkg/controllers/cluster/member_test.go b/internal/app/machined/pkg/controllers/cluster/member_test.go index 0aede0f3e..114092d8e 100644 --- a/internal/app/machined/pkg/controllers/cluster/member_test.go +++ b/internal/app/machined/pkg/controllers/cluster/member_test.go @@ -15,7 +15,7 @@ import ( clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) type MemberSuite struct { diff --git a/internal/app/machined/pkg/controllers/cluster/node_identity.go b/internal/app/machined/pkg/controllers/cluster/node_identity.go index 4a6e47062..d7e622f72 100644 --- a/internal/app/machined/pkg/controllers/cluster/node_identity.go +++ b/internal/app/machined/pkg/controllers/cluster/node_identity.go @@ -19,9 +19,9 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers" "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // NodeIdentityController manages runtime.Identity caching identity in the STATE. diff --git a/internal/app/machined/pkg/controllers/cluster/node_identity_test.go b/internal/app/machined/pkg/controllers/cluster/node_identity_test.go index eb824f3f2..109b59dfb 100644 --- a/internal/app/machined/pkg/controllers/cluster/node_identity_test.go +++ b/internal/app/machined/pkg/controllers/cluster/node_identity_test.go @@ -18,9 +18,9 @@ import ( clusterctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/cluster" v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type NodeIdentitySuite struct { diff --git a/internal/app/machined/pkg/controllers/config/k8s_address_filter.go b/internal/app/machined/pkg/controllers/config/k8s_address_filter.go index db52769f7..7a3d3d507 100644 --- a/internal/app/machined/pkg/controllers/config/k8s_address_filter.go +++ b/internal/app/machined/pkg/controllers/config/k8s_address_filter.go @@ -15,9 +15,9 @@ import ( "go.uber.org/zap" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // K8sAddressFilterController creates NodeAddressFilters based on machine configuration. diff --git a/internal/app/machined/pkg/controllers/config/k8s_address_filter_test.go b/internal/app/machined/pkg/controllers/config/k8s_address_filter_test.go index 033bf6031..6a0759307 100644 --- a/internal/app/machined/pkg/controllers/config/k8s_address_filter_test.go +++ b/internal/app/machined/pkg/controllers/config/k8s_address_filter_test.go @@ -25,9 +25,9 @@ import ( configctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/config" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type K8sAddressFilterSuite struct { diff --git a/internal/app/machined/pkg/controllers/config/k8s_control_plane.go b/internal/app/machined/pkg/controllers/config/k8s_control_plane.go index 3dc9819e6..74a7ebd84 100644 --- a/internal/app/machined/pkg/controllers/config/k8s_control_plane.go +++ b/internal/app/machined/pkg/controllers/config/k8s_control_plane.go @@ -21,7 +21,7 @@ import ( talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // K8sControlPlaneController manages config.K8sControlPlane based on configuration. diff --git a/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go b/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go index 0fc50a263..8d8fb0838 100644 --- a/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go +++ b/internal/app/machined/pkg/controllers/config/k8s_control_plane_test.go @@ -28,8 +28,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) type K8sControlPlaneSuite struct { diff --git a/internal/app/machined/pkg/controllers/config/machine_type.go b/internal/app/machined/pkg/controllers/config/machine_type.go index af024fe26..bdad7e35d 100644 --- a/internal/app/machined/pkg/controllers/config/machine_type.go +++ b/internal/app/machined/pkg/controllers/config/machine_type.go @@ -15,7 +15,7 @@ import ( "go.uber.org/zap" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // MachineTypeController manages config.MachineType based on configuration. diff --git a/internal/app/machined/pkg/controllers/files/etcfile.go b/internal/app/machined/pkg/controllers/files/etcfile.go index 366124efd..220c4fbe2 100644 --- a/internal/app/machined/pkg/controllers/files/etcfile.go +++ b/internal/app/machined/pkg/controllers/files/etcfile.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" "golang.org/x/sys/unix" - "github.com/talos-systems/talos/pkg/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/files" ) // EtcFileController watches EtcFileSpecs, creates/updates files. diff --git a/internal/app/machined/pkg/controllers/files/etcfile_test.go b/internal/app/machined/pkg/controllers/files/etcfile_test.go index fac5e957e..11fcea796 100644 --- a/internal/app/machined/pkg/controllers/files/etcfile_test.go +++ b/internal/app/machined/pkg/controllers/files/etcfile_test.go @@ -24,7 +24,7 @@ import ( filesctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/files" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/files" ) type EtcFileSuite struct { diff --git a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go index bba30abd8..3778a8790 100644 --- a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod.go @@ -24,9 +24,9 @@ import ( k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" "github.com/talos-systems/talos/pkg/argsbuilder" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // ControlPlaneStaticPodController manages k8s.StaticPod based on control plane configuration. diff --git a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod_test.go b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod_test.go index 2648cfe50..a0e08f873 100644 --- a/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod_test.go +++ b/internal/app/machined/pkg/controllers/k8s/control_plane_static_pod_test.go @@ -28,9 +28,9 @@ import ( k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type ControlPlaneStaticPodSuite struct { diff --git a/internal/app/machined/pkg/controllers/k8s/endpoint.go b/internal/app/machined/pkg/controllers/k8s/endpoint.go index 17f8dbdad..3930a21c2 100644 --- a/internal/app/machined/pkg/controllers/k8s/endpoint.go +++ b/internal/app/machined/pkg/controllers/k8s/endpoint.go @@ -24,8 +24,8 @@ import ( "github.com/talos-systems/talos/pkg/kubernetes" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // EndpointController looks up control plane endpoints. diff --git a/internal/app/machined/pkg/controllers/k8s/extra_manifest.go b/internal/app/machined/pkg/controllers/k8s/extra_manifest.go index 35d8181d3..b209a2dfc 100644 --- a/internal/app/machined/pkg/controllers/k8s/extra_manifest.go +++ b/internal/app/machined/pkg/controllers/k8s/extra_manifest.go @@ -21,9 +21,9 @@ import ( "go.uber.org/zap" k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // ExtraManifestController renders manifests based on templates and config/secrets. diff --git a/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go b/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go index 8a5464e85..cd4a5b5ff 100644 --- a/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go +++ b/internal/app/machined/pkg/controllers/k8s/extra_manifest_test.go @@ -26,10 +26,10 @@ import ( k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type ExtraManifestSuite struct { diff --git a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go index a6782e9ed..f8aaf7c30 100644 --- a/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go +++ b/internal/app/machined/pkg/controllers/k8s/kubelet_static_pod_controller.go @@ -24,9 +24,9 @@ import ( k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" "github.com/talos-systems/talos/pkg/kubernetes/kubelet" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/secrets" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // KubeletStaticPodController renders static pod definitions and manages k8s.StaticPodStatus. diff --git a/internal/app/machined/pkg/controllers/k8s/manifest.go b/internal/app/machined/pkg/controllers/k8s/manifest.go index 15b5b36a5..f8308ce59 100644 --- a/internal/app/machined/pkg/controllers/k8s/manifest.go +++ b/internal/app/machined/pkg/controllers/k8s/manifest.go @@ -19,9 +19,9 @@ import ( "go.uber.org/zap" k8sadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/k8s" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // ManifestController renders manifests based on templates and config/secrets. diff --git a/internal/app/machined/pkg/controllers/k8s/manifest_apply.go b/internal/app/machined/pkg/controllers/k8s/manifest_apply.go index e0678814f..b3ad21a4c 100644 --- a/internal/app/machined/pkg/controllers/k8s/manifest_apply.go +++ b/internal/app/machined/pkg/controllers/k8s/manifest_apply.go @@ -33,9 +33,9 @@ import ( "github.com/talos-systems/talos/internal/pkg/etcd" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/secrets" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // ManifestApplyController applies manifests via control plane endpoint. diff --git a/internal/app/machined/pkg/controllers/k8s/manifest_test.go b/internal/app/machined/pkg/controllers/k8s/manifest_test.go index b79cf0503..51c48be1e 100644 --- a/internal/app/machined/pkg/controllers/k8s/manifest_test.go +++ b/internal/app/machined/pkg/controllers/k8s/manifest_test.go @@ -26,9 +26,9 @@ import ( k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) type ManifestSuite struct { diff --git a/internal/app/machined/pkg/controllers/k8s/nodename.go b/internal/app/machined/pkg/controllers/k8s/nodename.go index 73069f611..db2a67f9d 100644 --- a/internal/app/machined/pkg/controllers/k8s/nodename.go +++ b/internal/app/machined/pkg/controllers/k8s/nodename.go @@ -14,9 +14,9 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // NodenameController renders manifests based on templates and config/secrets. diff --git a/internal/app/machined/pkg/controllers/k8s/nodename_test.go b/internal/app/machined/pkg/controllers/k8s/nodename_test.go index d8013745e..c49f0b295 100644 --- a/internal/app/machined/pkg/controllers/k8s/nodename_test.go +++ b/internal/app/machined/pkg/controllers/k8s/nodename_test.go @@ -25,9 +25,9 @@ import ( k8sctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/k8s" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type NodenameSuite struct { diff --git a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go index b872c6d78..d18eefece 100644 --- a/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go +++ b/internal/app/machined/pkg/controllers/k8s/render_secrets_static_pod.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // RenderSecretsStaticPodController manages k8s.SecretsReady and renders secrets from secrets.Kubernetes. diff --git a/internal/app/machined/pkg/controllers/kubespan/config.go b/internal/app/machined/pkg/controllers/kubespan/config.go index bbf5ed95c..a1512acaf 100644 --- a/internal/app/machined/pkg/controllers/kubespan/config.go +++ b/internal/app/machined/pkg/controllers/kubespan/config.go @@ -14,8 +14,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) // ConfigController watches v1alpha1.Config, updates KubeSpan config. diff --git a/internal/app/machined/pkg/controllers/kubespan/config_test.go b/internal/app/machined/pkg/controllers/kubespan/config_test.go index 4640820d9..8b75e9472 100644 --- a/internal/app/machined/pkg/controllers/kubespan/config_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/config_test.go @@ -13,8 +13,8 @@ import ( kubespanctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/kubespan" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) type ConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/kubespan/endpoint.go b/internal/app/machined/pkg/controllers/kubespan/endpoint.go index 2c39c39e8..39e56d5b8 100644 --- a/internal/app/machined/pkg/controllers/kubespan/endpoint.go +++ b/internal/app/machined/pkg/controllers/kubespan/endpoint.go @@ -12,8 +12,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) // EndpointController watches KubeSpanPeerStatuses, Affiliates and harvests additional endpoints for the peers. diff --git a/internal/app/machined/pkg/controllers/kubespan/endpoint_test.go b/internal/app/machined/pkg/controllers/kubespan/endpoint_test.go index d207167a7..09a433c88 100644 --- a/internal/app/machined/pkg/controllers/kubespan/endpoint_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/endpoint_test.go @@ -14,8 +14,8 @@ import ( kubespanctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/kubespan" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) type EndpointSuite struct { diff --git a/internal/app/machined/pkg/controllers/kubespan/identity.go b/internal/app/machined/pkg/controllers/kubespan/identity.go index fcc738fd8..83a35e1ea 100644 --- a/internal/app/machined/pkg/controllers/kubespan/identity.go +++ b/internal/app/machined/pkg/controllers/kubespan/identity.go @@ -19,11 +19,11 @@ import ( kubespanadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/kubespan" "github.com/talos-systems/talos/internal/app/machined/pkg/controllers" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // IdentityController watches KubeSpan configuration, updates KubeSpan Identity. diff --git a/internal/app/machined/pkg/controllers/kubespan/identity_test.go b/internal/app/machined/pkg/controllers/kubespan/identity_test.go index c77cb6336..593885965 100644 --- a/internal/app/machined/pkg/controllers/kubespan/identity_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/identity_test.go @@ -18,11 +18,11 @@ import ( kubespanctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/kubespan" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type IdentitySuite struct { diff --git a/internal/app/machined/pkg/controllers/kubespan/kubespan_test.go b/internal/app/machined/pkg/controllers/kubespan/kubespan_test.go index ecde1e2bf..8b5387777 100644 --- a/internal/app/machined/pkg/controllers/kubespan/kubespan_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/kubespan_test.go @@ -22,7 +22,7 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) type KubeSpanSuite struct { diff --git a/internal/app/machined/pkg/controllers/kubespan/manager.go b/internal/app/machined/pkg/controllers/kubespan/manager.go index 5cde68f11..295d13c1b 100644 --- a/internal/app/machined/pkg/controllers/kubespan/manager.go +++ b/internal/app/machined/pkg/controllers/kubespan/manager.go @@ -23,9 +23,9 @@ import ( kubespanadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/kubespan" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // DefaultPeerReconcileInterval is interval between peer status reconciliation on timer. diff --git a/internal/app/machined/pkg/controllers/kubespan/manager_test.go b/internal/app/machined/pkg/controllers/kubespan/manager_test.go index 1fb9c1a9d..b9b5c9313 100644 --- a/internal/app/machined/pkg/controllers/kubespan/manager_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/manager_test.go @@ -21,9 +21,9 @@ import ( kubespanctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/kubespan" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type ManagerSuite struct { diff --git a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go index 92c1452d3..df632cc2a 100644 --- a/internal/app/machined/pkg/controllers/kubespan/peer_spec.go +++ b/internal/app/machined/pkg/controllers/kubespan/peer_spec.go @@ -15,9 +15,9 @@ import ( "go.uber.org/zap" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) // PeerSpecController watches cluster.Affiliates updates PeerSpec. diff --git a/internal/app/machined/pkg/controllers/kubespan/peer_spec_test.go b/internal/app/machined/pkg/controllers/kubespan/peer_spec_test.go index d53f956a7..850299c91 100644 --- a/internal/app/machined/pkg/controllers/kubespan/peer_spec_test.go +++ b/internal/app/machined/pkg/controllers/kubespan/peer_spec_test.go @@ -17,11 +17,11 @@ import ( kubespanctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/kubespan" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/kubespan" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type PeerSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/address_config.go b/internal/app/machined/pkg/controllers/network/address_config.go index dbe1bfdae..9c5d59a9b 100644 --- a/internal/app/machined/pkg/controllers/network/address_config.go +++ b/internal/app/machined/pkg/controllers/network/address_config.go @@ -20,8 +20,8 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // AddressConfigController manages network.AddressSpec based on machine configuration, kernel cmdline and some built-in defaults. diff --git a/internal/app/machined/pkg/controllers/network/address_config_test.go b/internal/app/machined/pkg/controllers/network/address_config_test.go index e242fdfb4..016ef95da 100644 --- a/internal/app/machined/pkg/controllers/network/address_config_test.go +++ b/internal/app/machined/pkg/controllers/network/address_config_test.go @@ -29,8 +29,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type AddressConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/address_merge.go b/internal/app/machined/pkg/controllers/network/address_merge.go index 5f71a4b68..fada4623c 100644 --- a/internal/app/machined/pkg/controllers/network/address_merge.go +++ b/internal/app/machined/pkg/controllers/network/address_merge.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // AddressMergeController merges network.AddressSpec in network.ConfigNamespace and produces final network.AddressSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/address_merge_test.go b/internal/app/machined/pkg/controllers/network/address_merge_test.go index 17b5399f4..52654894c 100644 --- a/internal/app/machined/pkg/controllers/network/address_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/address_merge_test.go @@ -26,7 +26,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type AddressMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/address_spec.go b/internal/app/machined/pkg/controllers/network/address_spec.go index d55ea942c..c3fca6a2a 100644 --- a/internal/app/machined/pkg/controllers/network/address_spec.go +++ b/internal/app/machined/pkg/controllers/network/address_spec.go @@ -21,7 +21,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // AddressSpecController applies network.AddressSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/address_spec_test.go b/internal/app/machined/pkg/controllers/network/address_spec_test.go index d08872448..a7660c55f 100644 --- a/internal/app/machined/pkg/controllers/network/address_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/address_spec_test.go @@ -29,7 +29,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type AddressSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/address_status.go b/internal/app/machined/pkg/controllers/network/address_status.go index 52dbf0b7b..0b6b9dd35 100644 --- a/internal/app/machined/pkg/controllers/network/address_status.go +++ b/internal/app/machined/pkg/controllers/network/address_status.go @@ -17,7 +17,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // AddressStatusController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/address_status_test.go b/internal/app/machined/pkg/controllers/network/address_status_test.go index e83c745c2..17ecdcac1 100644 --- a/internal/app/machined/pkg/controllers/network/address_status_test.go +++ b/internal/app/machined/pkg/controllers/network/address_status_test.go @@ -23,7 +23,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type AddressStatusSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/etcfile.go b/internal/app/machined/pkg/controllers/network/etcfile.go index 0475509e8..8336b3e05 100644 --- a/internal/app/machined/pkg/controllers/network/etcfile.go +++ b/internal/app/machined/pkg/controllers/network/etcfile.go @@ -18,9 +18,9 @@ import ( "go.uber.org/zap" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/files" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // EtcFileController creates /etc/hostname and /etc/resolv.conf files based on finalized network configuration. diff --git a/internal/app/machined/pkg/controllers/network/etcfile_test.go b/internal/app/machined/pkg/controllers/network/etcfile_test.go index 49b04ce2d..499e9ed4b 100644 --- a/internal/app/machined/pkg/controllers/network/etcfile_test.go +++ b/internal/app/machined/pkg/controllers/network/etcfile_test.go @@ -26,9 +26,9 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/files" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type EtcFileConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/hardware_addr.go b/internal/app/machined/pkg/controllers/network/hardware_addr.go index 3adf13dfa..acb261f38 100644 --- a/internal/app/machined/pkg/controllers/network/hardware_addr.go +++ b/internal/app/machined/pkg/controllers/network/hardware_addr.go @@ -12,7 +12,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // HardwareAddrController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/hardware_addr_test.go b/internal/app/machined/pkg/controllers/network/hardware_addr_test.go index 78bd2ce70..4ca14691c 100644 --- a/internal/app/machined/pkg/controllers/network/hardware_addr_test.go +++ b/internal/app/machined/pkg/controllers/network/hardware_addr_test.go @@ -25,7 +25,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type HardwareAddrSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/hostname_config.go b/internal/app/machined/pkg/controllers/network/hostname_config.go index db0811535..2c539bd36 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_config.go +++ b/internal/app/machined/pkg/controllers/network/hostname_config.go @@ -17,8 +17,8 @@ import ( "go.uber.org/zap" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // HostnameConfigController manages network.HostnameSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/hostname_config_test.go b/internal/app/machined/pkg/controllers/network/hostname_config_test.go index 16ab7e0ec..ddbe5291a 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_config_test.go +++ b/internal/app/machined/pkg/controllers/network/hostname_config_test.go @@ -28,8 +28,8 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type HostnameConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/hostname_merge.go b/internal/app/machined/pkg/controllers/network/hostname_merge.go index 400308b19..5c9efbc2a 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_merge.go +++ b/internal/app/machined/pkg/controllers/network/hostname_merge.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // HostnameMergeController merges network.HostnameSpec in network.ConfigNamespace and produces final network.HostnameSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/hostname_merge_test.go b/internal/app/machined/pkg/controllers/network/hostname_merge_test.go index 1e8a8eead..9eb6b23db 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/hostname_merge_test.go @@ -23,7 +23,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type HostnameMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/hostname_spec.go b/internal/app/machined/pkg/controllers/network/hostname_spec.go index 5eec640e8..6f568402b 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_spec.go +++ b/internal/app/machined/pkg/controllers/network/hostname_spec.go @@ -15,7 +15,7 @@ import ( "golang.org/x/sys/unix" v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // HostnameSpecController applies network.HostnameSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/hostname_spec_test.go b/internal/app/machined/pkg/controllers/network/hostname_spec_test.go index 076fbf891..c777bd8b3 100644 --- a/internal/app/machined/pkg/controllers/network/hostname_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/hostname_spec_test.go @@ -22,7 +22,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type HostnameSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/link_config.go b/internal/app/machined/pkg/controllers/network/link_config.go index abea0376a..44615b085 100644 --- a/internal/app/machined/pkg/controllers/network/link_config.go +++ b/internal/app/machined/pkg/controllers/network/link_config.go @@ -20,8 +20,8 @@ import ( networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // LinkConfigController manages network.LinkSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/link_config_test.go b/internal/app/machined/pkg/controllers/network/link_config_test.go index 8528ac743..601f014ac 100644 --- a/internal/app/machined/pkg/controllers/network/link_config_test.go +++ b/internal/app/machined/pkg/controllers/network/link_config_test.go @@ -28,8 +28,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type LinkConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/link_merge.go b/internal/app/machined/pkg/controllers/network/link_merge.go index 0eec4f49d..766246a3c 100644 --- a/internal/app/machined/pkg/controllers/network/link_merge.go +++ b/internal/app/machined/pkg/controllers/network/link_merge.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // LinkMergeController merges network.LinkSpec in network.ConfigNamespace and produces final network.LinkSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/link_merge_test.go b/internal/app/machined/pkg/controllers/network/link_merge_test.go index edf31bff0..32226d578 100644 --- a/internal/app/machined/pkg/controllers/network/link_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/link_merge_test.go @@ -24,7 +24,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type LinkMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/link_spec.go b/internal/app/machined/pkg/controllers/network/link_spec.go index 18555314e..a518ad3c4 100644 --- a/internal/app/machined/pkg/controllers/network/link_spec.go +++ b/internal/app/machined/pkg/controllers/network/link_spec.go @@ -20,7 +20,7 @@ import ( networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // LinkSpecController applies network.LinkSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/link_spec_test.go b/internal/app/machined/pkg/controllers/network/link_spec_test.go index 4816a6ec4..03eec3ec7 100644 --- a/internal/app/machined/pkg/controllers/network/link_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/link_spec_test.go @@ -28,7 +28,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type LinkSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/link_status.go b/internal/app/machined/pkg/controllers/network/link_status.go index 27ff2be20..e7d43ab50 100644 --- a/internal/app/machined/pkg/controllers/network/link_status.go +++ b/internal/app/machined/pkg/controllers/network/link_status.go @@ -22,7 +22,7 @@ import ( networkadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/network" "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // LinkStatusController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/link_status_test.go b/internal/app/machined/pkg/controllers/network/link_status_test.go index 2e1fa1863..6660aa3a2 100644 --- a/internal/app/machined/pkg/controllers/network/link_status_test.go +++ b/internal/app/machined/pkg/controllers/network/link_status_test.go @@ -28,7 +28,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type LinkStatusSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/node_address.go b/internal/app/machined/pkg/controllers/network/node_address.go index 9dfbf64f8..baff21e7c 100644 --- a/internal/app/machined/pkg/controllers/network/node_address.go +++ b/internal/app/machined/pkg/controllers/network/node_address.go @@ -15,7 +15,7 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // NodeAddressController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/node_address_test.go b/internal/app/machined/pkg/controllers/network/node_address_test.go index 89021e9d1..1bc6153b0 100644 --- a/internal/app/machined/pkg/controllers/network/node_address_test.go +++ b/internal/app/machined/pkg/controllers/network/node_address_test.go @@ -28,7 +28,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type NodeAddressSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/operator/dhcp4.go b/internal/app/machined/pkg/controllers/network/operator/dhcp4.go index 2fe1df892..455a6b1b0 100644 --- a/internal/app/machined/pkg/controllers/network/operator/dhcp4.go +++ b/internal/app/machined/pkg/controllers/network/operator/dhcp4.go @@ -20,7 +20,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // DHCP4 implements the DHCPv4 network operator. diff --git a/internal/app/machined/pkg/controllers/network/operator/dhcp6.go b/internal/app/machined/pkg/controllers/network/operator/dhcp6.go index 9df94881e..51711cc97 100644 --- a/internal/app/machined/pkg/controllers/network/operator/dhcp6.go +++ b/internal/app/machined/pkg/controllers/network/operator/dhcp6.go @@ -22,7 +22,7 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // DHCP6 implements the DHCPv6 network operator. diff --git a/internal/app/machined/pkg/controllers/network/operator/operator.go b/internal/app/machined/pkg/controllers/network/operator/operator.go index b6eb11d04..93d651668 100644 --- a/internal/app/machined/pkg/controllers/network/operator/operator.go +++ b/internal/app/machined/pkg/controllers/network/operator/operator.go @@ -8,7 +8,7 @@ package operator import ( "context" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // Operator describes common interface of the operators. diff --git a/internal/app/machined/pkg/controllers/network/operator/vip.go b/internal/app/machined/pkg/controllers/network/operator/vip.go index a297249bd..4d9e1fc20 100644 --- a/internal/app/machined/pkg/controllers/network/operator/vip.go +++ b/internal/app/machined/pkg/controllers/network/operator/vip.go @@ -23,9 +23,9 @@ import ( "github.com/talos-systems/talos/internal/pkg/etcd" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) const campaignRetryInterval = time.Second diff --git a/internal/app/machined/pkg/controllers/network/operator/vip/equinix_metal_test.go b/internal/app/machined/pkg/controllers/network/operator/vip/equinix_metal_test.go index f3792bf87..829e762e6 100644 --- a/internal/app/machined/pkg/controllers/network/operator/vip/equinix_metal_test.go +++ b/internal/app/machined/pkg/controllers/network/operator/vip/equinix_metal_test.go @@ -14,7 +14,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/operator/vip" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestEquinixMetalHandler(t *testing.T) { diff --git a/internal/app/machined/pkg/controllers/network/operator/vip/equnix_metal.go b/internal/app/machined/pkg/controllers/network/operator/vip/equnix_metal.go index c58e59352..5321b0844 100644 --- a/internal/app/machined/pkg/controllers/network/operator/vip/equnix_metal.go +++ b/internal/app/machined/pkg/controllers/network/operator/vip/equnix_metal.go @@ -14,7 +14,7 @@ import ( "go.uber.org/zap" "github.com/talos-systems/talos/pkg/download" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // EquinixMetalHandler implements assignment and release of Virtual IPs using API. diff --git a/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go b/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go index 7533d6a0c..9ea3810da 100644 --- a/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go +++ b/internal/app/machined/pkg/controllers/network/operator/vip/hcloud.go @@ -15,7 +15,7 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/download" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // HCloudHandler implements assignment and release of Virtual IPs using API. diff --git a/internal/app/machined/pkg/controllers/network/operator_config.go b/internal/app/machined/pkg/controllers/network/operator_config.go index 29560d722..a66cd9bc3 100644 --- a/internal/app/machined/pkg/controllers/network/operator_config.go +++ b/internal/app/machined/pkg/controllers/network/operator_config.go @@ -19,8 +19,8 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/operator/vip" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // OperatorConfigController manages network.OperatorSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/operator_config_test.go b/internal/app/machined/pkg/controllers/network/operator_config_test.go index 76e66e705..fc9f44227 100644 --- a/internal/app/machined/pkg/controllers/network/operator_config_test.go +++ b/internal/app/machined/pkg/controllers/network/operator_config_test.go @@ -29,8 +29,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type OperatorConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/operator_spec.go b/internal/app/machined/pkg/controllers/network/operator_spec.go index 444d0255c..ad941117a 100644 --- a/internal/app/machined/pkg/controllers/network/operator_spec.go +++ b/internal/app/machined/pkg/controllers/network/operator_spec.go @@ -17,7 +17,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/operator" v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // OperatorSpecController applies network.OperatorSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/operator_spec_test.go b/internal/app/machined/pkg/controllers/network/operator_spec_test.go index 8a5ef933f..80f05d3a3 100644 --- a/internal/app/machined/pkg/controllers/network/operator_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/operator_spec_test.go @@ -26,7 +26,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/operator" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type OperatorSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/platform_config.go b/internal/app/machined/pkg/controllers/network/platform_config.go index 17c618442..024eb5473 100644 --- a/internal/app/machined/pkg/controllers/network/platform_config.go +++ b/internal/app/machined/pkg/controllers/network/platform_config.go @@ -17,7 +17,7 @@ import ( v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" platformerrors "github.com/talos-systems/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/errors" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // Virtual link name for external IPs. diff --git a/internal/app/machined/pkg/controllers/network/platform_config_test.go b/internal/app/machined/pkg/controllers/network/platform_config_test.go index 780d4cdb1..a95bcf29b 100644 --- a/internal/app/machined/pkg/controllers/network/platform_config_test.go +++ b/internal/app/machined/pkg/controllers/network/platform_config_test.go @@ -27,7 +27,7 @@ import ( v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type PlatformConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/resolver_config.go b/internal/app/machined/pkg/controllers/network/resolver_config.go index a6860360a..10a505bb7 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_config.go +++ b/internal/app/machined/pkg/controllers/network/resolver_config.go @@ -18,8 +18,8 @@ import ( talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // ResolverConfigController manages network.ResolverSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/resolver_config_test.go b/internal/app/machined/pkg/controllers/network/resolver_config_test.go index dd0f143d0..ffac5c7dd 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_config_test.go +++ b/internal/app/machined/pkg/controllers/network/resolver_config_test.go @@ -28,8 +28,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type ResolverConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/resolver_merge.go b/internal/app/machined/pkg/controllers/network/resolver_merge.go index 9ad8aead6..8e9a29403 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_merge.go +++ b/internal/app/machined/pkg/controllers/network/resolver_merge.go @@ -16,7 +16,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // ResolverMergeController merges network.ResolverSpec in network.ConfigNamespace and produces final network.ResolverSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/resolver_merge_test.go b/internal/app/machined/pkg/controllers/network/resolver_merge_test.go index 125c11035..343268e99 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/resolver_merge_test.go @@ -26,7 +26,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type ResolverMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/resolver_spec.go b/internal/app/machined/pkg/controllers/network/resolver_spec.go index 2aeafae89..9ad89e6cb 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_spec.go +++ b/internal/app/machined/pkg/controllers/network/resolver_spec.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // ResolverSpecController applies network.ResolverSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/resolver_spec_test.go b/internal/app/machined/pkg/controllers/network/resolver_spec_test.go index d5c333077..611cb6b0c 100644 --- a/internal/app/machined/pkg/controllers/network/resolver_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/resolver_spec_test.go @@ -25,7 +25,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type ResolverSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/route_config.go b/internal/app/machined/pkg/controllers/network/route_config.go index ef3c9b156..759a21a54 100644 --- a/internal/app/machined/pkg/controllers/network/route_config.go +++ b/internal/app/machined/pkg/controllers/network/route_config.go @@ -18,8 +18,8 @@ import ( talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // RouteConfigController manages network.RouteSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/route_config_test.go b/internal/app/machined/pkg/controllers/network/route_config_test.go index 76fac77c6..e5d746dcf 100644 --- a/internal/app/machined/pkg/controllers/network/route_config_test.go +++ b/internal/app/machined/pkg/controllers/network/route_config_test.go @@ -28,8 +28,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type RouteConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/route_merge.go b/internal/app/machined/pkg/controllers/network/route_merge.go index 5aa7f3384..2c745165d 100644 --- a/internal/app/machined/pkg/controllers/network/route_merge.go +++ b/internal/app/machined/pkg/controllers/network/route_merge.go @@ -14,7 +14,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // RouteMergeController merges network.RouteSpec in network.ConfigNamespace and produces final network.RouteSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/route_merge_test.go b/internal/app/machined/pkg/controllers/network/route_merge_test.go index a7b4cf0c0..77a9f1f71 100644 --- a/internal/app/machined/pkg/controllers/network/route_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/route_merge_test.go @@ -26,7 +26,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type RouteMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/route_spec.go b/internal/app/machined/pkg/controllers/network/route_spec.go index 820fb93ac..08a8f63e9 100644 --- a/internal/app/machined/pkg/controllers/network/route_spec.go +++ b/internal/app/machined/pkg/controllers/network/route_spec.go @@ -18,7 +18,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // RouteSpecController applies network.RouteSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/route_spec_test.go b/internal/app/machined/pkg/controllers/network/route_spec_test.go index 1c193ce2d..c535fb462 100644 --- a/internal/app/machined/pkg/controllers/network/route_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/route_spec_test.go @@ -29,7 +29,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type RouteSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/route_status.go b/internal/app/machined/pkg/controllers/network/route_status.go index 889390250..190e14491 100644 --- a/internal/app/machined/pkg/controllers/network/route_status.go +++ b/internal/app/machined/pkg/controllers/network/route_status.go @@ -17,7 +17,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network/watch" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // RouteStatusController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/route_status_test.go b/internal/app/machined/pkg/controllers/network/route_status_test.go index c4f2efeef..73987095c 100644 --- a/internal/app/machined/pkg/controllers/network/route_status_test.go +++ b/internal/app/machined/pkg/controllers/network/route_status_test.go @@ -24,7 +24,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type RouteStatusSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/status.go b/internal/app/machined/pkg/controllers/network/status.go index 731a6dd83..1a79a6428 100644 --- a/internal/app/machined/pkg/controllers/network/status.go +++ b/internal/app/machined/pkg/controllers/network/status.go @@ -14,8 +14,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/files" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // StatusController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/network/status_test.go b/internal/app/machined/pkg/controllers/network/status_test.go index 3fa7c0196..b5bd1d2ca 100644 --- a/internal/app/machined/pkg/controllers/network/status_test.go +++ b/internal/app/machined/pkg/controllers/network/status_test.go @@ -23,8 +23,8 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/files" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type StatusSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/timeserver_config.go b/internal/app/machined/pkg/controllers/network/timeserver_config.go index 299556a42..8fe288eca 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_config.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_config.go @@ -17,8 +17,8 @@ import ( talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // TimeServerConfigController manages network.TimeServerSpec based on machine configuration, kernel cmdline. diff --git a/internal/app/machined/pkg/controllers/network/timeserver_config_test.go b/internal/app/machined/pkg/controllers/network/timeserver_config_test.go index cc1c51e17..b6ced438d 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_config_test.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_config_test.go @@ -27,8 +27,8 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type TimeServerConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/timeserver_merge.go b/internal/app/machined/pkg/controllers/network/timeserver_merge.go index 160697767..584b665aa 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_merge.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_merge.go @@ -16,7 +16,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // TimeServerMergeController merges network.TimeServerSpec in network.ConfigNamespace and produces final network.TimeServerSpec in network.Namespace. diff --git a/internal/app/machined/pkg/controllers/network/timeserver_merge_test.go b/internal/app/machined/pkg/controllers/network/timeserver_merge_test.go index 043e129a1..eb39a69d5 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_merge_test.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_merge_test.go @@ -25,7 +25,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type TimeServerMergeSuite struct { diff --git a/internal/app/machined/pkg/controllers/network/timeserver_spec.go b/internal/app/machined/pkg/controllers/network/timeserver_spec.go index 23d4b0369..7c32c306d 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_spec.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_spec.go @@ -13,7 +13,7 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // TimeServerSpecController applies network.TimeServerSpec to the actual interfaces. diff --git a/internal/app/machined/pkg/controllers/network/timeserver_spec_test.go b/internal/app/machined/pkg/controllers/network/timeserver_spec_test.go index ceb060cf8..2a4e532c2 100644 --- a/internal/app/machined/pkg/controllers/network/timeserver_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/timeserver_spec_test.go @@ -24,7 +24,7 @@ import ( netctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/network" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) type TimeServerSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/perf/perf.go b/internal/app/machined/pkg/controllers/perf/perf.go index 32f8b55d6..c7ae8a517 100644 --- a/internal/app/machined/pkg/controllers/perf/perf.go +++ b/internal/app/machined/pkg/controllers/perf/perf.go @@ -14,7 +14,7 @@ import ( "go.uber.org/zap" perfadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/perf" - "github.com/talos-systems/talos/pkg/resources/perf" + "github.com/talos-systems/talos/pkg/machinery/resources/perf" ) const updateInterval = time.Second * 30 diff --git a/internal/app/machined/pkg/controllers/perf/perf_test.go b/internal/app/machined/pkg/controllers/perf/perf_test.go index 98c78e801..7ca434eeb 100644 --- a/internal/app/machined/pkg/controllers/perf/perf_test.go +++ b/internal/app/machined/pkg/controllers/perf/perf_test.go @@ -22,7 +22,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/perf" "github.com/talos-systems/talos/pkg/logging" - perfresource "github.com/talos-systems/talos/pkg/resources/perf" + perfresource "github.com/talos-systems/talos/pkg/machinery/resources/perf" ) type PerfSuite struct { diff --git a/internal/app/machined/pkg/controllers/runtime/common_test.go b/internal/app/machined/pkg/controllers/runtime/common_test.go index df1942ba4..252b17194 100644 --- a/internal/app/machined/pkg/controllers/runtime/common_test.go +++ b/internal/app/machined/pkg/controllers/runtime/common_test.go @@ -21,7 +21,7 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) const ( diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go index 6e600aed0..60ea19cac 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_config.go @@ -14,8 +14,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) // KernelParamConfigController watches v1alpha1.Config, creates/updates/deletes kernel param specs. diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_config_test.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_config_test.go index 27de5fbca..da480749b 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_config_test.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_config_test.go @@ -15,8 +15,8 @@ import ( runtimecontrollers "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/runtime" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" - runtimeresource "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + runtimeresource "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) type KernelParamConfigSuite struct { diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults.go index 45cf187ef..350e1164a 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults.go @@ -14,7 +14,7 @@ import ( v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/kernel/kspp" "github.com/talos-systems/talos/pkg/machinery/kernel" - "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) // KernelParamDefaultsController creates default kernel params. diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults_test.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults_test.go index 8b0cc259c..50e3b907e 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults_test.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_defaults_test.go @@ -15,7 +15,7 @@ import ( runtimecontrollers "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/runtime" "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/kernel" - runtimeresource "github.com/talos-systems/talos/pkg/resources/runtime" + runtimeresource "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) type KernelParamDefaultsSuite struct { diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go index e4c896404..45b0f40ed 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec.go @@ -17,7 +17,7 @@ import ( krnl "github.com/talos-systems/talos/pkg/kernel" "github.com/talos-systems/talos/pkg/machinery/kernel" - "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) // KernelParamSpecController watches KernelParamSpecs, sets/resets kernel params. diff --git a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec_test.go b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec_test.go index 1be938649..465c34e47 100644 --- a/internal/app/machined/pkg/controllers/runtime/kernel_param_spec_test.go +++ b/internal/app/machined/pkg/controllers/runtime/kernel_param_spec_test.go @@ -18,7 +18,7 @@ import ( runtimecontrollers "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/runtime" krnl "github.com/talos-systems/talos/pkg/kernel" "github.com/talos-systems/talos/pkg/machinery/kernel" - runtimeresource "github.com/talos-systems/talos/pkg/resources/runtime" + runtimeresource "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) type KernelParamSpecSuite struct { diff --git a/internal/app/machined/pkg/controllers/secrets/api.go b/internal/app/machined/pkg/controllers/secrets/api.go index e3f8a5d6d..5f9d1491b 100644 --- a/internal/app/machined/pkg/controllers/secrets/api.go +++ b/internal/app/machined/pkg/controllers/secrets/api.go @@ -19,13 +19,13 @@ import ( "github.com/talos-systems/talos/pkg/grpc/gen" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/role" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" - timeresource "github.com/talos-systems/talos/pkg/resources/time" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" ) // APIController manages secrets.API based on configuration to provide apid certificate. diff --git a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go index 0dd6d94b6..5ae01b3b2 100644 --- a/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/api_cert_sans.go @@ -14,9 +14,9 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // APICertSANsController manages secrets.APICertSANs based on configuration. diff --git a/internal/app/machined/pkg/controllers/secrets/api_cert_sans_test.go b/internal/app/machined/pkg/controllers/secrets/api_cert_sans_test.go index 7297f1212..f448eefa6 100644 --- a/internal/app/machined/pkg/controllers/secrets/api_cert_sans_test.go +++ b/internal/app/machined/pkg/controllers/secrets/api_cert_sans_test.go @@ -24,9 +24,9 @@ import ( secretsctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/secrets" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) type APICertSANsSuite struct { diff --git a/internal/app/machined/pkg/controllers/secrets/api_test.go b/internal/app/machined/pkg/controllers/secrets/api_test.go index cec13d048..24a30f1cc 100644 --- a/internal/app/machined/pkg/controllers/secrets/api_test.go +++ b/internal/app/machined/pkg/controllers/secrets/api_test.go @@ -27,10 +27,10 @@ import ( secretsctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/secrets" "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" "github.com/talos-systems/talos/pkg/machinery/role" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" ) type APISuite struct { diff --git a/internal/app/machined/pkg/controllers/secrets/etcd.go b/internal/app/machined/pkg/controllers/secrets/etcd.go index aaa43b80d..14df8b7a5 100644 --- a/internal/app/machined/pkg/controllers/secrets/etcd.go +++ b/internal/app/machined/pkg/controllers/secrets/etcd.go @@ -15,10 +15,10 @@ import ( "go.uber.org/zap" "github.com/talos-systems/talos/internal/pkg/etcd" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" - "github.com/talos-systems/talos/pkg/resources/time" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // EtcdController manages secrets.Etcd based on configuration. diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes.go b/internal/app/machined/pkg/controllers/secrets/kubernetes.go index 711c8cc65..6cfd40ea9 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes.go @@ -22,10 +22,10 @@ import ( "github.com/talos-systems/talos/internal/pkg/kubeconfig" "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" - timeresource "github.com/talos-systems/talos/pkg/resources/time" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // KubernetesCertificateValidityDuration is the validity duration for the certificates created with this controller. diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go index 9e3dcaaf3..49261aeff 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans.go @@ -14,9 +14,9 @@ import ( "github.com/cosi-project/runtime/pkg/state" "go.uber.org/zap" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // KubernetesCertSANsController manages secrets.KubernetesCertSANs based on configuration. diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans_test.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans_test.go index 1ea63c24c..44d06f5fd 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans_test.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_cert_sans_test.go @@ -26,9 +26,9 @@ import ( secretsctrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/secrets" "github.com/talos-systems/talos/pkg/logging" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) type KubernetesCertSANsSuite struct { diff --git a/internal/app/machined/pkg/controllers/secrets/kubernetes_test.go b/internal/app/machined/pkg/controllers/secrets/kubernetes_test.go index 90d42b143..6f2b9e126 100644 --- a/internal/app/machined/pkg/controllers/secrets/kubernetes_test.go +++ b/internal/app/machined/pkg/controllers/secrets/kubernetes_test.go @@ -30,10 +30,10 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" - timeresource "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" ) type KubernetesSuite struct { diff --git a/internal/app/machined/pkg/controllers/secrets/root.go b/internal/app/machined/pkg/controllers/secrets/root.go index d389d21c4..99e6127be 100644 --- a/internal/app/machined/pkg/controllers/secrets/root.go +++ b/internal/app/machined/pkg/controllers/secrets/root.go @@ -17,8 +17,8 @@ import ( talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // RootController manages secrets.Root based on configuration. diff --git a/internal/app/machined/pkg/controllers/time/sync.go b/internal/app/machined/pkg/controllers/time/sync.go index ab557570a..3fc6dbfb6 100644 --- a/internal/app/machined/pkg/controllers/time/sync.go +++ b/internal/app/machined/pkg/controllers/time/sync.go @@ -18,9 +18,9 @@ import ( v1alpha1runtime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/internal/pkg/ntp" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/time" ) // SyncController manages v1alpha1.TimeSync based on configuration and NTP sync process. diff --git a/internal/app/machined/pkg/controllers/time/sync_test.go b/internal/app/machined/pkg/controllers/time/sync_test.go index b063912b0..81c39ead8 100644 --- a/internal/app/machined/pkg/controllers/time/sync_test.go +++ b/internal/app/machined/pkg/controllers/time/sync_test.go @@ -27,10 +27,10 @@ import ( "github.com/talos-systems/talos/pkg/logging" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/network" - timeresource "github.com/talos-systems/talos/pkg/resources/time" - v1alpha1resource "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" + v1alpha1resource "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) type SyncSuite struct { diff --git a/internal/app/machined/pkg/controllers/v1alpha1/service.go b/internal/app/machined/pkg/controllers/v1alpha1/service.go index 112472236..dac9af044 100644 --- a/internal/app/machined/pkg/controllers/v1alpha1/service.go +++ b/internal/app/machined/pkg/controllers/v1alpha1/service.go @@ -16,7 +16,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" "github.com/talos-systems/talos/pkg/machinery/api/machine" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // ServiceController manages v1alpha1.Service based on services subsystem state. diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_runtime.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_runtime.go index 808b1bbc1..b9e746dc1 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_runtime.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_runtime.go @@ -16,7 +16,7 @@ import ( "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/config/configloader" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // Runtime implements the Runtime interface. diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go index bc4ecaa7e..2d0b3b008 100644 --- a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go +++ b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go @@ -67,7 +67,7 @@ import ( "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" "github.com/talos-systems/talos/pkg/machinery/kernel" - resourceruntime "github.com/talos-systems/talos/pkg/resources/runtime" + resourceruntime "github.com/talos-systems/talos/pkg/machinery/resources/runtime" "github.com/talos-systems/talos/pkg/version" ) diff --git a/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go b/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go index 775a91a8f..482a816b1 100644 --- a/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go +++ b/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_controller.go @@ -35,7 +35,7 @@ import ( "github.com/talos-systems/talos/pkg/logging" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/constants" - configresource "github.com/talos-systems/talos/pkg/resources/config" + configresource "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // Controller implements runtime.V1alpha2Controller. diff --git a/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_state.go b/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_state.go index da540dc52..b5ab42e74 100644 --- a/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_state.go +++ b/internal/app/machined/pkg/runtime/v1alpha2/v1alpha2_state.go @@ -14,17 +14,17 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" talosconfig "github.com/talos-systems/talos/pkg/machinery/config" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/files" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/kubespan" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/perf" - "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/secrets" - "github.com/talos-systems/talos/pkg/resources/time" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/perf" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // State implements runtime.V1alpha2State interface. diff --git a/internal/app/machined/pkg/system/services/apid.go b/internal/app/machined/pkg/system/services/apid.go index dcad69db6..3db9178cf 100644 --- a/internal/app/machined/pkg/system/services/apid.go +++ b/internal/app/machined/pkg/system/services/apid.go @@ -30,7 +30,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/restart" "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) // APID implements the Service interface. It serves as the concrete type with diff --git a/internal/app/machined/pkg/system/services/cri.go b/internal/app/machined/pkg/system/services/cri.go index 5066b5ce2..3217d1668 100644 --- a/internal/app/machined/pkg/system/services/cri.go +++ b/internal/app/machined/pkg/system/services/cri.go @@ -21,7 +21,7 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/restart" "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // CRI implements the Service interface. It serves as the concrete type with diff --git a/internal/app/machined/pkg/system/services/etcd.go b/internal/app/machined/pkg/system/services/etcd.go index 437d6bd97..3fe157e30 100644 --- a/internal/app/machined/pkg/system/services/etcd.go +++ b/internal/app/machined/pkg/system/services/etcd.go @@ -44,9 +44,9 @@ import ( "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" - "github.com/talos-systems/talos/pkg/resources/secrets" - timeresource "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" ) // Etcd implements the Service interface. It serves as the concrete type with diff --git a/internal/app/machined/pkg/system/services/kubelet.go b/internal/app/machined/pkg/system/services/kubelet.go index 22e1efdc3..e56bbdf2e 100644 --- a/internal/app/machined/pkg/system/services/kubelet.go +++ b/internal/app/machined/pkg/system/services/kubelet.go @@ -40,9 +40,9 @@ import ( "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" - timeresource "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" ) var kubeletKubeConfigTemplate = []byte(`apiVersion: v1 diff --git a/internal/app/machined/pkg/system/services/trustd.go b/internal/app/machined/pkg/system/services/trustd.go index 92ebbd6e3..19811307b 100644 --- a/internal/app/machined/pkg/system/services/trustd.go +++ b/internal/app/machined/pkg/system/services/trustd.go @@ -25,8 +25,8 @@ import ( "github.com/talos-systems/talos/internal/app/machined/pkg/system/runner/restart" "github.com/talos-systems/talos/pkg/conditions" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" - timeresource "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/network" + timeresource "github.com/talos-systems/talos/pkg/machinery/resources/time" ) // Trustd implements the Service interface. It serves as the concrete type with diff --git a/internal/app/maintenance/main.go b/internal/app/maintenance/main.go index 32c3ae69e..b4756d2e6 100644 --- a/internal/app/maintenance/main.go +++ b/internal/app/maintenance/main.go @@ -24,7 +24,7 @@ import ( "github.com/talos-systems/talos/pkg/grpc/gen" "github.com/talos-systems/talos/pkg/grpc/middleware/authz" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // Run executes the configuration receiver, returning any configuration it receives. diff --git a/internal/integration/api/discovery.go b/internal/integration/api/discovery.go index f68251cba..af390cd71 100644 --- a/internal/integration/api/discovery.go +++ b/internal/integration/api/discovery.go @@ -19,8 +19,8 @@ import ( "github.com/talos-systems/talos/internal/integration/base" "github.com/talos-systems/talos/pkg/machinery/client" - "github.com/talos-systems/talos/pkg/resources/cluster" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) // DiscoverySuite verifies Discovery API. diff --git a/internal/pkg/discovery/registry/kubernetes.go b/internal/pkg/discovery/registry/kubernetes.go index 96ec00e2a..a76722be6 100644 --- a/internal/pkg/discovery/registry/kubernetes.go +++ b/internal/pkg/discovery/registry/kubernetes.go @@ -26,7 +26,7 @@ import ( "github.com/talos-systems/talos/pkg/kubernetes" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) // Kubernetes defines a Kubernetes-based node discoverer. diff --git a/internal/pkg/discovery/registry/kubernetes_test.go b/internal/pkg/discovery/registry/kubernetes_test.go index a08a3d3dd..65dc5b57f 100644 --- a/internal/pkg/discovery/registry/kubernetes_test.go +++ b/internal/pkg/discovery/registry/kubernetes_test.go @@ -15,7 +15,7 @@ import ( "github.com/talos-systems/talos/internal/pkg/discovery/registry" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) func TestAnnotationsFromAffiliate(t *testing.T) { diff --git a/internal/pkg/mount/system.go b/internal/pkg/mount/system.go index 5febb80ac..5b38ea15b 100644 --- a/internal/pkg/mount/system.go +++ b/internal/pkg/mount/system.go @@ -22,8 +22,8 @@ import ( "github.com/talos-systems/talos/internal/pkg/partition" "github.com/talos-systems/talos/pkg/machinery/config" "github.com/talos-systems/talos/pkg/machinery/constants" - runtimeres "github.com/talos-systems/talos/pkg/resources/runtime" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + runtimeres "github.com/talos-systems/talos/pkg/machinery/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) var ( diff --git a/internal/pkg/tui/installer/connection.go b/internal/pkg/tui/installer/connection.go index 206b15657..20816aaef 100644 --- a/internal/pkg/tui/installer/connection.go +++ b/internal/pkg/tui/installer/connection.go @@ -16,7 +16,7 @@ import ( "github.com/talos-systems/talos/pkg/machinery/api/storage" "github.com/talos-systems/talos/pkg/machinery/client" "github.com/talos-systems/talos/pkg/machinery/nethelpers" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // Connection unifies clients for bootstrap node and the node which is being configured. diff --git a/pkg/cluster/kubernetes/patch.go b/pkg/cluster/kubernetes/patch.go index 088770ced..4ff7ca391 100644 --- a/pkg/cluster/kubernetes/patch.go +++ b/pkg/cluster/kubernetes/patch.go @@ -14,7 +14,7 @@ import ( "github.com/talos-systems/talos/pkg/machinery/client" "github.com/talos-systems/talos/pkg/machinery/config/configloader" v1alpha1config "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // patchNodeConfig updates node configuration by means of patch function. diff --git a/pkg/cluster/kubernetes/talos_managed.go b/pkg/cluster/kubernetes/talos_managed.go index 20ff0eafc..89066edfe 100644 --- a/pkg/cluster/kubernetes/talos_managed.go +++ b/pkg/cluster/kubernetes/talos_managed.go @@ -39,8 +39,8 @@ import ( v1alpha1config "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1" machinetype "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" "github.com/talos-systems/talos/pkg/machinery/constants" - "github.com/talos-systems/talos/pkg/resources/config" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) // UpgradeProvider are the cluster interfaces required by upgrade process. diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index 34b816d3c..37d7f1e02 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -27,12 +27,14 @@ require ( google.golang.org/grpc v1.42.0 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 ) require ( github.com/BurntSushi/toml v0.4.1 // indirect github.com/containernetworking/cni v1.0.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gertd/go-pluralize v0.1.7 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/go-cmp v0.5.6 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect @@ -43,6 +45,8 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect + go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/net v0.0.0-20211020060615-d418f374d309 // indirect golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index 931064f79..cf6775116 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -39,6 +39,7 @@ 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= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -52,6 +53,7 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/gertd/go-pluralize v0.1.7 h1:RgvJTJ5W7olOoAks97BOwOlekBFsLEyh00W48Z6ZEZY= github.com/gertd/go-pluralize v0.1.7/go.mod h1:O4eNeeIf91MHh1GJ2I47DNtaesm66NYvjYgAahcqSDQ= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -184,6 +186,10 @@ go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= +go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 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= @@ -339,3 +345,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.2.1 h1:/EPr//+UMMXwMTkXvCCoaJDq8cpjMO80Ou+L4PDo2mY= honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= +inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw= +inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8= diff --git a/pkg/resources/cluster/affiliate.go b/pkg/machinery/resources/cluster/affiliate.go similarity index 100% rename from pkg/resources/cluster/affiliate.go rename to pkg/machinery/resources/cluster/affiliate.go diff --git a/pkg/resources/cluster/affiliate_test.go b/pkg/machinery/resources/cluster/affiliate_test.go similarity index 98% rename from pkg/resources/cluster/affiliate_test.go rename to pkg/machinery/resources/cluster/affiliate_test.go index 5d06edae9..09ac886ac 100644 --- a/pkg/resources/cluster/affiliate_test.go +++ b/pkg/machinery/resources/cluster/affiliate_test.go @@ -11,7 +11,7 @@ import ( "inet.af/netaddr" "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) func TestAffiliateSpec_Merge(t *testing.T) { diff --git a/pkg/resources/cluster/cluster.go b/pkg/machinery/resources/cluster/cluster.go similarity index 100% rename from pkg/resources/cluster/cluster.go rename to pkg/machinery/resources/cluster/cluster.go diff --git a/pkg/resources/cluster/cluster_test.go b/pkg/machinery/resources/cluster/cluster_test.go similarity index 93% rename from pkg/resources/cluster/cluster_test.go rename to pkg/machinery/resources/cluster/cluster_test.go index 84ac5709f..0cdaa4b55 100644 --- a/pkg/resources/cluster/cluster_test.go +++ b/pkg/machinery/resources/cluster/cluster_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/cluster" + "github.com/talos-systems/talos/pkg/machinery/resources/cluster" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/cluster/config.go b/pkg/machinery/resources/cluster/config.go similarity index 97% rename from pkg/resources/cluster/config.go rename to pkg/machinery/resources/cluster/config.go index 424435ddc..01f73ea17 100644 --- a/pkg/resources/cluster/config.go +++ b/pkg/machinery/resources/cluster/config.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/resource/meta" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // ConfigType is type of Config resource. diff --git a/pkg/resources/cluster/identity.go b/pkg/machinery/resources/cluster/identity.go similarity index 100% rename from pkg/resources/cluster/identity.go rename to pkg/machinery/resources/cluster/identity.go diff --git a/pkg/resources/cluster/member.go b/pkg/machinery/resources/cluster/member.go similarity index 100% rename from pkg/resources/cluster/member.go rename to pkg/machinery/resources/cluster/member.go diff --git a/pkg/resources/config/config.go b/pkg/machinery/resources/config/config.go similarity index 100% rename from pkg/resources/config/config.go rename to pkg/machinery/resources/config/config.go diff --git a/pkg/resources/config/config_test.go b/pkg/machinery/resources/config/config_test.go similarity index 93% rename from pkg/resources/config/config_test.go rename to pkg/machinery/resources/config/config_test.go index dadf2d0ad..591b7468a 100644 --- a/pkg/resources/config/config_test.go +++ b/pkg/machinery/resources/config/config_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/config/k8s_control_plane.go b/pkg/machinery/resources/config/k8s_control_plane.go similarity index 100% rename from pkg/resources/config/k8s_control_plane.go rename to pkg/machinery/resources/config/k8s_control_plane.go diff --git a/pkg/resources/config/machine_config.go b/pkg/machinery/resources/config/machine_config.go similarity index 100% rename from pkg/resources/config/machine_config.go rename to pkg/machinery/resources/config/machine_config.go diff --git a/pkg/resources/config/machine_type.go b/pkg/machinery/resources/config/machine_type.go similarity index 100% rename from pkg/resources/config/machine_type.go rename to pkg/machinery/resources/config/machine_type.go diff --git a/pkg/resources/files/etcfile_spec.go b/pkg/machinery/resources/files/etcfile_spec.go similarity index 100% rename from pkg/resources/files/etcfile_spec.go rename to pkg/machinery/resources/files/etcfile_spec.go diff --git a/pkg/resources/files/etcfile_status.go b/pkg/machinery/resources/files/etcfile_status.go similarity index 100% rename from pkg/resources/files/etcfile_status.go rename to pkg/machinery/resources/files/etcfile_status.go diff --git a/pkg/resources/files/files.go b/pkg/machinery/resources/files/files.go similarity index 100% rename from pkg/resources/files/files.go rename to pkg/machinery/resources/files/files.go diff --git a/pkg/resources/files/files_test.go b/pkg/machinery/resources/files/files_test.go similarity index 93% rename from pkg/resources/files/files_test.go rename to pkg/machinery/resources/files/files_test.go index ca2acb049..535f66686 100644 --- a/pkg/resources/files/files_test.go +++ b/pkg/machinery/resources/files/files_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/files" + "github.com/talos-systems/talos/pkg/machinery/resources/files" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/k8s/condition.go b/pkg/machinery/resources/k8s/condition.go similarity index 96% rename from pkg/resources/k8s/condition.go rename to pkg/machinery/resources/k8s/condition.go index 940f3c7a4..d3cecb676 100644 --- a/pkg/resources/k8s/condition.go +++ b/pkg/machinery/resources/k8s/condition.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) // NodenameReadyCondition implements condition which waits for the nodename to be ready. diff --git a/pkg/resources/k8s/condition_test.go b/pkg/machinery/resources/k8s/condition_test.go similarity index 93% rename from pkg/resources/k8s/condition_test.go rename to pkg/machinery/resources/k8s/condition_test.go index cb41139b4..083473588 100644 --- a/pkg/resources/k8s/condition_test.go +++ b/pkg/machinery/resources/k8s/condition_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/talos-systems/talos/pkg/resources/k8s" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestCondition(t *testing.T) { diff --git a/pkg/resources/k8s/endpoint.go b/pkg/machinery/resources/k8s/endpoint.go similarity index 100% rename from pkg/resources/k8s/endpoint.go rename to pkg/machinery/resources/k8s/endpoint.go diff --git a/pkg/resources/k8s/endpoint_test.go b/pkg/machinery/resources/k8s/endpoint_test.go similarity index 93% rename from pkg/resources/k8s/endpoint_test.go rename to pkg/machinery/resources/k8s/endpoint_test.go index 2cbdb93e2..885a3b0a3 100644 --- a/pkg/resources/k8s/endpoint_test.go +++ b/pkg/machinery/resources/k8s/endpoint_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) func TestEndpointList(t *testing.T) { diff --git a/pkg/resources/k8s/k8s.go b/pkg/machinery/resources/k8s/k8s.go similarity index 100% rename from pkg/resources/k8s/k8s.go rename to pkg/machinery/resources/k8s/k8s.go diff --git a/pkg/resources/k8s/k8s_test.go b/pkg/machinery/resources/k8s/k8s_test.go similarity index 94% rename from pkg/resources/k8s/k8s_test.go rename to pkg/machinery/resources/k8s/k8s_test.go index 96f6ff533..662e641ab 100644 --- a/pkg/resources/k8s/k8s_test.go +++ b/pkg/machinery/resources/k8s/k8s_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/k8s" + "github.com/talos-systems/talos/pkg/machinery/resources/k8s" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/k8s/manifest.go b/pkg/machinery/resources/k8s/manifest.go similarity index 100% rename from pkg/resources/k8s/manifest.go rename to pkg/machinery/resources/k8s/manifest.go diff --git a/pkg/resources/k8s/manifest_status.go b/pkg/machinery/resources/k8s/manifest_status.go similarity index 100% rename from pkg/resources/k8s/manifest_status.go rename to pkg/machinery/resources/k8s/manifest_status.go diff --git a/pkg/resources/k8s/nodename.go b/pkg/machinery/resources/k8s/nodename.go similarity index 100% rename from pkg/resources/k8s/nodename.go rename to pkg/machinery/resources/k8s/nodename.go diff --git a/pkg/resources/k8s/secrets_status.go b/pkg/machinery/resources/k8s/secrets_status.go similarity index 100% rename from pkg/resources/k8s/secrets_status.go rename to pkg/machinery/resources/k8s/secrets_status.go diff --git a/pkg/resources/k8s/static_pod.go b/pkg/machinery/resources/k8s/static_pod.go similarity index 100% rename from pkg/resources/k8s/static_pod.go rename to pkg/machinery/resources/k8s/static_pod.go diff --git a/pkg/resources/k8s/static_pod_status.go b/pkg/machinery/resources/k8s/static_pod_status.go similarity index 100% rename from pkg/resources/k8s/static_pod_status.go rename to pkg/machinery/resources/k8s/static_pod_status.go diff --git a/pkg/resources/kubespan/config.go b/pkg/machinery/resources/kubespan/config.go similarity index 97% rename from pkg/resources/kubespan/config.go rename to pkg/machinery/resources/kubespan/config.go index ddac63a68..840e8cd06 100644 --- a/pkg/resources/kubespan/config.go +++ b/pkg/machinery/resources/kubespan/config.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/resource/meta" - "github.com/talos-systems/talos/pkg/resources/config" + "github.com/talos-systems/talos/pkg/machinery/resources/config" ) // ConfigType is type of Config resource. diff --git a/pkg/resources/kubespan/endpoint.go b/pkg/machinery/resources/kubespan/endpoint.go similarity index 100% rename from pkg/resources/kubespan/endpoint.go rename to pkg/machinery/resources/kubespan/endpoint.go diff --git a/pkg/resources/kubespan/identity.go b/pkg/machinery/resources/kubespan/identity.go similarity index 100% rename from pkg/resources/kubespan/identity.go rename to pkg/machinery/resources/kubespan/identity.go diff --git a/pkg/resources/kubespan/kubespan.go b/pkg/machinery/resources/kubespan/kubespan.go similarity index 100% rename from pkg/resources/kubespan/kubespan.go rename to pkg/machinery/resources/kubespan/kubespan.go diff --git a/pkg/resources/kubespan/kubespan_test.go b/pkg/machinery/resources/kubespan/kubespan_test.go similarity index 93% rename from pkg/resources/kubespan/kubespan_test.go rename to pkg/machinery/resources/kubespan/kubespan_test.go index 3ea34939e..bc358e0d8 100644 --- a/pkg/resources/kubespan/kubespan_test.go +++ b/pkg/machinery/resources/kubespan/kubespan_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/kubespan" + "github.com/talos-systems/talos/pkg/machinery/resources/kubespan" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/kubespan/peer_spec.go b/pkg/machinery/resources/kubespan/peer_spec.go similarity index 100% rename from pkg/resources/kubespan/peer_spec.go rename to pkg/machinery/resources/kubespan/peer_spec.go diff --git a/pkg/resources/kubespan/peer_state.go b/pkg/machinery/resources/kubespan/peer_state.go similarity index 100% rename from pkg/resources/kubespan/peer_state.go rename to pkg/machinery/resources/kubespan/peer_state.go diff --git a/pkg/resources/kubespan/peer_status.go b/pkg/machinery/resources/kubespan/peer_status.go similarity index 100% rename from pkg/resources/kubespan/peer_status.go rename to pkg/machinery/resources/kubespan/peer_status.go diff --git a/pkg/resources/kubespan/peerstate_string.go b/pkg/machinery/resources/kubespan/peerstate_string.go similarity index 100% rename from pkg/resources/kubespan/peerstate_string.go rename to pkg/machinery/resources/kubespan/peerstate_string.go diff --git a/pkg/resources/network/address_spec.go b/pkg/machinery/resources/network/address_spec.go similarity index 100% rename from pkg/resources/network/address_spec.go rename to pkg/machinery/resources/network/address_spec.go diff --git a/pkg/resources/network/address_status.go b/pkg/machinery/resources/network/address_status.go similarity index 100% rename from pkg/resources/network/address_status.go rename to pkg/machinery/resources/network/address_status.go diff --git a/pkg/resources/network/condition.go b/pkg/machinery/resources/network/condition.go similarity index 100% rename from pkg/resources/network/condition.go rename to pkg/machinery/resources/network/condition.go diff --git a/pkg/resources/network/condition_test.go b/pkg/machinery/resources/network/condition_test.go similarity index 96% rename from pkg/resources/network/condition_test.go rename to pkg/machinery/resources/network/condition_test.go index 09e5e1086..9e4b7f499 100644 --- a/pkg/resources/network/condition_test.go +++ b/pkg/machinery/resources/network/condition_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestCondition(t *testing.T) { diff --git a/pkg/resources/network/configlayer.go b/pkg/machinery/resources/network/configlayer.go similarity index 100% rename from pkg/resources/network/configlayer.go rename to pkg/machinery/resources/network/configlayer.go diff --git a/pkg/resources/network/configlayer_string.go b/pkg/machinery/resources/network/configlayer_string.go similarity index 100% rename from pkg/resources/network/configlayer_string.go rename to pkg/machinery/resources/network/configlayer_string.go diff --git a/pkg/resources/network/hardrware_addr.go b/pkg/machinery/resources/network/hardrware_addr.go similarity index 100% rename from pkg/resources/network/hardrware_addr.go rename to pkg/machinery/resources/network/hardrware_addr.go diff --git a/pkg/resources/network/hostname_spec.go b/pkg/machinery/resources/network/hostname_spec.go similarity index 100% rename from pkg/resources/network/hostname_spec.go rename to pkg/machinery/resources/network/hostname_spec.go diff --git a/pkg/resources/network/hostname_status.go b/pkg/machinery/resources/network/hostname_status.go similarity index 100% rename from pkg/resources/network/hostname_status.go rename to pkg/machinery/resources/network/hostname_status.go diff --git a/pkg/resources/network/link.go b/pkg/machinery/resources/network/link.go similarity index 100% rename from pkg/resources/network/link.go rename to pkg/machinery/resources/network/link.go diff --git a/pkg/resources/network/link_refresh.go b/pkg/machinery/resources/network/link_refresh.go similarity index 100% rename from pkg/resources/network/link_refresh.go rename to pkg/machinery/resources/network/link_refresh.go diff --git a/pkg/resources/network/link_spec.go b/pkg/machinery/resources/network/link_spec.go similarity index 100% rename from pkg/resources/network/link_spec.go rename to pkg/machinery/resources/network/link_spec.go diff --git a/pkg/resources/network/link_status.go b/pkg/machinery/resources/network/link_status.go similarity index 100% rename from pkg/resources/network/link_status.go rename to pkg/machinery/resources/network/link_status.go diff --git a/pkg/resources/network/link_test.go b/pkg/machinery/resources/network/link_test.go similarity index 98% rename from pkg/resources/network/link_test.go rename to pkg/machinery/resources/network/link_test.go index 3de308c92..9b6144e9e 100644 --- a/pkg/resources/network/link_test.go +++ b/pkg/machinery/resources/network/link_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "inet.af/netaddr" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestWireguardPeer(t *testing.T) { diff --git a/pkg/resources/network/network.go b/pkg/machinery/resources/network/network.go similarity index 100% rename from pkg/resources/network/network.go rename to pkg/machinery/resources/network/network.go diff --git a/pkg/resources/network/network_test.go b/pkg/machinery/resources/network/network_test.go similarity index 95% rename from pkg/resources/network/network_test.go rename to pkg/machinery/resources/network/network_test.go index 8ffddd89f..9898f3390 100644 --- a/pkg/resources/network/network_test.go +++ b/pkg/machinery/resources/network/network_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/network/node_address.go b/pkg/machinery/resources/network/node_address.go similarity index 100% rename from pkg/resources/network/node_address.go rename to pkg/machinery/resources/network/node_address.go diff --git a/pkg/resources/network/node_address_filter.go b/pkg/machinery/resources/network/node_address_filter.go similarity index 100% rename from pkg/resources/network/node_address_filter.go rename to pkg/machinery/resources/network/node_address_filter.go diff --git a/pkg/resources/network/operator.go b/pkg/machinery/resources/network/operator.go similarity index 100% rename from pkg/resources/network/operator.go rename to pkg/machinery/resources/network/operator.go diff --git a/pkg/resources/network/operator_spec.go b/pkg/machinery/resources/network/operator_spec.go similarity index 100% rename from pkg/resources/network/operator_spec.go rename to pkg/machinery/resources/network/operator_spec.go diff --git a/pkg/resources/network/operator_string.go b/pkg/machinery/resources/network/operator_string.go similarity index 100% rename from pkg/resources/network/operator_string.go rename to pkg/machinery/resources/network/operator_string.go diff --git a/pkg/resources/network/resolver_spec.go b/pkg/machinery/resources/network/resolver_spec.go similarity index 100% rename from pkg/resources/network/resolver_spec.go rename to pkg/machinery/resources/network/resolver_spec.go diff --git a/pkg/resources/network/resolver_status.go b/pkg/machinery/resources/network/resolver_status.go similarity index 100% rename from pkg/resources/network/resolver_status.go rename to pkg/machinery/resources/network/resolver_status.go diff --git a/pkg/resources/network/route_spec.go b/pkg/machinery/resources/network/route_spec.go similarity index 100% rename from pkg/resources/network/route_spec.go rename to pkg/machinery/resources/network/route_spec.go diff --git a/pkg/resources/network/route_status.go b/pkg/machinery/resources/network/route_status.go similarity index 100% rename from pkg/resources/network/route_status.go rename to pkg/machinery/resources/network/route_status.go diff --git a/pkg/resources/network/status.go b/pkg/machinery/resources/network/status.go similarity index 100% rename from pkg/resources/network/status.go rename to pkg/machinery/resources/network/status.go diff --git a/pkg/resources/network/timeserver_spec.go b/pkg/machinery/resources/network/timeserver_spec.go similarity index 100% rename from pkg/resources/network/timeserver_spec.go rename to pkg/machinery/resources/network/timeserver_spec.go diff --git a/pkg/resources/network/timeserver_status.go b/pkg/machinery/resources/network/timeserver_status.go similarity index 100% rename from pkg/resources/network/timeserver_status.go rename to pkg/machinery/resources/network/timeserver_status.go diff --git a/pkg/resources/network/ula.go b/pkg/machinery/resources/network/ula.go similarity index 100% rename from pkg/resources/network/ula.go rename to pkg/machinery/resources/network/ula.go diff --git a/pkg/resources/network/ula_test.go b/pkg/machinery/resources/network/ula_test.go similarity index 87% rename from pkg/resources/network/ula_test.go rename to pkg/machinery/resources/network/ula_test.go index 594926068..28950235a 100644 --- a/pkg/resources/network/ula_test.go +++ b/pkg/machinery/resources/network/ula_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/network" + "github.com/talos-systems/talos/pkg/machinery/resources/network" ) func TestULAPrefix(t *testing.T) { diff --git a/pkg/resources/perf/cpu.go b/pkg/machinery/resources/perf/cpu.go similarity index 100% rename from pkg/resources/perf/cpu.go rename to pkg/machinery/resources/perf/cpu.go diff --git a/pkg/resources/perf/mem.go b/pkg/machinery/resources/perf/mem.go similarity index 100% rename from pkg/resources/perf/mem.go rename to pkg/machinery/resources/perf/mem.go diff --git a/pkg/resources/perf/perf.go b/pkg/machinery/resources/perf/perf.go similarity index 100% rename from pkg/resources/perf/perf.go rename to pkg/machinery/resources/perf/perf.go diff --git a/pkg/resources/perf/perf_test.go b/pkg/machinery/resources/perf/perf_test.go similarity index 93% rename from pkg/resources/perf/perf_test.go rename to pkg/machinery/resources/perf/perf_test.go index a3b210bbc..e3ba4dfe5 100644 --- a/pkg/resources/perf/perf_test.go +++ b/pkg/machinery/resources/perf/perf_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/perf" + "github.com/talos-systems/talos/pkg/machinery/resources/perf" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/resources.go b/pkg/machinery/resources/resources.go similarity index 100% rename from pkg/resources/resources.go rename to pkg/machinery/resources/resources.go diff --git a/pkg/resources/runtime/condition.go b/pkg/machinery/resources/runtime/condition.go similarity index 100% rename from pkg/resources/runtime/condition.go rename to pkg/machinery/resources/runtime/condition.go diff --git a/pkg/resources/runtime/condition_test.go b/pkg/machinery/resources/runtime/condition_test.go similarity index 97% rename from pkg/resources/runtime/condition_test.go rename to pkg/machinery/resources/runtime/condition_test.go index ec3624776..7f540ce65 100644 --- a/pkg/resources/runtime/condition_test.go +++ b/pkg/machinery/resources/runtime/condition_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/require" "github.com/talos-systems/talos/pkg/machinery/kernel" - "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) func TestCondition(t *testing.T) { diff --git a/pkg/resources/runtime/kernel_params_spec.go b/pkg/machinery/resources/runtime/kernel_params_spec.go similarity index 97% rename from pkg/resources/runtime/kernel_params_spec.go rename to pkg/machinery/resources/runtime/kernel_params_spec.go index 95be34107..d24f10999 100644 --- a/pkg/resources/runtime/kernel_params_spec.go +++ b/pkg/machinery/resources/runtime/kernel_params_spec.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/resource/meta" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // NamespaceName contains configuration resources. diff --git a/pkg/resources/runtime/kernel_params_status.go b/pkg/machinery/resources/runtime/kernel_params_status.go similarity index 100% rename from pkg/resources/runtime/kernel_params_status.go rename to pkg/machinery/resources/runtime/kernel_params_status.go diff --git a/pkg/resources/runtime/mount_status.go b/pkg/machinery/resources/runtime/mount_status.go similarity index 100% rename from pkg/resources/runtime/mount_status.go rename to pkg/machinery/resources/runtime/mount_status.go diff --git a/pkg/resources/runtime/runtime_test.go b/pkg/machinery/resources/runtime/runtime_test.go similarity index 93% rename from pkg/resources/runtime/runtime_test.go rename to pkg/machinery/resources/runtime/runtime_test.go index e7b2c0184..e13848e11 100644 --- a/pkg/resources/runtime/runtime_test.go +++ b/pkg/machinery/resources/runtime/runtime_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/runtime" + "github.com/talos-systems/talos/pkg/machinery/resources/runtime" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/secrets/api.go b/pkg/machinery/resources/secrets/api.go similarity index 100% rename from pkg/resources/secrets/api.go rename to pkg/machinery/resources/secrets/api.go diff --git a/pkg/resources/secrets/api_test.go b/pkg/machinery/resources/secrets/api_test.go similarity index 94% rename from pkg/resources/secrets/api_test.go rename to pkg/machinery/resources/secrets/api_test.go index 98bf8f72c..22a1dcc35 100644 --- a/pkg/resources/secrets/api_test.go +++ b/pkg/machinery/resources/secrets/api_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "github.com/talos-systems/crypto/x509" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) func TestAPIProtobufMarshal(t *testing.T) { diff --git a/pkg/resources/secrets/cert_sans.go b/pkg/machinery/resources/secrets/cert_sans.go similarity index 100% rename from pkg/resources/secrets/cert_sans.go rename to pkg/machinery/resources/secrets/cert_sans.go diff --git a/pkg/resources/secrets/condition.go b/pkg/machinery/resources/secrets/condition.go similarity index 100% rename from pkg/resources/secrets/condition.go rename to pkg/machinery/resources/secrets/condition.go diff --git a/pkg/resources/secrets/etcd.go b/pkg/machinery/resources/secrets/etcd.go similarity index 100% rename from pkg/resources/secrets/etcd.go rename to pkg/machinery/resources/secrets/etcd.go diff --git a/pkg/resources/secrets/etcd_root.go b/pkg/machinery/resources/secrets/etcd_root.go similarity index 100% rename from pkg/resources/secrets/etcd_root.go rename to pkg/machinery/resources/secrets/etcd_root.go diff --git a/pkg/resources/secrets/kubernetes.go b/pkg/machinery/resources/secrets/kubernetes.go similarity index 100% rename from pkg/resources/secrets/kubernetes.go rename to pkg/machinery/resources/secrets/kubernetes.go diff --git a/pkg/resources/secrets/kubernetes_root.go b/pkg/machinery/resources/secrets/kubernetes_root.go similarity index 100% rename from pkg/resources/secrets/kubernetes_root.go rename to pkg/machinery/resources/secrets/kubernetes_root.go diff --git a/pkg/resources/secrets/os_root.go b/pkg/machinery/resources/secrets/os_root.go similarity index 100% rename from pkg/resources/secrets/os_root.go rename to pkg/machinery/resources/secrets/os_root.go diff --git a/pkg/resources/secrets/secrets.go b/pkg/machinery/resources/secrets/secrets.go similarity index 100% rename from pkg/resources/secrets/secrets.go rename to pkg/machinery/resources/secrets/secrets.go diff --git a/pkg/resources/secrets/secrets_test.go b/pkg/machinery/resources/secrets/secrets_test.go similarity index 93% rename from pkg/resources/secrets/secrets_test.go rename to pkg/machinery/resources/secrets/secrets_test.go index 7a6729d4d..98024f3fb 100644 --- a/pkg/resources/secrets/secrets_test.go +++ b/pkg/machinery/resources/secrets/secrets_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/secrets" + "github.com/talos-systems/talos/pkg/machinery/resources/secrets" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/time/condition.go b/pkg/machinery/resources/time/condition.go similarity index 94% rename from pkg/resources/time/condition.go rename to pkg/machinery/resources/time/condition.go index 81c0037fb..b2c030684 100644 --- a/pkg/resources/time/condition.go +++ b/pkg/machinery/resources/time/condition.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // SyncCondition implements condition which waits for the time to be in sync. diff --git a/pkg/resources/time/status.go b/pkg/machinery/resources/time/status.go similarity index 97% rename from pkg/resources/time/status.go rename to pkg/machinery/resources/time/status.go index bd29f3be0..bb0669b5b 100644 --- a/pkg/resources/time/status.go +++ b/pkg/machinery/resources/time/status.go @@ -10,7 +10,7 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/resource/meta" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) // StatusType is type of TimeSync resource. diff --git a/pkg/resources/time/time.go b/pkg/machinery/resources/time/time.go similarity index 100% rename from pkg/resources/time/time.go rename to pkg/machinery/resources/time/time.go diff --git a/pkg/resources/time/time_test.go b/pkg/machinery/resources/time/time_test.go similarity index 93% rename from pkg/resources/time/time_test.go rename to pkg/machinery/resources/time/time_test.go index 032a52ee3..e522125c3 100644 --- a/pkg/resources/time/time_test.go +++ b/pkg/machinery/resources/time/time_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/time" + "github.com/talos-systems/talos/pkg/machinery/resources/time" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/v1alpha1/service.go b/pkg/machinery/resources/v1alpha1/service.go similarity index 100% rename from pkg/resources/v1alpha1/service.go rename to pkg/machinery/resources/v1alpha1/service.go diff --git a/pkg/resources/v1alpha1/v1alpha1.go b/pkg/machinery/resources/v1alpha1/v1alpha1.go similarity index 100% rename from pkg/resources/v1alpha1/v1alpha1.go rename to pkg/machinery/resources/v1alpha1/v1alpha1.go diff --git a/pkg/resources/v1alpha1/v1alpha1_test.go b/pkg/machinery/resources/v1alpha1/v1alpha1_test.go similarity index 93% rename from pkg/resources/v1alpha1/v1alpha1_test.go rename to pkg/machinery/resources/v1alpha1/v1alpha1_test.go index 6c78e6092..9de5d5760 100644 --- a/pkg/resources/v1alpha1/v1alpha1_test.go +++ b/pkg/machinery/resources/v1alpha1/v1alpha1_test.go @@ -15,7 +15,7 @@ import ( "github.com/cosi-project/runtime/pkg/state/registry" "github.com/stretchr/testify/assert" - "github.com/talos-systems/talos/pkg/resources/v1alpha1" + "github.com/talos-systems/talos/pkg/machinery/resources/v1alpha1" ) func TestRegisterResource(t *testing.T) { diff --git a/pkg/resources/.importvet.yaml b/pkg/resources/.importvet.yaml deleted file mode 100644 index 9916a7ef8..000000000 --- a/pkg/resources/.importvet.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# temporary rules to facilitate moving `pkg/resources` into `pkg/machinery`: -# - no imports of anything from Talos except for machinery and pkg/resources itself -# - external dependencies we don't have to see in the machinery -rules: - - regexp: ^github.com/talos-systems/talos - action: deny - - regexp: ^github.com/talos-systems/talos/pkg/resources - action: allow - - regexp: ^github.com/talos-systems/talos/pkg/machinery - action: allow - - regexp: ^k8s.io/ - action: deny - - regexp: ^github.com/jxskiss/base62 - action: deny - - regexp: ^github.com/mdlayher/netx - action: deny - - regexp: ^github.com/prometheus/procfs - action: deny - - regexp: ^golang.zx2c4.com/wireguard/wgctrl - action: deny