Skip to content

Replace pkg/ with internal/ #148

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.

Sign up for GitHub

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

Merged
olix0r merged 2 commits into from
Dec 6, 2022
Merged

Replace pkg/ with internal/ #148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ea2634
Replace pkg/ with internal/
olix0r Dec 5, 2022
e631eb9
simplify package names
olix0r Dec 5, 2022
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY go.mod .
COPY go.sum .
RUN go mod download
COPY ./proxy-init ./proxy-init
COPY pkg pkg
COPY ./internal ./internal
ARG TARGETARCH
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/linkerd2-proxy-init -mod=readonly -ldflags "-s -w" -v ./proxy-init

Expand Down
2 changes: 1 addition & 1 deletion cni-plugin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/containernetworking/cni/pkg/types"
cniv1 "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/version"
iptables "github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-iptables"
iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables"
"github.com/linkerd/linkerd2-proxy-init/proxy-init/cmd"

"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion pkg/linkerd-iptables/iptables.go → internal/linkerd-iptables/iptables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-util"
util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util"
)

const (
Expand Down
0 pkg/linkerd-iptables/iptables_test.go → internal/linkerd-iptables/iptables_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/linkerd-util/portrange.go → internal/linkerd-util/portrange.go
View file
Open in desktop
File renamed without changes.
0 pkg/linkerd-util/portrange_test.go → internal/linkerd-util/portrange_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions proxy-init/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

log "github.com/sirupsen/logrus"

"github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-iptables"
"github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-util"
iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables"
util "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-util"
Comment thread
olix0r marked this conversation as resolved.
Outdated
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion proxy-init/cmd/root_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"testing"

"github.com/linkerd/linkerd2-proxy-init/pkg/linkerd-iptables"
iptables "github.com/linkerd/linkerd2-proxy-init/internal/linkerd-iptables"
)

func TestBuildFirewallConfiguration(t *testing.T) {
Expand Down