Move packages from pkg to internal (#159)

int128 · May 2, 2023 · e05d5f6 · e05d5f6
1 parent 928fb80
commit e05d5f6
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 11 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -11,7 +11,7 @@
     {
       "description": "Update envoy version",
       "fileMatch": [
-        "^pkg/envoy/.+\\.go$",
+        "^internal/envoy/.+\\.go$",
       ],
       "matchStrings": [
         "\"(?<depName>.*?):(?<currentValue>.*)\" // renovate: docker\\s",

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -10,8 +10,7 @@ on:
       - go.*
       - main.go
       - api/**
-      - controllers/**
-      - pkg/**
+      - internal/**
       - config/**
     tags:
       - v*
@@ -22,8 +21,7 @@ on:
       - go.*
       - main.go
       - api/**
-      - controllers/**
-      - pkg/**
+      - internal/**
       - config/**
 
 jobs:

diff --git a/Dockerfile b/Dockerfile
@@ -14,8 +14,7 @@ RUN go mod download
 # Copy the go source
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
-COPY pkg/ pkg/
+COPY internal/ internal/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

diff --git a/internal/controller/proxy_controller.go b/internal/controller/proxy_controller.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/int128/ktunnels/pkg/envoy"
-	"github.com/int128/ktunnels/pkg/transit"
+	"github.com/int128/ktunnels/internal/envoy"
+	"github.com/int128/ktunnels/internal/transit"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/internal/controller/proxy_controller_test.go b/internal/controller/proxy_controller_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	ktunnelsv1 "github.com/int128/ktunnels/api/v1"
-	"github.com/int128/ktunnels/pkg/envoy"
+	"github.com/int128/ktunnels/internal/envoy"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/internal/controller/tunnel_controller.go b/internal/controller/tunnel_controller.go
@@ -19,7 +19,7 @@ package controller
 import (
 	"context"
 
-	"github.com/int128/ktunnels/pkg/envoy"
+	"github.com/int128/ktunnels/internal/envoy"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/envoy/configmap.go → internal/envoy/configmap.go b/pkg/envoy/configmap.go → internal/envoy/configmap.go
diff --git a/pkg/envoy/configmap_test.go → internal/envoy/configmap_test.go b/pkg/envoy/configmap_test.go → internal/envoy/configmap_test.go
diff --git a/pkg/envoy/deployment.go → internal/envoy/deployment.go b/pkg/envoy/deployment.go → internal/envoy/deployment.go
diff --git a/pkg/envoy/deployment_test.go → internal/envoy/deployment_test.go b/pkg/envoy/deployment_test.go → internal/envoy/deployment_test.go
diff --git a/pkg/envoy/image.go → internal/envoy/image.go b/pkg/envoy/image.go → internal/envoy/image.go
diff --git a/pkg/envoy/service.go → internal/envoy/service.go b/pkg/envoy/service.go → internal/envoy/service.go
diff --git a/pkg/transit/allocate.go → internal/transit/allocate.go b/pkg/transit/allocate.go → internal/transit/allocate.go
diff --git a/pkg/transit/allocate_test.go → internal/transit/allocate_test.go b/pkg/transit/allocate_test.go → internal/transit/allocate_test.go