treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/test/e2e/BUILD.bazel b/metropolis/test/e2e/BUILD.bazel
index cb8645b..565223e 100644
--- a/metropolis/test/e2e/BUILD.bazel
+++ b/metropolis/test/e2e/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//metropolis/pkg/localregistry:def.bzl", "localregistry_manifest")
+load("//metropolis/test/localregistry:def.bzl", "localregistry_manifest")
localregistry_manifest(
name = "testimages_manifest",
diff --git a/metropolis/test/e2e/k8s_cts/BUILD.bazel b/metropolis/test/e2e/k8s_cts/BUILD.bazel
index 8458b2d..6593a73 100644
--- a/metropolis/test/e2e/k8s_cts/BUILD.bazel
+++ b/metropolis/test/e2e/k8s_cts/BUILD.bazel
@@ -6,7 +6,7 @@
importpath = "source.monogon.dev/metropolis/test/e2e/k8s_cts",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/launch",
"@io_k8s_api//core/v1:core",
"@io_k8s_api//rbac/v1:rbac",
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
diff --git a/metropolis/test/e2e/k8s_cts/main.go b/metropolis/test/e2e/k8s_cts/main.go
index 6383cb8..6250a16 100644
--- a/metropolis/test/e2e/k8s_cts/main.go
+++ b/metropolis/test/e2e/k8s_cts/main.go
@@ -34,7 +34,7 @@
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
)
// makeCTSPodSpec generates a spec for a standalone pod running the Kubernetes
@@ -100,7 +100,7 @@
}()
// TODO(q3k): bump up number of nodes after multi-node workflow gets reimplemented.
- cl, err := cluster.LaunchCluster(ctx, cluster.ClusterOptions{NumNodes: 1})
+ cl, err := mlaunch.LaunchCluster(ctx, mlaunch.ClusterOptions{NumNodes: 1})
if err != nil {
log.Fatalf("Failed to launch cluster: %v", err)
}
diff --git a/metropolis/test/e2e/suites/core/BUILD.bazel b/metropolis/test/e2e/suites/core/BUILD.bazel
index 45ce438..223d7c7 100644
--- a/metropolis/test/e2e/suites/core/BUILD.bazel
+++ b/metropolis/test/e2e/suites/core/BUILD.bazel
@@ -17,12 +17,12 @@
deps = [
"//metropolis/node",
"//metropolis/node/core/rpc",
- "//metropolis/pkg/localregistry",
"//metropolis/proto/api",
"//metropolis/proto/common",
"//metropolis/test/launch",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/localregistry",
"//metropolis/test/util",
+ "//osbase/test/launch",
"@io_bazel_rules_go//go/runfiles:go_default_library",
"@org_golang_google_grpc//:go_default_library",
],
diff --git a/metropolis/test/e2e/suites/core/run_test.go b/metropolis/test/e2e/suites/core/run_test.go
index 8bbbf52..21640a6 100644
--- a/metropolis/test/e2e/suites/core/run_test.go
+++ b/metropolis/test/e2e/suites/core/run_test.go
@@ -19,10 +19,10 @@
common "source.monogon.dev/metropolis/node"
"source.monogon.dev/metropolis/node/core/rpc"
- "source.monogon.dev/metropolis/pkg/localregistry"
- "source.monogon.dev/metropolis/test/launch"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
+ "source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/test/launch"
apb "source.monogon.dev/metropolis/proto/api"
cpb "source.monogon.dev/metropolis/proto/common"
@@ -62,7 +62,7 @@
t.Fatalf("Creating test image registry failed: %v", err)
}
// Launch cluster.
- clusterOptions := cluster.ClusterOptions{
+ clusterOptions := mlaunch.ClusterOptions{
NumNodes: 2,
LocalRegistry: lr,
InitialClusterConfiguration: &cpb.ClusterConfiguration{
@@ -70,7 +70,7 @@
StorageSecurityPolicy: cpb.ClusterConfiguration_STORAGE_SECURITY_POLICY_NEEDS_INSECURE,
},
}
- cluster, err := cluster.LaunchCluster(ctx, clusterOptions)
+ cluster, err := mlaunch.LaunchCluster(ctx, clusterOptions)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}
diff --git a/metropolis/test/e2e/suites/ha/BUILD.bazel b/metropolis/test/e2e/suites/ha/BUILD.bazel
index 0a89977..5a2a4dd 100644
--- a/metropolis/test/e2e/suites/ha/BUILD.bazel
+++ b/metropolis/test/e2e/suites/ha/BUILD.bazel
@@ -15,10 +15,10 @@
"resources:ram:7000",
],
deps = [
- "//metropolis/pkg/localregistry",
"//metropolis/test/launch",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/localregistry",
"//metropolis/test/util",
+ "//osbase/test/launch",
"@io_bazel_rules_go//go/runfiles:go_default_library",
],
)
diff --git a/metropolis/test/e2e/suites/ha/run_test.go b/metropolis/test/e2e/suites/ha/run_test.go
index 63a2acd..cc02df4 100644
--- a/metropolis/test/e2e/suites/ha/run_test.go
+++ b/metropolis/test/e2e/suites/ha/run_test.go
@@ -9,10 +9,10 @@
"github.com/bazelbuild/rules_go/go/runfiles"
- "source.monogon.dev/metropolis/pkg/localregistry"
- "source.monogon.dev/metropolis/test/launch"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
+ "source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/test/launch"
)
const (
@@ -48,12 +48,12 @@
t.Fatalf("Creating test image registry failed: %v", err)
}
// Launch cluster.
- clusterOptions := cluster.ClusterOptions{
+ clusterOptions := mlaunch.ClusterOptions{
NumNodes: 3,
LocalRegistry: lr,
NodeLogsToFiles: true,
}
- cluster, err := cluster.LaunchCluster(ctx, clusterOptions)
+ cluster, err := mlaunch.LaunchCluster(ctx, clusterOptions)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}
diff --git a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
index d358f86..c2cfa0d 100644
--- a/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
+++ b/metropolis/test/e2e/suites/ha_cold/BUILD.bazel
@@ -17,7 +17,7 @@
deps = [
"//metropolis/proto/common",
"//metropolis/test/launch",
- "//metropolis/test/launch/cluster",
"//metropolis/test/util",
+ "//osbase/test/launch",
],
)
diff --git a/metropolis/test/e2e/suites/ha_cold/run_test.go b/metropolis/test/e2e/suites/ha_cold/run_test.go
index 6670b8f..419d290 100644
--- a/metropolis/test/e2e/suites/ha_cold/run_test.go
+++ b/metropolis/test/e2e/suites/ha_cold/run_test.go
@@ -6,9 +6,9 @@
"testing"
"time"
- "source.monogon.dev/metropolis/test/launch"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
"source.monogon.dev/metropolis/test/util"
+ "source.monogon.dev/osbase/test/launch"
cpb "source.monogon.dev/metropolis/proto/common"
)
@@ -36,7 +36,7 @@
defer cancel()
// Launch cluster.
- clusterOptions := cluster.ClusterOptions{
+ clusterOptions := mlaunch.ClusterOptions{
NumNodes: 3,
NodeLogsToFiles: true,
InitialClusterConfiguration: &cpb.ClusterConfiguration{
@@ -44,7 +44,7 @@
StorageSecurityPolicy: cpb.ClusterConfiguration_STORAGE_SECURITY_POLICY_NEEDS_INSECURE,
},
}
- cluster, err := cluster.LaunchCluster(ctx, clusterOptions)
+ cluster, err := mlaunch.LaunchCluster(ctx, clusterOptions)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}
diff --git a/metropolis/test/e2e/suites/kubernetes/BUILD.bazel b/metropolis/test/e2e/suites/kubernetes/BUILD.bazel
index 191ba35..6234e94 100644
--- a/metropolis/test/e2e/suites/kubernetes/BUILD.bazel
+++ b/metropolis/test/e2e/suites/kubernetes/BUILD.bazel
@@ -33,8 +33,8 @@
],
deps = [
"//metropolis/node",
- "//metropolis/pkg/localregistry",
- "//metropolis/test/launch/cluster",
+ "//metropolis/test/launch",
+ "//metropolis/test/localregistry",
"//metropolis/test/util",
"@io_bazel_rules_go//go/runfiles:go_default_library",
"@io_k8s_api//core/v1:core",
diff --git a/metropolis/test/e2e/suites/kubernetes/run_test.go b/metropolis/test/e2e/suites/kubernetes/run_test.go
index ec38aa3..f15fafd 100644
--- a/metropolis/test/e2e/suites/kubernetes/run_test.go
+++ b/metropolis/test/e2e/suites/kubernetes/run_test.go
@@ -23,8 +23,8 @@
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
podv1 "k8s.io/kubernetes/pkg/api/v1/pod"
- "source.monogon.dev/metropolis/pkg/localregistry"
- "source.monogon.dev/metropolis/test/launch/cluster"
+ mlaunch "source.monogon.dev/metropolis/test/launch"
+ "source.monogon.dev/metropolis/test/localregistry"
"source.monogon.dev/metropolis/test/util"
common "source.monogon.dev/metropolis/node"
@@ -64,11 +64,11 @@
}
// Launch cluster.
- clusterOptions := cluster.ClusterOptions{
+ clusterOptions := mlaunch.ClusterOptions{
NumNodes: 2,
LocalRegistry: lr,
}
- cluster, err := cluster.LaunchCluster(ctx, clusterOptions)
+ cluster, err := mlaunch.LaunchCluster(ctx, clusterOptions)
if err != nil {
t.Fatalf("LaunchCluster failed: %v", err)
}