diff --git a/pkg/dev/options.go b/pkg/dev/options.go index 0ff997e9..688d0a30 100644 --- a/pkg/dev/options.go +++ b/pkg/dev/options.go @@ -43,7 +43,7 @@ import ( "github.com/wencaiwulue/kubevpn/v2/pkg/daemon" "github.com/wencaiwulue/kubevpn/v2/pkg/daemon/rpc" "github.com/wencaiwulue/kubevpn/v2/pkg/handler" - "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" + "github.com/wencaiwulue/kubevpn/v2/pkg/inject" "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) @@ -136,7 +136,7 @@ func (option *Options) Main(ctx context.Context, c *containerConfig) error { return err } - mesh.RemoveContainers(templateSpec) + inject.RemoveContainers(templateSpec) list := convertKubeResourceToContainer(option.Namespace, *templateSpec, env, volume, dns) mergeDockerOptions(list, option, c) mode := container.NetworkMode(option.Copts.netMode.NetworkMode()) diff --git a/pkg/handler/clone.go b/pkg/handler/clone.go index d00637b1..53fd987a 100644 --- a/pkg/handler/clone.go +++ b/pkg/handler/clone.go @@ -36,7 +36,7 @@ import ( "k8s.io/utils/pointer" "github.com/wencaiwulue/kubevpn/v2/pkg/config" - "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" + "github.com/wencaiwulue/kubevpn/v2/pkg/inject" "github.com/wencaiwulue/kubevpn/v2/pkg/syncthing" "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) @@ -578,7 +578,7 @@ func (d *CloneOptions) setVolume(u *unstructured.Unstructured) error { // replace old one temp.Spec.Volumes = volumeList // remove containers vpn and envoy-proxy - mesh.RemoveContainers(temp) + inject.RemoveContainers(temp) // add each container service account token if tokenVolume != "" { for i := 0; i < len(temp.Spec.Containers); i++ { diff --git a/pkg/mesh/controller.go b/pkg/inject/controller.go similarity index 99% rename from pkg/mesh/controller.go rename to pkg/inject/controller.go index ff60f3fc..1f7a51e4 100644 --- a/pkg/mesh/controller.go +++ b/pkg/inject/controller.go @@ -1,4 +1,4 @@ -package mesh +package inject import ( _ "embed" diff --git a/pkg/inject/envoy.go b/pkg/inject/envoy.go index 5397ec13..8b6d6eaa 100644 --- a/pkg/inject/envoy.go +++ b/pkg/inject/envoy.go @@ -25,7 +25,6 @@ import ( "github.com/wencaiwulue/kubevpn/v2/pkg/config" "github.com/wencaiwulue/kubevpn/v2/pkg/controlplane" - "github.com/wencaiwulue/kubevpn/v2/pkg/mesh" "github.com/wencaiwulue/kubevpn/v2/pkg/util" ) @@ -112,7 +111,7 @@ func InjectVPNAndEnvoySidecar(ctx1 context.Context, factory cmdutil.Factory, cli return err } - mesh.AddMeshContainer(templateSpec, nodeID, c) + AddMeshContainer(templateSpec, nodeID, c) helper := pkgresource.NewHelper(object.Client, object.Mapping) ps := []P{ { @@ -170,7 +169,7 @@ func UnPatchContainer(factory cmdutil.Factory, mapInterface v12.ConfigMapInterfa log.Infof("leave workload %s", workload) - mesh.RemoveContainers(templateSpec) + RemoveContainers(templateSpec) if u.GetAnnotations() != nil && u.GetAnnotations()[config.KubeVPNRestorePatchKey] != "" { patchStr := u.GetAnnotations()[config.KubeVPNRestorePatchKey] var ps []P diff --git a/pkg/mesh/envoy.yaml b/pkg/inject/envoy.yaml similarity index 100% rename from pkg/mesh/envoy.yaml rename to pkg/inject/envoy.yaml