From 60544f1449e1c7a00e16bf0fb2e76d47b4c3cb02 Mon Sep 17 00:00:00 2001 From: Vegard Engen Date: Sat, 25 Oct 2025 22:10:03 +0200 Subject: [PATCH] Update Go module path from Gitea to GitHub Change module path from: gitea.engen.priv.no/klauvsteinen/unifi-network-operator To: github.com/vegardengen/unifi-network-operator This fixes the module path mismatch error in GitHub Actions. Changes: - Updated go.mod module declaration - Updated all import statements in Go files - Updated kustomization and ko config files - Ran go mod tidy to update dependencies This is required for the project to build correctly on GitHub. --- cmd/main.go | 8 ++++---- config/manager/kustomization.yaml | 2 +- go.mod | 7 +++---- go.sum | 2 -- internal/controller/firewallgroup_controller.go | 6 +++--- internal/controller/firewallgroup_controller_test.go | 2 +- internal/controller/firewallpolicy_controller.go | 6 +++--- internal/controller/firewallpolicy_controller_test.go | 2 +- internal/controller/firewallzone_controller.go | 6 +++--- internal/controller/firewallzone_controller_test.go | 2 +- internal/controller/networkconfiguration_controller.go | 6 +++--- .../controller/networkconfiguration_controller_test.go | 2 +- internal/controller/portforward_controller.go | 6 +++--- internal/controller/portforward_controller_test.go | 2 +- internal/controller/suite_test.go | 2 +- ko.yaml | 2 +- 16 files changed, 30 insertions(+), 33 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 5c5b72c..6406d76 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -39,10 +39,10 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/controller" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/controller" + "github.com/vegardengen/unifi-network-operator/internal/unifi" // +kubebuilder:scaffold:imports ) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 07f40e8..66ec300 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: gitea.engen.priv.no/klauvsteinen/unifi-network-operator-controller + newName: github.com/vegardengen/unifi-network-operator-controller newTag: latest diff --git a/go.mod b/go.mod index fb1c8ac..ca643ec 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ -module gitea.engen.priv.no/klauvsteinen/unifi-network-operator +module github.com/vegardengen/unifi-network-operator go 1.24.0 toolchain go1.24.1 - require ( + gitea.engen.priv.no/klauvsteinen/go-unifi v0.0.1-alpha26 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 - gitea.engen.priv.no/klauvsteinen/go-unifi v0.0.1-alpha26 k8s.io/api v0.32.1 k8s.io/apimachinery v0.32.1 k8s.io/client-go v0.32.1 + k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e sigs.k8s.io/controller-runtime v0.20.4 ) @@ -97,7 +97,6 @@ require ( k8s.io/component-base v0.32.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect - k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.32.0 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/randfill v1.0.0 // indirect diff --git a/go.sum b/go.sum index c0781da..bd09608 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk= -github.com/vegardengen/go-unifi v0.0.1-alpha25 h1:GAwtNpMslE6/0IfM80cWFaMqwqsn+NXlUVsvauN7v68= -github.com/vegardengen/go-unifi v0.0.1-alpha25/go.mod h1:iwGJACYaRNb8eElwajOM7uYtyZraV9+5171gv3Q1QSc= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/internal/controller/firewallgroup_controller.go b/internal/controller/firewallgroup_controller.go index a312d32..cb5e88b 100644 --- a/internal/controller/firewallgroup_controller.go +++ b/internal/controller/firewallgroup_controller.go @@ -39,9 +39,9 @@ import ( // "sigs.k8s.io/controller-runtime/pkg/source" goUnifi "gitea.engen.priv.no/klauvsteinen/go-unifi/unifi" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/unifi" ) const firewallGroupFinalizer = "finalizer.unifi.engen.priv.no/firewallgroup" diff --git a/internal/controller/firewallgroup_controller_test.go b/internal/controller/firewallgroup_controller_test.go index 2261794..ec37660 100644 --- a/internal/controller/firewallgroup_controller_test.go +++ b/internal/controller/firewallgroup_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" ) var _ = Describe("FirewallGroup Controller", func() { diff --git a/internal/controller/firewallpolicy_controller.go b/internal/controller/firewallpolicy_controller.go index 55ed8a2..d674e14 100644 --- a/internal/controller/firewallpolicy_controller.go +++ b/internal/controller/firewallpolicy_controller.go @@ -34,9 +34,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" goUnifi "gitea.engen.priv.no/klauvsteinen/go-unifi/unifi" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/unifi" ) // FirewallPolicyReconciler reconciles a FirewallPolicy object diff --git a/internal/controller/firewallpolicy_controller_test.go b/internal/controller/firewallpolicy_controller_test.go index 804425a..6fb3d72 100644 --- a/internal/controller/firewallpolicy_controller_test.go +++ b/internal/controller/firewallpolicy_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" ) var _ = Describe("FirewallPolicy Controller", func() { diff --git a/internal/controller/firewallzone_controller.go b/internal/controller/firewallzone_controller.go index 915a000..f685300 100644 --- a/internal/controller/firewallzone_controller.go +++ b/internal/controller/firewallzone_controller.go @@ -28,9 +28,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/unifi" ) // FirewallZoneReconciler reconciles a FirewallZone object diff --git a/internal/controller/firewallzone_controller_test.go b/internal/controller/firewallzone_controller_test.go index 24bcbb8..f5c22b2 100644 --- a/internal/controller/firewallzone_controller_test.go +++ b/internal/controller/firewallzone_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" ) var _ = Describe("FirewallZone Controller", func() { diff --git a/internal/controller/networkconfiguration_controller.go b/internal/controller/networkconfiguration_controller.go index 54fefc6..8bf9c9c 100644 --- a/internal/controller/networkconfiguration_controller.go +++ b/internal/controller/networkconfiguration_controller.go @@ -28,9 +28,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - unifiv1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + unifiv1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/unifi" ) // NetworkconfigurationReconciler reconciles a Networkconfiguration object diff --git a/internal/controller/networkconfiguration_controller_test.go b/internal/controller/networkconfiguration_controller_test.go index f22afd2..f1a1107 100644 --- a/internal/controller/networkconfiguration_controller_test.go +++ b/internal/controller/networkconfiguration_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" ) var _ = Describe("Networkconfiguration Controller", func() { diff --git a/internal/controller/portforward_controller.go b/internal/controller/portforward_controller.go index 86018d8..f843254 100644 --- a/internal/controller/portforward_controller.go +++ b/internal/controller/portforward_controller.go @@ -19,9 +19,9 @@ import ( // "sigs.k8s.io/controller-runtime/pkg/source" goUnifi "gitea.engen.priv.no/klauvsteinen/go-unifi/unifi" - // unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/config" - "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/internal/unifi" + // unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" + "github.com/vegardengen/unifi-network-operator/internal/config" + "github.com/vegardengen/unifi-network-operator/internal/unifi" ) type PortForwardReconciler struct { diff --git a/internal/controller/portforward_controller_test.go b/internal/controller/portforward_controller_test.go index 84d16a0..1ba9241 100644 --- a/internal/controller/portforward_controller_test.go +++ b/internal/controller/portforward_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" ) var _ = Describe("PortForward Controller", func() { diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index d606418..750d4f5 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -32,7 +32,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - unifiv1beta1 "gitea.engen.priv.no/klauvsteinen/unifi-network-operator/api/v1beta1" + unifiv1beta1 "github.com/vegardengen/unifi-network-operator/api/v1beta1" // +kubebuilder:scaffold:imports ) diff --git a/ko.yaml b/ko.yaml index 49b17e6..11c226a 100644 --- a/ko.yaml +++ b/ko.yaml @@ -2,6 +2,6 @@ defaultBaseImage: cgr.dev/chainguard/static:latest labels: org.opencontainers.image.authors: Vegard Engen - org.opencontainers.image.source: https://gitea.engen.priv.no/klauvsteinen/unifi-network-operator + org.opencontainers.image.source: https://github.com/vegardengen/unifi-network-operator org.opencontainers.image.vendor: Klauvsteinen dev.chainguard.package.main: ""