From c5924c7008ef237d2de45d1017bcc1c78863bb73 Mon Sep 17 00:00:00 2001
From: kaiyou <dev@kaiyou.fr>
Date: Fri, 17 Feb 2023 21:46:37 +0100
Subject: [PATCH] Move packages outsite pkg/
---
cmd/hepto/config.go | 2 +-
cmd/hepto/service.go | 2 +-
{pkg/services => services}/certs.go | 0
{pkg/services => services}/containerd.go | 2 +-
{pkg/services => services}/discovery.go | 0
{pkg/services => services}/etcd.go | 0
{pkg/services => services}/k8s.go | 2 +-
{pkg/services => services}/manager.go | 4 ++--
{pkg/services => services}/meta.go | 0
{pkg/services => services}/vpn.go | 2 +-
{pkg/utils => utils}/config.go | 0
{pkg/utils => utils}/net.go | 0
{pkg/wg => wg}/peer.go | 0
{pkg/wg => wg}/wireguard.go | 0
14 files changed, 7 insertions(+), 7 deletions(-)
rename {pkg/services => services}/certs.go (100%)
rename {pkg/services => services}/containerd.go (98%)
rename {pkg/services => services}/discovery.go (100%)
rename {pkg/services => services}/etcd.go (100%)
rename {pkg/services => services}/k8s.go (99%)
rename {pkg/services => services}/manager.go (98%)
rename {pkg/services => services}/meta.go (100%)
rename {pkg/services => services}/vpn.go (94%)
rename {pkg/utils => utils}/config.go (100%)
rename {pkg/utils => utils}/net.go (100%)
rename {pkg/wg => wg}/peer.go (100%)
rename {pkg/wg => wg}/wireguard.go (100%)
diff --git a/cmd/hepto/config.go b/cmd/hepto/config.go
index 6d54de8..7cbba09 100644
--- a/cmd/hepto/config.go
+++ b/cmd/hepto/config.go
@@ -7,7 +7,7 @@ import (
"github.com/go-logr/logr"
"github.com/go-logr/zapr"
- "go.acides.org/hepto/pkg/services"
+ "go.acides.org/hepto/services"
"go.acides.org/selfcontain"
)
diff --git a/cmd/hepto/service.go b/cmd/hepto/service.go
index 91dc18f..2dc4343 100644
--- a/cmd/hepto/service.go
+++ b/cmd/hepto/service.go
@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
- "go.acides.org/hepto/pkg/services"
+ "go.acides.org/hepto/services"
"go.acides.org/selfcontain"
"k8s.io/component-base/version/verflag"
"k8s.io/component-helpers/node/util/sysctl"
diff --git a/pkg/services/certs.go b/services/certs.go
similarity index 100%
rename from pkg/services/certs.go
rename to services/certs.go
diff --git a/pkg/services/containerd.go b/services/containerd.go
similarity index 98%
rename from pkg/services/containerd.go
rename to services/containerd.go
index e4e2aaa..7a0b751 100644
--- a/pkg/services/containerd.go
+++ b/services/containerd.go
@@ -32,7 +32,7 @@ import (
_ "github.com/containerd/containerd/services/tasks"
_ "github.com/containerd/containerd/services/version"
_ "github.com/containerd/containerd/snapshots/overlay/plugin"
- "go.acides.org/hepto/pkg/utils"
+ "go.acides.org/hepto/utils"
)
var ContainerdPath = "/containerd"
diff --git a/pkg/services/discovery.go b/services/discovery.go
similarity index 100%
rename from pkg/services/discovery.go
rename to services/discovery.go
diff --git a/pkg/services/etcd.go b/services/etcd.go
similarity index 100%
rename from pkg/services/etcd.go
rename to services/etcd.go
diff --git a/pkg/services/k8s.go b/services/k8s.go
similarity index 99%
rename from pkg/services/k8s.go
rename to services/k8s.go
index 6a4ddee..bef45aa 100644
--- a/pkg/services/k8s.go
+++ b/services/k8s.go
@@ -6,7 +6,7 @@ import (
"path"
"github.com/spf13/pflag"
- "go.acides.org/hepto/pkg/utils"
+ "go.acides.org/hepto/utils"
"k8s.io/apiserver/pkg/util/feature"
restclient "k8s.io/client-go/rest"
"k8s.io/component-base/cli/flag"
diff --git a/pkg/services/manager.go b/services/manager.go
similarity index 98%
rename from pkg/services/manager.go
rename to services/manager.go
index d84cc73..665ffd2 100644
--- a/pkg/services/manager.go
+++ b/services/manager.go
@@ -8,8 +8,8 @@ import (
"github.com/go-logr/logr"
"go.acides.org/daeman"
- "go.acides.org/hepto/pkg/utils"
- "go.acides.org/hepto/pkg/wg"
+ "go.acides.org/hepto/utils"
+ "go.acides.org/hepto/wg"
"go.uber.org/zap"
)
diff --git a/pkg/services/meta.go b/services/meta.go
similarity index 100%
rename from pkg/services/meta.go
rename to services/meta.go
diff --git a/pkg/services/vpn.go b/services/vpn.go
similarity index 94%
rename from pkg/services/vpn.go
rename to services/vpn.go
index 16b4df2..2830ffa 100644
--- a/pkg/services/vpn.go
+++ b/services/vpn.go
@@ -3,7 +3,7 @@ package services
import (
"context"
- "go.acides.org/hepto/pkg/wg"
+ "go.acides.org/hepto/wg"
)
var vpn = &Unit{
diff --git a/pkg/utils/config.go b/utils/config.go
similarity index 100%
rename from pkg/utils/config.go
rename to utils/config.go
diff --git a/pkg/utils/net.go b/utils/net.go
similarity index 100%
rename from pkg/utils/net.go
rename to utils/net.go
diff --git a/pkg/wg/peer.go b/wg/peer.go
similarity index 100%
rename from pkg/wg/peer.go
rename to wg/peer.go
diff --git a/pkg/wg/wireguard.go b/wg/wireguard.go
similarity index 100%
rename from pkg/wg/wireguard.go
rename to wg/wireguard.go
--
GitLab