From eb0e4ead2780e1436b78bdacfffecb51523fb396 Mon Sep 17 00:00:00 2001 From: vultj <113467936+vultj@users.noreply.github.com> Date: Thu, 20 Jun 2024 10:08:38 -0500 Subject: [PATCH] spec -> pkg, test fixes --- cmd/slinkee/main.go | 6 +++--- cmd/slurmabler/main.go | 6 +++--- {spec => pkg}/api/types/v1/register.go | 0 {spec => pkg}/api/types/v1/slinkee.go | 0 {spec => pkg}/api/types/v1/zz_generated.deepcopy.go | 0 {spec => pkg}/clientset/v1/api.go | 2 +- {spec => pkg}/clientset/v1/slinkee.go | 3 ++- {spec => pkg}/connectors/errors.go | 0 {spec => pkg}/connectors/k8s.go | 5 +++-- {spec => pkg}/helpers/signals.go | 0 {spec => pkg}/labeler/labeler.go | 0 {spec => pkg}/munge/constants.go | 0 {spec => pkg}/munge/munge.go | 0 {spec => pkg}/probes/const.go | 0 {spec => pkg}/probes/probes.go | 0 {spec => pkg}/reconciler/constants.go | 0 {spec => pkg}/reconciler/errors.go | 0 {spec => pkg}/reconciler/reconciler.go | 6 +++--- {spec => pkg}/slurm/constants.go | 0 {spec => pkg}/slurm/create.go | 2 +- {spec => pkg}/slurm/create_mariadb.go | 2 +- {spec => pkg}/slurm/create_munged.go | 4 ++-- {spec => pkg}/slurm/create_namespace.go | 3 ++- {spec => pkg}/slurm/create_slurm_conf.go | 3 ++- {spec => pkg}/slurm/create_slurmabler.go | 2 +- {spec => pkg}/slurm/create_slurmctld.go | 2 +- {spec => pkg}/slurm/create_slurmd.go | 2 +- {spec => pkg}/slurm/create_slurmdbd.go | 2 +- {spec => pkg}/slurm/create_slurmdbd_conf.go | 3 ++- {spec => pkg}/slurm/create_slurmrestd.go | 2 +- {spec => pkg}/slurm/create_test.go | 4 ++-- {spec => pkg}/slurm/create_toolbox.go | 2 +- {spec => pkg}/slurm/delete.go | 0 {spec => pkg}/slurm/delete_test.go | 2 +- {spec => pkg}/slurm/errors.go | 0 {spec => pkg}/slurm/read.go | 0 {spec => pkg}/slurm/read_test.go | 2 +- {spec => pkg}/slurm/templates.go | 0 {spec => pkg}/slurm/update.go | 0 {spec => pkg}/util/rnd/constants.go | 0 {spec => pkg}/util/rnd/rnd.go | 0 {spec => pkg}/util/str/str.go | 0 42 files changed, 35 insertions(+), 30 deletions(-) rename {spec => pkg}/api/types/v1/register.go (100%) rename {spec => pkg}/api/types/v1/slinkee.go (100%) rename {spec => pkg}/api/types/v1/zz_generated.deepcopy.go (100%) rename {spec => pkg}/clientset/v1/api.go (94%) rename {spec => pkg}/clientset/v1/slinkee.go (98%) rename {spec => pkg}/connectors/errors.go (100%) rename {spec => pkg}/connectors/k8s.go (89%) rename {spec => pkg}/helpers/signals.go (100%) rename {spec => pkg}/labeler/labeler.go (100%) rename {spec => pkg}/munge/constants.go (100%) rename {spec => pkg}/munge/munge.go (100%) rename {spec => pkg}/probes/const.go (100%) rename {spec => pkg}/probes/probes.go (100%) rename {spec => pkg}/reconciler/constants.go (100%) rename {spec => pkg}/reconciler/errors.go (100%) rename {spec => pkg}/reconciler/reconciler.go (96%) rename {spec => pkg}/slurm/constants.go (100%) rename {spec => pkg}/slurm/create.go (97%) rename {spec => pkg}/slurm/create_mariadb.go (99%) rename {spec => pkg}/slurm/create_munged.go (95%) rename {spec => pkg}/slurm/create_namespace.go (93%) rename {spec => pkg}/slurm/create_slurm_conf.go (98%) rename {spec => pkg}/slurm/create_slurmabler.go (98%) rename {spec => pkg}/slurm/create_slurmctld.go (98%) rename {spec => pkg}/slurm/create_slurmd.go (99%) rename {spec => pkg}/slurm/create_slurmdbd.go (98%) rename {spec => pkg}/slurm/create_slurmdbd_conf.go (97%) rename {spec => pkg}/slurm/create_slurmrestd.go (98%) rename {spec => pkg}/slurm/create_test.go (93%) rename {spec => pkg}/slurm/create_toolbox.go (98%) rename {spec => pkg}/slurm/delete.go (100%) rename {spec => pkg}/slurm/delete_test.go (97%) rename {spec => pkg}/slurm/errors.go (100%) rename {spec => pkg}/slurm/read.go (100%) rename {spec => pkg}/slurm/read_test.go (99%) rename {spec => pkg}/slurm/templates.go (100%) rename {spec => pkg}/slurm/update.go (100%) rename {spec => pkg}/util/rnd/constants.go (100%) rename {spec => pkg}/util/rnd/rnd.go (100%) rename {spec => pkg}/util/str/str.go (100%) diff --git a/cmd/slinkee/main.go b/cmd/slinkee/main.go index 6daddc9..7e9223d 100644 --- a/cmd/slinkee/main.go +++ b/cmd/slinkee/main.go @@ -7,9 +7,9 @@ import ( "github.com/vultr/slinkee/cmd/slinkee/config" "github.com/vultr/slinkee/cmd/slinkee/metrics" - "github.com/vultr/slinkee/spec/helpers" - "github.com/vultr/slinkee/spec/probes" - "github.com/vultr/slinkee/spec/reconciler" + "github.com/vultr/slinkee/pkg/helpers" + "github.com/vultr/slinkee/pkg/probes" + "github.com/vultr/slinkee/pkg/reconciler" "go.uber.org/zap" "golang.org/x/sync/errgroup" diff --git a/cmd/slurmabler/main.go b/cmd/slurmabler/main.go index 9876a56..dbe23fb 100644 --- a/cmd/slurmabler/main.go +++ b/cmd/slurmabler/main.go @@ -7,9 +7,9 @@ import ( "time" "github.com/vultr/slinkee/cmd/slurmabler/config" - "github.com/vultr/slinkee/spec/connectors" - "github.com/vultr/slinkee/spec/labeler" - "github.com/vultr/slinkee/spec/slurm" + "github.com/vultr/slinkee/pkg/connectors" + "github.com/vultr/slinkee/pkg/labeler" + "github.com/vultr/slinkee/pkg/slurm" "go.uber.org/zap" ) diff --git a/spec/api/types/v1/register.go b/pkg/api/types/v1/register.go similarity index 100% rename from spec/api/types/v1/register.go rename to pkg/api/types/v1/register.go diff --git a/spec/api/types/v1/slinkee.go b/pkg/api/types/v1/slinkee.go similarity index 100% rename from spec/api/types/v1/slinkee.go rename to pkg/api/types/v1/slinkee.go diff --git a/spec/api/types/v1/zz_generated.deepcopy.go b/pkg/api/types/v1/zz_generated.deepcopy.go similarity index 100% rename from spec/api/types/v1/zz_generated.deepcopy.go rename to pkg/api/types/v1/zz_generated.deepcopy.go diff --git a/spec/clientset/v1/api.go b/pkg/clientset/v1/api.go similarity index 94% rename from spec/clientset/v1/api.go rename to pkg/clientset/v1/api.go index 77d770f..125f0a8 100644 --- a/spec/clientset/v1/api.go +++ b/pkg/clientset/v1/api.go @@ -3,7 +3,7 @@ package v1 import ( "context" - v1 "github.com/vultr/slinkee/spec/api/types/v1" + v1 "github.com/vultr/slinkee/pkg/api/types/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/scheme" diff --git a/spec/clientset/v1/slinkee.go b/pkg/clientset/v1/slinkee.go similarity index 98% rename from spec/clientset/v1/slinkee.go rename to pkg/clientset/v1/slinkee.go index 85313a3..7851f6a 100644 --- a/spec/clientset/v1/slinkee.go +++ b/pkg/clientset/v1/slinkee.go @@ -3,7 +3,8 @@ package v1 import ( "context" - v1 "github.com/vultr/slinkee/spec/api/types/v1" + v1 "github.com/vultr/slinkee/pkg/api/types/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" diff --git a/spec/connectors/errors.go b/pkg/connectors/errors.go similarity index 100% rename from spec/connectors/errors.go rename to pkg/connectors/errors.go diff --git a/spec/connectors/k8s.go b/pkg/connectors/k8s.go similarity index 89% rename from spec/connectors/k8s.go rename to pkg/connectors/k8s.go index 493edbe..058b62f 100644 --- a/spec/connectors/k8s.go +++ b/pkg/connectors/k8s.go @@ -4,8 +4,9 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - api "github.com/vultr/slinkee/spec/api/types/v1" - client "github.com/vultr/slinkee/spec/clientset/v1" + api "github.com/vultr/slinkee/pkg/api/types/v1" + client "github.com/vultr/slinkee/pkg/clientset/v1" + "k8s.io/client-go/kubernetes/scheme" ) diff --git a/spec/helpers/signals.go b/pkg/helpers/signals.go similarity index 100% rename from spec/helpers/signals.go rename to pkg/helpers/signals.go diff --git a/spec/labeler/labeler.go b/pkg/labeler/labeler.go similarity index 100% rename from spec/labeler/labeler.go rename to pkg/labeler/labeler.go diff --git a/spec/munge/constants.go b/pkg/munge/constants.go similarity index 100% rename from spec/munge/constants.go rename to pkg/munge/constants.go diff --git a/spec/munge/munge.go b/pkg/munge/munge.go similarity index 100% rename from spec/munge/munge.go rename to pkg/munge/munge.go diff --git a/spec/probes/const.go b/pkg/probes/const.go similarity index 100% rename from spec/probes/const.go rename to pkg/probes/const.go diff --git a/spec/probes/probes.go b/pkg/probes/probes.go similarity index 100% rename from spec/probes/probes.go rename to pkg/probes/probes.go diff --git a/spec/reconciler/constants.go b/pkg/reconciler/constants.go similarity index 100% rename from spec/reconciler/constants.go rename to pkg/reconciler/constants.go diff --git a/spec/reconciler/errors.go b/pkg/reconciler/errors.go similarity index 100% rename from spec/reconciler/errors.go rename to pkg/reconciler/errors.go diff --git a/spec/reconciler/reconciler.go b/pkg/reconciler/reconciler.go similarity index 96% rename from spec/reconciler/reconciler.go rename to pkg/reconciler/reconciler.go index 1385fea..22c952f 100644 --- a/spec/reconciler/reconciler.go +++ b/pkg/reconciler/reconciler.go @@ -4,9 +4,9 @@ import ( "context" "time" - v1s "github.com/vultr/slinkee/spec/api/types/v1" - "github.com/vultr/slinkee/spec/connectors" - "github.com/vultr/slinkee/spec/slurm" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" + "github.com/vultr/slinkee/pkg/connectors" + "github.com/vultr/slinkee/pkg/slurm" "go.uber.org/zap" "k8s.io/apimachinery/pkg/api/errors" diff --git a/spec/slurm/constants.go b/pkg/slurm/constants.go similarity index 100% rename from spec/slurm/constants.go rename to pkg/slurm/constants.go diff --git a/spec/slurm/create.go b/pkg/slurm/create.go similarity index 97% rename from spec/slurm/create.go rename to pkg/slurm/create.go index 197ea04..0fb57d7 100644 --- a/spec/slurm/create.go +++ b/pkg/slurm/create.go @@ -1,7 +1,7 @@ package slurm import ( - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" diff --git a/spec/slurm/create_mariadb.go b/pkg/slurm/create_mariadb.go similarity index 99% rename from spec/slurm/create_mariadb.go rename to pkg/slurm/create_mariadb.go index 32354c4..854b57f 100644 --- a/spec/slurm/create_mariadb.go +++ b/pkg/slurm/create_mariadb.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_munged.go b/pkg/slurm/create_munged.go similarity index 95% rename from spec/slurm/create_munged.go rename to pkg/slurm/create_munged.go index b50d5d8..cfa5b03 100644 --- a/spec/slurm/create_munged.go +++ b/pkg/slurm/create_munged.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" - "github.com/vultr/slinkee/spec/munge" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" + "github.com/vultr/slinkee/pkg/munge" "go.uber.org/zap" v1 "k8s.io/api/core/v1" diff --git a/spec/slurm/create_namespace.go b/pkg/slurm/create_namespace.go similarity index 93% rename from spec/slurm/create_namespace.go rename to pkg/slurm/create_namespace.go index 746f59e..543ab0c 100644 --- a/spec/slurm/create_namespace.go +++ b/pkg/slurm/create_namespace.go @@ -3,7 +3,8 @@ package slurm import ( "context" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" + "go.uber.org/zap" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/spec/slurm/create_slurm_conf.go b/pkg/slurm/create_slurm_conf.go similarity index 98% rename from spec/slurm/create_slurm_conf.go rename to pkg/slurm/create_slurm_conf.go index 801c33b..4c889ae 100644 --- a/spec/slurm/create_slurm_conf.go +++ b/pkg/slurm/create_slurm_conf.go @@ -8,7 +8,8 @@ import ( "strconv" "strings" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" + "go.uber.org/zap" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/spec/slurm/create_slurmabler.go b/pkg/slurm/create_slurmabler.go similarity index 98% rename from spec/slurm/create_slurmabler.go rename to pkg/slurm/create_slurmabler.go index 49662f2..c4d5961 100644 --- a/spec/slurm/create_slurmabler.go +++ b/pkg/slurm/create_slurmabler.go @@ -6,7 +6,7 @@ import ( "time" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_slurmctld.go b/pkg/slurm/create_slurmctld.go similarity index 98% rename from spec/slurm/create_slurmctld.go rename to pkg/slurm/create_slurmctld.go index 5edb0d0..a8ca86d 100644 --- a/spec/slurm/create_slurmctld.go +++ b/pkg/slurm/create_slurmctld.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_slurmd.go b/pkg/slurm/create_slurmd.go similarity index 99% rename from spec/slurm/create_slurmd.go rename to pkg/slurm/create_slurmd.go index 6614491..6eced96 100644 --- a/spec/slurm/create_slurmd.go +++ b/pkg/slurm/create_slurmd.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_slurmdbd.go b/pkg/slurm/create_slurmdbd.go similarity index 98% rename from spec/slurm/create_slurmdbd.go rename to pkg/slurm/create_slurmdbd.go index b033a57..cbf6c1d 100644 --- a/spec/slurm/create_slurmdbd.go +++ b/pkg/slurm/create_slurmdbd.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_slurmdbd_conf.go b/pkg/slurm/create_slurmdbd_conf.go similarity index 97% rename from spec/slurm/create_slurmdbd_conf.go rename to pkg/slurm/create_slurmdbd_conf.go index b9336a0..4088d6e 100644 --- a/spec/slurm/create_slurmdbd_conf.go +++ b/pkg/slurm/create_slurmdbd_conf.go @@ -7,7 +7,8 @@ import ( "html/template" "strings" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" + "go.uber.org/zap" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/spec/slurm/create_slurmrestd.go b/pkg/slurm/create_slurmrestd.go similarity index 98% rename from spec/slurm/create_slurmrestd.go rename to pkg/slurm/create_slurmrestd.go index 31da7c5..747d222 100644 --- a/spec/slurm/create_slurmrestd.go +++ b/pkg/slurm/create_slurmrestd.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/create_test.go b/pkg/slurm/create_test.go similarity index 93% rename from spec/slurm/create_test.go rename to pkg/slurm/create_test.go index 1c56870..68c0bac 100644 --- a/spec/slurm/create_test.go +++ b/pkg/slurm/create_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "k8s.io/client-go/kubernetes/fake" ) @@ -18,7 +18,7 @@ type Fixture5 struct { description string } -func TestCreateWorkload(t *testing.T) { +func TestCreateSlurm(t *testing.T) { os.Args = append(os.Args, "-config=../../cmd/slinkee/config.yaml") client := fake.NewSimpleClientset() diff --git a/spec/slurm/create_toolbox.go b/pkg/slurm/create_toolbox.go similarity index 98% rename from spec/slurm/create_toolbox.go rename to pkg/slurm/create_toolbox.go index 5d1537f..3129a3a 100644 --- a/spec/slurm/create_toolbox.go +++ b/pkg/slurm/create_toolbox.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/vultr/slinkee/cmd/slinkee/config" - v1s "github.com/vultr/slinkee/spec/api/types/v1" + v1s "github.com/vultr/slinkee/pkg/api/types/v1" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/spec/slurm/delete.go b/pkg/slurm/delete.go similarity index 100% rename from spec/slurm/delete.go rename to pkg/slurm/delete.go diff --git a/spec/slurm/delete_test.go b/pkg/slurm/delete_test.go similarity index 97% rename from spec/slurm/delete_test.go rename to pkg/slurm/delete_test.go index e8f3724..b001ec2 100644 --- a/spec/slurm/delete_test.go +++ b/pkg/slurm/delete_test.go @@ -17,7 +17,7 @@ type Fixture6 struct { description string } -func TestWorkloadDelete(t *testing.T) { +func TestSlurmDelete(t *testing.T) { client := fake.NewSimpleClientset( &batchv1.JobList{ Items: jobsFixture, diff --git a/spec/slurm/errors.go b/pkg/slurm/errors.go similarity index 100% rename from spec/slurm/errors.go rename to pkg/slurm/errors.go diff --git a/spec/slurm/read.go b/pkg/slurm/read.go similarity index 100% rename from spec/slurm/read.go rename to pkg/slurm/read.go diff --git a/spec/slurm/read_test.go b/pkg/slurm/read_test.go similarity index 99% rename from spec/slurm/read_test.go rename to pkg/slurm/read_test.go index 0bda455..e97d7c6 100644 --- a/spec/slurm/read_test.go +++ b/pkg/slurm/read_test.go @@ -105,7 +105,7 @@ type Fixture1 struct { description string } -func TestWorkloadExists(t *testing.T) { +func TestSlurmExists(t *testing.T) { client := fake.NewSimpleClientset( &batchv1.JobList{ Items: jobsFixture, diff --git a/spec/slurm/templates.go b/pkg/slurm/templates.go similarity index 100% rename from spec/slurm/templates.go rename to pkg/slurm/templates.go diff --git a/spec/slurm/update.go b/pkg/slurm/update.go similarity index 100% rename from spec/slurm/update.go rename to pkg/slurm/update.go diff --git a/spec/util/rnd/constants.go b/pkg/util/rnd/constants.go similarity index 100% rename from spec/util/rnd/constants.go rename to pkg/util/rnd/constants.go diff --git a/spec/util/rnd/rnd.go b/pkg/util/rnd/rnd.go similarity index 100% rename from spec/util/rnd/rnd.go rename to pkg/util/rnd/rnd.go diff --git a/spec/util/str/str.go b/pkg/util/str/str.go similarity index 100% rename from spec/util/str/str.go rename to pkg/util/str/str.go