Skip to content
Merged
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
33 changes: 0 additions & 33 deletions .releaserc.json

This file was deleted.

6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: wireguard-operator
repo: github.com/nccloud/wireguard-operator
repo: github.com/jacaudi/wireguard-operator
resources:
- api:
crdVersion: v1
Expand All @@ -14,7 +14,7 @@ resources:
domain: wireguard-operator.io
group: vpn
kind: Wireguard
path: github.com/nccloud/wireguard-operator/api/v1alpha1
path: github.com/jacaudi/wireguard-operator/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -23,6 +23,6 @@ resources:
domain: wireguard-operator.io
group: vpn
kind: WireguardPeer
path: github.com/nccloud/wireguard-operator/api/v1alpha1
path: github.com/jacaudi/wireguard-operator/api/v1alpha1
version: v1alpha1
version: "3"
36 changes: 12 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,36 +88,24 @@ PersistentKeepalive = 25

## How to deploy

> **Note:** this fork has not cut its own release yet, so the commands below install the
> upstream `nccloud` operator, which is diverging from this fork. Features added here —
> `spec.persistentKeepalive`, for example — will not exist in that build. Until a release
> is published (tracked in [#36](https://github.com/jacaudi/wireguard-operator/issues/36)),
> deploy from source with `make deploy`.
> **Note:** this fork has not published an install artifact yet. An OCI Helm chart is the
> planned install path, tracked in
> [#48](https://github.com/jacaudi/wireguard-operator/issues/48). Until it ships, deploy
> from source.
>
> Earlier revisions of this README pointed at upstream's release and chart. Those
> install the diverging upstream operator, which does not carry this fork's features —
> `spec.persistentKeepalive`, for example — so they have been removed rather than
> repointed.

### Using provided manifest file
```
kubectl apply -f https://github.com/nccloud/wireguard-operator/releases/download/v2.11.0/release.yaml
```

### Using Helm
```
helm repo add nccloud https://nccloud.github.io/charts
helm install wireguard nccloud/wireguard-operator -n wireguard-system
```

You can use values to further customize the installation:
```
helm install wireguard nccloud/wireguard-operator -n wireguard-system --set nameOverride=wireguard
make deploy
```

## How to remove
### Using provided manifest file
```
kubectl delete -f https://github.com/nccloud/wireguard-operator/releases/download/v2.11.0/release.yaml
```
### Using Helm

```
helm uninstall wireguard -n wireguard-system
make undeploy
```

## How to collaborate
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"time"

"github.com/go-logr/stdr"
"github.com/nccloud/wireguard-operator/internal/agent"
"github.com/nccloud/wireguard-operator/internal/iptables"
"github.com/nccloud/wireguard-operator/internal/wireguard"
"github.com/jacaudi/wireguard-operator/internal/agent"
"github.com/jacaudi/wireguard-operator/internal/iptables"
"github.com/jacaudi/wireguard-operator/internal/wireguard"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"os"

vpnv1alpha1 "github.com/nccloud/wireguard-operator/api/v1alpha1"
controllers "github.com/nccloud/wireguard-operator/internal/controller"
vpnv1alpha1 "github.com/jacaudi/wireguard-operator/api/v1alpha1"
controllers "github.com/jacaudi/wireguard-operator/internal/controller"
v1 "k8s.io/api/core/v1"

// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
Expand Down
21 changes: 20 additions & 1 deletion docs/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,23 @@ client flow.

### 6.2 Fork housekeeping ([#36](https://github.com/jacaudi/wireguard-operator/issues/36))

The Go module path is still `github.com/nccloud/wireguard-operator`.
The Go module path still carried the upstream organisation; it is now
`github.com/jacaudi/wireguard-operator`, matching where the repo actually lives.
That covered `go.mod`, the import block of all 18 Go files, and the `repo:` and
both `path:` fields in `PROJECT`. The dead upstream `.releaserc.json`
(semantic-release, targeting a registry namespace two forks upstream) was
deleted — release-please under `.github/` superseded it wholesale, and nothing
invoked it. Image references were already retargeted to
`ghcr.io/jacaudi/wireguard-operator/{manager,agent}` during the CI alignment.
The README's install and Helm instructions pointed at upstream's release and
chart; since this fork publishes neither, they were removed rather than
repointed, and an OCI Helm chart is tracked separately in
[#48](https://github.com/jacaudi/wireguard-operator/issues/48).

**The API group stays `vpn.wireguard-operator.io`.** `PROJECT` carries
`domain: wireguard-operator.io` with `group: vpn`, so renaming it would change
the CRDs' fully-qualified names — a breaking change requiring every existing
`Wireguard` and `WireguardPeer` object to be recreated, for no benefit beyond
cosmetics. The module path and the API group are independent; renaming the
former does not touch the latter. The decision is recorded here because #36
requires it be explicit either way rather than left implicit.
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/nccloud/wireguard-operator
module github.com/jacaudi/wireguard-operator

go 1.26

Expand Down
2 changes: 1 addition & 1 deletion internal/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/go-logr/logr"

"github.com/fsnotify/fsnotify"
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
)

type State struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/agent/wireguard_metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/go-logr/logr"
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"golang.zx2c4.com/wireguard/wgctrl"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

vpnv1alpha1 "github.com/nccloud/wireguard-operator/api/v1alpha1"
vpnv1alpha1 "github.com/jacaudi/wireguard-operator/api/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/wireguard_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"strings"
"time"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/nccloud/wireguard-operator/internal/agent"
"github.com/nccloud/wireguard-operator/internal/ipam"
"github.com/nccloud/wireguard-operator/internal/resources"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/internal/agent"
"github.com/jacaudi/wireguard-operator/internal/ipam"
"github.com/jacaudi/wireguard-operator/internal/resources"

wgtypes "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
appsv1 "k8s.io/api/apps/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/wireguard_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/wireguardpeer_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"fmt"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/nccloud/wireguard-operator/internal/resources"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/internal/resources"

wgtypes "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/ipam/allocator.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"net/netip"
"slices"

"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/korylprince/ipnetgen"
"github.com/nccloud/wireguard-operator/api/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/ipam/allocator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package ipam
import (
"testing"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/iptables/iptables.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

"github.com/go-logr/logr"
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/nccloud/wireguard-operator/internal/agent"
"github.com/nccloud/wireguard-operator/internal/ipam"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/internal/agent"
"github.com/jacaudi/wireguard-operator/internal/ipam"
)

func ApplyRules(rules string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/iptables/iptables_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package iptables
import (
"testing"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
)

// test helpers
Expand Down
2 changes: 1 addition & 1 deletion internal/it/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/go-logr/stdr"
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
v12 "k8s.io/api/apps/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package resources

import (
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package resources
import (
"fmt"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package resources

import (
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package resources

import (
"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
6 changes: 3 additions & 3 deletions internal/wireguard/wireguard.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (

"github.com/go-logr/logr"

"github.com/nccloud/wireguard-operator/api/v1alpha1"
"github.com/nccloud/wireguard-operator/internal/agent"
"github.com/nccloud/wireguard-operator/internal/ipam"
"github.com/jacaudi/wireguard-operator/api/v1alpha1"
"github.com/jacaudi/wireguard-operator/internal/agent"
"github.com/jacaudi/wireguard-operator/internal/ipam"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
"golang.zx2c4.com/wireguard/wgctrl"
Expand Down
Loading