Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare move to kilo-io #222

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ else
endif
RELEASE_BINS := $(addprefix bin/release/kgctl-, $(addprefix linux-, $(ALL_ARCH)) darwin-amd64 darwin-arm64 windows-amd64)
PROJECT := kilo
PKG := github.com/squat/$(PROJECT)
PKG := github.com/kilo-io/$(PROJECT)
REGISTRY ?= index.docker.io
IMAGE ?= squat/$(PROJECT)
IMAGE ?= kiloio/$(PROJECT)
FULLY_QUALIFIED_IMAGE := $(REGISTRY)/$(IMAGE)

TAG := $(shell git describe --abbrev=0 --tags HEAD 2>/dev/null)
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

Kilo is a multi-cloud network overlay built on WireGuard and designed for Kubernetes.

[![Build Status](https://github.com/squat/kilo/workflows/CI/badge.svg)](https://github.com/squat/kilo/actions?query=workflow%3ACI)
[![Go Report Card](https://goreportcard.com/badge/github.com/squat/kilo)](https://goreportcard.com/report/github.com/squat/kilo)
[![Build Status](https://github.com/kilo-io/kilo/workflows/CI/badge.svg)](https://github.com/kilo-io/kilo/actions?query=workflow%3ACI)
[![Go Report Card](https://goreportcard.com/badge/github.com/kilo-io/kilo)](https://goreportcard.com/report/github.com/kilo-io/kilo)
[![Docker Pulls](https://img.shields.io/docker/pulls/squat/kilo)](https://hub.docker.com/r/squat/kilo)
[![Slack](https://img.shields.io/badge/join%20slack-%23kilo-brightgreen.svg)](https://slack.k8s.io/)

Expand Down Expand Up @@ -72,29 +72,29 @@ Kilo can be installed by deploying a DaemonSet to the cluster.
To run Kilo on kubeadm:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-kubeadm.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-kubeadm.yaml
```

To run Kilo on bootkube:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-bootkube.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-bootkube.yaml
```

To run Kilo on Typhoon:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-typhoon.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-typhoon.yaml
```

To run Kilo on k3s:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-k3s.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-k3s.yaml
```

## Add-on Mode
Expand All @@ -106,11 +106,11 @@ Kilo currently supports running on top of Flannel.
For example, to run Kilo on a Typhoon cluster running Flannel:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-typhoon-flannel.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-typhoon-flannel.yaml
```

[See the manifests directory for more examples](https://github.com/squat/kilo/tree/main/manifests).
[See the manifests directory for more examples](https://github.com/kilo-io/kilo/tree/main/manifests).

## VPN

Expand Down
2 changes: 1 addition & 1 deletion cmd/kg/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"os"
"os/exec"

"github.com/squat/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/mesh"
)

type graphHandler struct {
Expand Down
12 changes: 6 additions & 6 deletions cmd/kg/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

"github.com/squat/kilo/pkg/encapsulation"
"github.com/squat/kilo/pkg/k8s"
kiloclient "github.com/squat/kilo/pkg/k8s/clientset/versioned"
"github.com/squat/kilo/pkg/mesh"
"github.com/squat/kilo/pkg/version"
"github.com/squat/kilo/pkg/wireguard"
"github.com/kilo-io/kilo/pkg/encapsulation"
"github.com/kilo-io/kilo/pkg/k8s"
kiloclient "github.com/kilo-io/kilo/pkg/k8s/clientset/versioned"
"github.com/kilo-io/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/version"
"github.com/kilo-io/kilo/pkg/wireguard"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion cmd/kgctl/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
"fmt"

"github.com/spf13/cobra"
"github.com/squat/kilo/pkg/mesh"

"github.com/kilo-io/kilo/pkg/mesh"
)

func graph() *cobra.Command {
Expand Down
8 changes: 4 additions & 4 deletions cmd/kgctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

"github.com/squat/kilo/pkg/k8s"
kiloclient "github.com/squat/kilo/pkg/k8s/clientset/versioned"
"github.com/squat/kilo/pkg/mesh"
"github.com/squat/kilo/pkg/version"
"github.com/kilo-io/kilo/pkg/k8s"
kiloclient "github.com/kilo-io/kilo/pkg/k8s/clientset/versioned"
"github.com/kilo-io/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/version"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/kgctl/showconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/json"

"github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
"github.com/squat/kilo/pkg/mesh"
"github.com/squat/kilo/pkg/wireguard"
"github.com/kilo-io/kilo/pkg/k8s/apis/kilo/v1alpha1"
"github.com/kilo-io/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/wireguard"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion docs/building_kilo.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To follow along, you need to install the following utilities:

Clone the Repository and `cd` into it.
```shell
git clone https://github.com/squat/kilo.git
git clone https://github.com/kilo-io/kilo.git
cd kilo
```

Expand Down
2 changes: 1 addition & 1 deletion docs/kg.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ It performs several key functions, including:
* maintaining routing table entries and iptables rules.

`kg` is typically installed on all nodes of a Kubernetes cluster using a DaemonSet.
Example manifests can be found [in the manifests directory](https://github.com/squat/kilo/tree/main/manifests).
Example manifests can be found [in the manifests directory](https://github.com/kilo-io/kilo/tree/main/manifests).

## Usage

Expand Down
6 changes: 3 additions & 3 deletions docs/kgctl.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ This tool can be used to understand a mesh's topology, get the WireGuard configu

## Installation

The `kgctl` binary is automatically compiled for Linux, macOS, and Windows for every release of Kilo and can be downloaded from [the GitHub releases page](https://github.com/squat/kilo/releases/latest).
The `kgctl` binary is automatically compiled for Linux, macOS, and Windows for every release of Kilo and can be downloaded from [the GitHub releases page](https://github.com/kilo-io/kilo/releases/latest).

### Building from Source
Kilo is written in Golang and as a result the [Go toolchain must be installed](https://golang.org/doc/install) in order to build the `kgctl` binary.
To download the Kilo source code and then build and install `kgctl` using the latest commit all with a single command, run:

```shell
go install github.com/squat/kilo/cmd/kgctl@latest
go install github.com/kilo-io/kilo/cmd/kgctl@latest
```

Alternatively, `kgctl` can be built and installed based on specific version of the code by specifying a Git tag or hash, e.g.:

```shell
go install github.com/squat/kilo/cmd/[email protected]
go install github.com/kilo-io/kilo/cmd/[email protected]
```

When working on Kilo locally, it can be helpful to build and test the `kgctl` binary as part of the development cycle.
Expand Down
2 changes: 1 addition & 1 deletion docs/network-policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Support for [Kubernetes network policies](https://kubernetes.io/docs/concepts/se
The following command adds network policy support by deploying kube-router to work alongside Kilo:

```shell
kubectl apply -f kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kube-router.yaml
kubectl apply -f kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kube-router.yaml
```

## Examples
Expand Down
8 changes: 4 additions & 4 deletions docs/userspace-wireguard.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ This DaemonSet creates a WireGuard interface that Kilo will manage.
An example configuration for a K3s cluster with [BoringTun] can be applied with:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-k3s-userspace.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-k3s-userspace.yaml
```

> **Note**: even if some nodes have the WireGuard kernel module, this configuration will cause all nodes to use the userspace implementation of WireGuard.
Expand All @@ -30,8 +30,8 @@ In a heterogeneous cluster where some nodes are missing the WireGuard kernel mod
An example of such a configuration for a K3s cluster can by applied with:

```shell
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/squat/kilo/main/manifests/kilo-k3s-userspace-heterogeneous.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/crds.yaml
kubectl apply -f https://raw.githubusercontent.com/kilo-io/kilo/main/manifests/kilo-k3s-userspace-heterogeneous.yaml
```

This configuration will deploy [nkml](https://github.com/leonnicolas/nkml) as a DaemonSet to label all nodes according to the presence of the WireGuard kernel module.
Expand Down
4 changes: 2 additions & 2 deletions e2e/kilo-kind-userspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ spec:
hostNetwork: true
containers:
- name: kilo
image: squat/kilo:test
image: kiloio/kilo:test
imagePullPolicy: Never
args:
- --hostname=$(NODE_NAME)
Expand Down Expand Up @@ -149,7 +149,7 @@ spec:
readOnly: false
initContainers:
- name: install-cni
image: squat/kilo:test
image: kiloio/kilo:test
imagePullPolicy: Never
command:
- /bin/sh
Expand Down
6 changes: 3 additions & 3 deletions e2e/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ KIND_CLUSTER="kind-cluster-kilo"
KIND_BINARY="${KIND_BINARY:-kind}"
KUBECTL_BINARY="${KUBECTL_BINARY:-kubectl}"
KGCTL_BINARY="${KGCTL_BINARY:-kgctl}"
KILO_IMAGE="${KILO_IMAGE:-squat/kilo}"
KILO_IMAGE="${KILO_IMAGE:-kiloio/kilo}"

retry() {
local COUNT="${1:-10}"
Expand Down Expand Up @@ -118,9 +118,9 @@ create_cluster() {
# Create the kind cluster.
_kind create cluster --name $KIND_CLUSTER --config <(echo "$CONFIG")
# Load the Kilo image into kind.
docker tag "$KILO_IMAGE" squat/kilo:test
docker tag "$KILO_IMAGE" kiloio/kilo:test
# This command does not accept the --kubeconfig flag, so call the command directly.
$KIND_BINARY load docker-image squat/kilo:test --name $KIND_CLUSTER
$KIND_BINARY load docker-image kiloio/kilo:test --name $KIND_CLUSTER
# Create the kubeconfig secret.
_kubectl create secret generic kubeconfig --from-file=kubeconfig="$KUBECONFIG" -n kube-system
# Apply Kilo the the cluster.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/squat/kilo
module github.com/kilo-io/kilo

go 1.15

Expand Down
2 changes: 1 addition & 1 deletion pkg/encapsulation/encapsulation.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package encapsulation
import (
"net"

"github.com/squat/kilo/pkg/iptables"
"github.com/kilo-io/kilo/pkg/iptables"
)

// Strategy identifies which packets within a location should
Expand Down
3 changes: 2 additions & 1 deletion pkg/encapsulation/flannel.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ import (
"net"
"sync"

"github.com/squat/kilo/pkg/iptables"
"github.com/vishvananda/netlink"

"github.com/kilo-io/kilo/pkg/iptables"
)

const flannelDeviceName = "flannel.1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/encapsulation/ipip.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"net"

"github.com/squat/kilo/pkg/iproute"
"github.com/squat/kilo/pkg/iptables"
"github.com/kilo-io/kilo/pkg/iproute"
"github.com/kilo-io/kilo/pkg/iptables"
)

type ipip struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/encapsulation/noop.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package encapsulation
import (
"net"

"github.com/squat/kilo/pkg/iptables"
"github.com/kilo-io/kilo/pkg/iptables"
)

// Noop is an encapsulation that does nothing.
Expand Down
12 changes: 6 additions & 6 deletions pkg/k8s/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ import (
v1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"

"github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
kiloclient "github.com/squat/kilo/pkg/k8s/clientset/versioned"
v1alpha1informers "github.com/squat/kilo/pkg/k8s/informers/kilo/v1alpha1"
v1alpha1listers "github.com/squat/kilo/pkg/k8s/listers/kilo/v1alpha1"
"github.com/squat/kilo/pkg/mesh"
"github.com/squat/kilo/pkg/wireguard"
"github.com/kilo-io/kilo/pkg/k8s/apis/kilo/v1alpha1"
kiloclient "github.com/kilo-io/kilo/pkg/k8s/clientset/versioned"
v1alpha1informers "github.com/kilo-io/kilo/pkg/k8s/informers/kilo/v1alpha1"
v1alpha1listers "github.com/kilo-io/kilo/pkg/k8s/listers/kilo/v1alpha1"
"github.com/kilo-io/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/wireguard"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/k8s/backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"github.com/kylelemons/godebug/pretty"
v1 "k8s.io/api/core/v1"

"github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
"github.com/squat/kilo/pkg/mesh"
"github.com/squat/kilo/pkg/wireguard"
"github.com/kilo-io/kilo/pkg/k8s/apis/kilo/v1alpha1"
"github.com/kilo-io/kilo/pkg/mesh"
"github.com/kilo-io/kilo/pkg/wireguard"
)

func TestTranslateNode(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/k8s/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/k8s/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/k8s/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading