From d32ce24d31e40cc29a1e89755800b367e4dd22f2 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 1 Aug 2023 10:58:18 -0700 Subject: [PATCH] remove some unused code and additional updates Signed-off-by: Brian Downs --- Dockerfile.dapper | 4 +- Makefile | 2 +- cli/cmds/cluster/cluster.go | 4 +- cli/cmds/cluster/create.go | 18 ++- cli/main.go | 9 +- main.go | 4 +- {scripts => ops}/boilerplate.go.txt | 0 {scripts => ops}/build | 4 +- {scripts => ops}/ci | 0 {scripts => ops}/default | 0 {scripts => ops}/entry | 4 +- {scripts => ops}/package | 0 {scripts => ops}/package-chart | 0 {scripts => ops}/release | 0 {scripts => ops}/release-chart | 0 {scripts => ops}/test | 0 {scripts => ops}/validate | 0 {scripts => ops}/validate-ci | 2 +- {scripts => ops}/version | 0 pkg/controller/addressallocator/controller.go | 50 ------- pkg/controller/cluster/cidr_allocation.go | 129 ------------------ pkg/controller/cluster/config/agent.go | 6 +- pkg/controller/cluster/config/server.go | 6 +- pkg/controller/cluster/controller.go | 67 +-------- pkg/controller/cluster/server/ingress.go | 4 +- pkg/controller/cluster/server/service.go | 1 + pkg/controller/util/util.go | 3 +- pkg/version/version.go | 10 -- 28 files changed, 47 insertions(+), 280 deletions(-) rename {scripts => ops}/boilerplate.go.txt (100%) rename {scripts => ops}/build (97%) rename {scripts => ops}/ci (100%) rename {scripts => ops}/default (100%) rename {scripts => ops}/entry (66%) rename {scripts => ops}/package (100%) rename {scripts => ops}/package-chart (100%) rename {scripts => ops}/release (100%) rename {scripts => ops}/release-chart (100%) rename {scripts => ops}/test (100%) rename {scripts => ops}/validate (100%) rename {scripts => ops}/validate-ci (85%) rename {scripts => ops}/version (100%) delete mode 100644 pkg/controller/addressallocator/controller.go delete mode 100644 pkg/controller/cluster/cidr_allocation.go delete mode 100644 pkg/version/version.go diff --git a/Dockerfile.dapper b/Dockerfile.dapper index c228b98..1d66c2e 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=rancher/hardened-build-base:v1.20.6b11 +ARG GOLANG=rancher/hardened-build-base:v1.20.6b2 FROM ${GOLANG} ARG DAPPER_HOST_ARCH @@ -20,5 +20,5 @@ ENV DAPPER_DOCKER_SOCKET true ENV HOME ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE} -ENTRYPOINT ["./scripts/entry"] +ENTRYPOINT ["./ops/entry"] CMD ["ci"] diff --git a/Makefile b/Makefile index 5d7b47e..6131865 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGETS := $(shell ls scripts) +TARGETS := $(shell ls ops) .dapper: @echo Downloading dapper diff --git a/cli/cmds/cluster/cluster.go b/cli/cmds/cluster/cluster.go index 38b109b..d2a00b2 100644 --- a/cli/cmds/cluster/cluster.go +++ b/cli/cmds/cluster/cluster.go @@ -17,11 +17,9 @@ var clusterSubcommands = []cli.Command{ } func NewClusterCommand() cli.Command { - cmd := cli.Command{ + return cli.Command{ Name: "cluster", Usage: "cluster command", Subcommands: clusterSubcommands, } - - return cmd } diff --git a/cli/cmds/cluster/create.go b/cli/cmds/cluster/create.go index fae3e79..a1f5eca 100644 --- a/cli/cmds/cluster/create.go +++ b/cli/cmds/cluster/create.go @@ -148,9 +148,7 @@ func createCluster(clx *cli.Context) error { return err } host := strings.Split(url.Host, ":") - cluster.Spec.TLSSANs = []string{ - host[0], - } + cluster.Spec.TLSSANs = []string{host[0]} if err := ctrlClient.Create(ctx, cluster); err != nil { if apierrors.IsAlreadyExists(err) { @@ -162,15 +160,13 @@ func createCluster(clx *cli.Context) error { logrus.Infof("Extracting Kubeconfig for [%s] cluster", name) var kubeconfig []byte - err = retry.OnError(backoff, apierrors.IsNotFound, func() error { + if err := retry.OnError(backoff, apierrors.IsNotFound, func() error { kubeconfig, err = extractKubeconfig(ctx, ctrlClient, cluster, host[0]) if err != nil { return err } return nil - }) - - if err != nil { + }); err != nil { return err } @@ -178,11 +174,13 @@ func createCluster(clx *cli.Context) error { if err != nil { return err } + logrus.Infof(`You can start using the cluster with: export KUBECONFIG=%s kubectl cluster-info `, filepath.Join(pwd, cluster.Name+"-kubeconfig.yaml")) + return os.WriteFile(cluster.Name+"-kubeconfig.yaml", kubeconfig, 0644) } @@ -199,6 +197,7 @@ func validateCreateFlags(clx *cli.Context) error { if cmds.Kubeconfig == "" && os.Getenv("KUBECONFIG") == "" { return errors.New("empty kubeconfig") } + return nil } @@ -230,6 +229,7 @@ func extractKubeconfig(ctx context.Context, client client.Client, cluster *v1alp Name: cluster.Name + "-kubeconfig", Namespace: util.ClusterNamespace(cluster), } + var kubeSecret v1.Secret if err := client.Get(ctx, nn, &kubeSecret); err != nil { return nil, err @@ -244,10 +244,12 @@ func extractKubeconfig(ctx context.Context, client client.Client, cluster *v1alp Name: "k3k-server-service", Namespace: util.ClusterNamespace(cluster), } + var k3kService v1.Service if err := client.Get(ctx, nn, &k3kService); err != nil { return nil, err } + if k3kService.Spec.Type == v1.ServiceTypeNodePort { nodePort := k3kService.Spec.Ports[0].NodePort @@ -266,6 +268,7 @@ func extractKubeconfig(ctx context.Context, client client.Client, cluster *v1alp } kubeconfig = b } + return kubeconfig, nil } @@ -297,5 +300,6 @@ func generateKubeconfigFromRest(config *rest.Config) clientcmdapi.Config { CurrentContext: "default-context", AuthInfos: authinfos, } + return clientConfig } diff --git a/cli/main.go b/cli/main.go index c5edc7b..59b9e47 100644 --- a/cli/main.go +++ b/cli/main.go @@ -5,17 +5,22 @@ import ( "github.com/rancher/k3k/cli/cmds" "github.com/rancher/k3k/cli/cmds/cluster" - "github.com/rancher/k3k/pkg/version" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) +const ( + program = "k3k" + version = "dev" + gitCommit = "HEAD" +) + func main() { app := cmds.NewApp() app.Commands = []cli.Command{ cluster.NewClusterCommand(), } - app.Version = version.Version + " (" + version.GitCommit + ")" + app.Version = version + " (" + gitCommit + ")" if err := app.Run(os.Args); err != nil { logrus.Fatal(err) diff --git a/main.go b/main.go index 7133a57..bf2548b 100644 --- a/main.go +++ b/main.go @@ -16,9 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" ) -var ( - Scheme = runtime.NewScheme() -) +var Scheme = runtime.NewScheme() func init() { _ = clientgoscheme.AddToScheme(Scheme) diff --git a/scripts/boilerplate.go.txt b/ops/boilerplate.go.txt similarity index 100% rename from scripts/boilerplate.go.txt rename to ops/boilerplate.go.txt diff --git a/scripts/build b/ops/build similarity index 97% rename from scripts/build rename to ops/build index c20e8b8..e912c51 100755 --- a/scripts/build +++ b/ops/build @@ -5,10 +5,12 @@ source $(dirname $0)/version cd $(dirname $0)/.. -mkdir -p bin +mkdir -p bin deploy + if [ "$(uname)" = "Linux" ]; then OTHER_LINKFLAGS="-extldflags -static -s" fi + LINKFLAGS="-X github.com/rancher/k3k.Version=$VERSION" LINKFLAGS="-X github.com/rancher/k3k.GitCommit=$COMMIT $LINKFLAGS" CGO_ENABLED=0 go build -ldflags "$LINKFLAGS $OTHER_LINKFLAGS" -o bin/k3k diff --git a/scripts/ci b/ops/ci similarity index 100% rename from scripts/ci rename to ops/ci diff --git a/scripts/default b/ops/default similarity index 100% rename from scripts/default rename to ops/default diff --git a/scripts/entry b/ops/entry similarity index 66% rename from scripts/entry rename to ops/entry index 78fb567..3b5eeef 100755 --- a/scripts/entry +++ b/ops/entry @@ -2,8 +2,8 @@ set -e mkdir -p bin dist -if [ -e ./scripts/$1 ]; then - ./scripts/"$@" +if [ -e ./ops/$1 ]; then + ./ops/"$@" else exec "$@" fi diff --git a/scripts/package b/ops/package similarity index 100% rename from scripts/package rename to ops/package diff --git a/scripts/package-chart b/ops/package-chart similarity index 100% rename from scripts/package-chart rename to ops/package-chart diff --git a/scripts/release b/ops/release similarity index 100% rename from scripts/release rename to ops/release diff --git a/scripts/release-chart b/ops/release-chart similarity index 100% rename from scripts/release-chart rename to ops/release-chart diff --git a/scripts/test b/ops/test similarity index 100% rename from scripts/test rename to ops/test diff --git a/scripts/validate b/ops/validate similarity index 100% rename from scripts/validate rename to ops/validate diff --git a/scripts/validate-ci b/ops/validate-ci similarity index 85% rename from scripts/validate-ci rename to ops/validate-ci index e7981cf..9217ab2 100755 --- a/scripts/validate-ci +++ b/ops/validate-ci @@ -5,7 +5,7 @@ cd $(dirname $0)/.. go generate -source ./scripts/version +source ./ops/version if [ -n "$DIRTY" ]; then echo Git is dirty diff --git a/scripts/version b/ops/version similarity index 100% rename from scripts/version rename to ops/version diff --git a/pkg/controller/addressallocator/controller.go b/pkg/controller/addressallocator/controller.go deleted file mode 100644 index 9338596..0000000 --- a/pkg/controller/addressallocator/controller.go +++ /dev/null @@ -1,50 +0,0 @@ -package addressallocator - -import ( - "context" - - "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" - "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" -) - -const ( - AddressAllocatorController = "address-allocator-controller" -) - -type AddressAllocatorReconciler struct { - Client client.Client - Scheme *runtime.Scheme -} - -// Add adds a new controller to the manager -func Add(mgr manager.Manager) error { - // initialize a new Reconciler - reconciler := AddressAllocatorReconciler{ - Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), - } - - controller, err := controller.New(AddressAllocatorController, mgr, controller.Options{ - Reconciler: &reconciler, - MaxConcurrentReconciles: 1, - }) - - if err != nil { - return err - } - - return controller.Watch(&source.Kind{Type: &v1alpha1.Cluster{}}, - &handler.EnqueueRequestForObject{}) - -} - -// Reconcile will allocate cluster/service cidrs to new clusters -func (r *AddressAllocatorReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) { - return reconcile.Result{}, nil -} diff --git a/pkg/controller/cluster/cidr_allocation.go b/pkg/controller/cluster/cidr_allocation.go deleted file mode 100644 index dd408a7..0000000 --- a/pkg/controller/cluster/cidr_allocation.go +++ /dev/null @@ -1,129 +0,0 @@ -package cluster - -import ( - "context" - "fmt" - "net" - "time" - - "github.com/rancher/k3k/pkg/apis/k3k.io/v1alpha1" - "github.com/rancher/k3k/pkg/controller/util" - "k8s.io/apimachinery/pkg/types" -) - -const ( - cidrAllocationClusterPoolName = "k3k-cluster-cidr-allocation-pool" - cidrAllocationServicePoolName = "k3k-service-cidr-allocation-pool" - - defaultClusterCIDR = "10.44.0.0/16" - defaultClusterServiceCIDR = "10.45.0.0/16" -) - -// determineOctet dertermines the octet for the -// given mask bits of a subnet. -func determineOctet(mb int) uint8 { - switch { - case mb <= 8: - return 1 - case mb >= 8 && mb <= 16: - return 2 - case mb >= 8 && mb <= 24: - return 3 - case mb >= 8 && mb <= 32: - return 4 - default: - return 0 - } -} - -// generateSubnets generates all subnets for the given CIDR. -func generateSubnets(cidr string) ([]string, error) { - _, ipNet, err := net.ParseCIDR(cidr) - if err != nil { - return nil, err - } - usedBits, _ := ipNet.Mask.Size() - - octet := determineOctet(usedBits) - - ip := ipNet.IP.To4() - octetVal := ip[octet-1] - - var subnets []string - - for i := octetVal; i < 254; i++ { - octetVal++ - ip[octet-1] = octetVal - subnets = append(subnets, fmt.Sprintf("%s/%d", ip, usedBits)) - } - - return subnets, nil -} - -// nextCIDR retrieves the next available CIDR address from the given pool. -func (c *ClusterReconciler) nextCIDR(ctx context.Context, cidrAllocationPoolName, clusterName string) (*net.IPNet, error) { - var cidrPool v1alpha1.CIDRAllocationPool - - nn := types.NamespacedName{ - Name: cidrAllocationPoolName, - } - if err := c.Client.Get(ctx, nn, &cidrPool); err != nil { - return nil, util.WrapErr("failed to get cidrpool", err) - } - - var ipNet *net.IPNet - - for _, pool := range cidrPool.Status.Pool { - if pool.ClusterName == clusterName { - _, ipn, err := net.ParseCIDR(pool.IPNet) - if err != nil { - return nil, util.WrapErr("failed to parse cidr", err) - } - return ipn, nil - } - } - for i := 0; i < len(cidrPool.Status.Pool); i++ { - if cidrPool.Status.Pool[i].ClusterName == "" && cidrPool.Status.Pool[i].Issued == 0 { - cidrPool.Status.Pool[i].ClusterName = clusterName - cidrPool.Status.Pool[i].Issued = time.Now().Unix() - - _, ipn, err := net.ParseCIDR(cidrPool.Status.Pool[i].IPNet) - if err != nil { - return nil, util.WrapErr("failed to parse cidr", err) - } - if err := c.Client.Update(ctx, &cidrPool); err != nil { - return nil, util.WrapErr("failed to update cidr pool", err) - } - ipNet = ipn - - break - } - } - - return ipNet, nil -} - -// releaseCIDR updates the given CIDR pool by marking the address as available. -func (c *ClusterReconciler) releaseCIDR(ctx context.Context, cidrAllocationPoolName, clusterName string) error { - var cidrPool v1alpha1.CIDRAllocationPool - - nn := types.NamespacedName{ - Name: cidrAllocationPoolName, - } - if err := c.Client.Get(ctx, nn, &cidrPool); err != nil { - return err - } - - for i := 0; i < len(cidrPool.Status.Pool); i++ { - if cidrPool.Status.Pool[i].ClusterName == clusterName { - cidrPool.Status.Pool[i].ClusterName = "" - cidrPool.Status.Pool[i].Issued = 0 - } - - if err := c.Client.Status().Update(ctx, &cidrPool); err != nil { - return err - } - } - - return nil -} diff --git a/pkg/controller/cluster/config/agent.go b/pkg/controller/cluster/config/agent.go index 43113c6..631e5b6 100644 --- a/pkg/controller/cluster/config/agent.go +++ b/pkg/controller/cluster/config/agent.go @@ -9,8 +9,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func AgentConfig(cluster *v1alpha1.Cluster, serviceIP string) v1.Secret { - config := agentConfigData(serviceIP, cluster.Spec.Token) +func Agent(cluster *v1alpha1.Cluster, serviceIP string) v1.Secret { + config := agentData(serviceIP, cluster.Spec.Token) return v1.Secret{ TypeMeta: metav1.TypeMeta{ @@ -27,7 +27,7 @@ func AgentConfig(cluster *v1alpha1.Cluster, serviceIP string) v1.Secret { } } -func agentConfigData(serviceIP, token string) string { +func agentData(serviceIP, token string) string { return fmt.Sprintf(`server: https://%s:6443 token: %s`, serviceIP, token) } diff --git a/pkg/controller/cluster/config/server.go b/pkg/controller/cluster/config/server.go index 817fc03..5602c5d 100644 --- a/pkg/controller/cluster/config/server.go +++ b/pkg/controller/cluster/config/server.go @@ -7,13 +7,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func ServerConfig(cluster *v1alpha1.Cluster, init bool, serviceIP string) (*v1.Secret, error) { +func Server(cluster *v1alpha1.Cluster, init bool, serviceIP string) (*v1.Secret, error) { name := "k3k-server-config" if init { name = "k3k-init-server-config" } - config := serverConfigData(serviceIP, cluster) + config := serverData(serviceIP, cluster) if init { config = initConfigData(cluster) } @@ -32,7 +32,7 @@ func ServerConfig(cluster *v1alpha1.Cluster, init bool, serviceIP string) (*v1.S }, nil } -func serverConfigData(serviceIP string, cluster *v1alpha1.Cluster) string { +func serverData(serviceIP string, cluster *v1alpha1.Cluster) string { return "cluster-init: true\nserver: https://" + serviceIP + ":6443" + serverOptions(cluster) } diff --git a/pkg/controller/cluster/controller.go b/pkg/controller/cluster/controller.go index 8ee28e8..ac0f7f0 100644 --- a/pkg/controller/cluster/controller.go +++ b/pkg/controller/cluster/controller.go @@ -102,16 +102,6 @@ func (c *ClusterReconciler) createCluster(ctx context.Context, cluster *v1alpha1 return util.WrapErr("failed to create ns", err) } - cluster.Status.ClusterCIDR = cluster.Spec.ClusterCIDR - if cluster.Status.ClusterCIDR == "" { - cluster.Status.ClusterCIDR = defaultClusterCIDR - } - - cluster.Status.ServiceCIDR = cluster.Spec.ServiceCIDR - if cluster.Status.ServiceCIDR == "" { - cluster.Status.ServiceCIDR = defaultClusterServiceCIDR - } - klog.Infof("creating cluster service") serviceIP, err := c.createClusterService(ctx, cluster) if err != nil { @@ -177,7 +167,7 @@ func (c *ClusterReconciler) createNamespace(ctx context.Context, cluster *v1alph func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v1alpha1.Cluster, serviceIP string) error { // create init node config - initServerConfig, err := config.ServerConfig(cluster, true, serviceIP) + initServerConfig, err := config.Server(cluster, true, serviceIP) if err != nil { return err } @@ -193,7 +183,7 @@ func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v } // create servers configuration - serverConfig, err := config.ServerConfig(cluster, false, serviceIP) + serverConfig, err := config.Server(cluster, false, serviceIP) if err != nil { return err } @@ -207,7 +197,7 @@ func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v } // create agents configuration - agentsConfig := config.AgentConfig(cluster, serviceIP) + agentsConfig := config.Agent(cluster, serviceIP) if err := controllerutil.SetControllerReference(cluster, &agentsConfig, c.Scheme); err != nil { return err } @@ -289,30 +279,7 @@ func (c *ClusterReconciler) createDeployments(ctx context.Context, cluster *v1al } func (c *ClusterReconciler) createCIDRPools(ctx context.Context) error { - clusterSubnets, err := generateSubnets(defaultClusterCIDR) - if err != nil { - return err - } - - var clusterSubnetAllocations []v1alpha1.Allocation - for _, cs := range clusterSubnets { - clusterSubnetAllocations = append(clusterSubnetAllocations, v1alpha1.Allocation{ - IPNet: cs, - }) - } - - cidrClusterPool := v1alpha1.CIDRAllocationPool{ - ObjectMeta: metav1.ObjectMeta{ - Name: cidrAllocationClusterPoolName, - }, - Spec: v1alpha1.CIDRAllocationPoolSpec{ - DefaultClusterCIDR: defaultClusterCIDR, - }, - Status: v1alpha1.CIDRAllocationPoolStatus{ - Pool: clusterSubnetAllocations, - }, - } - if err := c.Client.Create(ctx, &cidrClusterPool); err != nil { + if err := c.Client.Create(ctx, &v1alpha1.CIDRAllocationPool{}); err != nil { if !apierrors.IsAlreadyExists(err) { // return nil since the resource has // already been created @@ -320,35 +287,13 @@ func (c *ClusterReconciler) createCIDRPools(ctx context.Context) error { } } - clusterServiceSubnets, err := generateSubnets(defaultClusterServiceCIDR) - if err != nil { - return err - } - - var clusterServiceSubnetAllocations []v1alpha1.Allocation - for _, ss := range clusterServiceSubnets { - clusterServiceSubnetAllocations = append(clusterServiceSubnetAllocations, v1alpha1.Allocation{ - IPNet: ss, - }) - } - - cidrServicePool := v1alpha1.CIDRAllocationPool{ - ObjectMeta: metav1.ObjectMeta{ - Name: cidrAllocationServicePoolName, - }, - Spec: v1alpha1.CIDRAllocationPoolSpec{ - DefaultClusterCIDR: defaultClusterCIDR, - }, - Status: v1alpha1.CIDRAllocationPoolStatus{ - Pool: clusterServiceSubnetAllocations, - }, - } - if err := c.Client.Create(ctx, &cidrServicePool); err != nil { + if err := c.Client.Create(ctx, &v1alpha1.CIDRAllocationPool{}); err != nil { if !apierrors.IsAlreadyExists(err) { // return nil since the resource has // already been created return err } } + return nil } diff --git a/pkg/controller/cluster/server/ingress.go b/pkg/controller/cluster/server/ingress.go index 94e5e6a..9be4b4a 100644 --- a/pkg/controller/cluster/server/ingress.go +++ b/pkg/controller/cluster/server/ingress.go @@ -46,8 +46,9 @@ func Ingress(ctx context.Context, cluster *v1alpha1.Cluster, client client.Clien } func ingressRules(cluster *v1alpha1.Cluster, addresses []string) []networkingv1.IngressRule { - ingressRules := []networkingv1.IngressRule{} + var ingressRules []networkingv1.IngressRule pathTypePrefix := networkingv1.PathTypePrefix + for _, address := range addresses { rule := networkingv1.IngressRule{ Host: cluster.Name + "." + address + wildcardDNS, @@ -72,6 +73,7 @@ func ingressRules(cluster *v1alpha1.Cluster, addresses []string) []networkingv1. } ingressRules = append(ingressRules, rule) } + return ingressRules } diff --git a/pkg/controller/cluster/server/service.go b/pkg/controller/cluster/server/service.go index 3b7689c..caa9e17 100644 --- a/pkg/controller/cluster/server/service.go +++ b/pkg/controller/cluster/server/service.go @@ -16,6 +16,7 @@ func Service(cluster *v1alpha1.Cluster) *v1.Service { } } } + return &v1.Service{ TypeMeta: metav1.TypeMeta{ Kind: "Service", diff --git a/pkg/controller/util/util.go b/pkg/controller/util/util.go index fd01556..5633b8c 100644 --- a/pkg/controller/util/util.go +++ b/pkg/controller/util/util.go @@ -35,7 +35,8 @@ func nodeAddress(node *v1.Node) string { if ip.Type == "ExternalIP" && ip.Address != "" { externalIP = ip.Address break - } else if ip.Type == "InternalIP" && ip.Address != "" { + } + if ip.Type == "InternalIP" && ip.Address != "" { internalIP = ip.Address } } diff --git a/pkg/version/version.go b/pkg/version/version.go deleted file mode 100644 index b229a9f..0000000 --- a/pkg/version/version.go +++ /dev/null @@ -1,10 +0,0 @@ -package version - -import "strings" - -var ( - Program = "k3k" - ProgramUpper = strings.ToUpper(Program) - Version = "dev" - GitCommit = "HEAD" -)