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.

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

feat(kumactl): added option to install transparent proxy with docker #5284

Merged
merged 2 commits into from
Nov 9, 2022
Merged

feat(kumactl): added option to install transparent proxy with docker #5284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb7408e
feat(kumactl): added option to install transparent proxy with docker
lukidzi Nov 8, 2022
cbd55cc
feat(kumactl): update golden files
lukidzi Nov 8, 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
4 changes: 4 additions & 0 deletions app/kumactl/cmd/completion/testdata/bash.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4358,6 +4358,10 @@ _kumactl_install_transparent-proxy()
local_nonpersistent_flags+=("--store-firewalld")
flags+=("--verbose")
local_nonpersistent_flags+=("--verbose")
flags+=("--vnet=")
two_word_flags+=("--vnet")
local_nonpersistent_flags+=("--vnet")
local_nonpersistent_flags+=("--vnet=")
flags+=("--api-timeout=")
two_word_flags+=("--api-timeout")
flags+=("--config-file=")
Expand Down
4 changes: 4 additions & 0 deletions app/kumactl/cmd/install/install_transparent_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type transparentProxyArgs struct {
EbpfBPFFSPath string
EbpfCgroupPath string
EbpfTCAttachIface string
VnetNetworks []string
}

func newInstallTransparentProxy() *cobra.Command {
Expand Down Expand Up @@ -71,6 +72,7 @@ func newInstallTransparentProxy() *cobra.Command {
EbpfBPFFSPath: "/sys/fs/bpf",
EbpfCgroupPath: "/sys/fs/cgroup",
EbpfTCAttachIface: "",
VnetNetworks: []string{},
}
cmd := &cobra.Command{
Use: "transparent-proxy",
Expand Down Expand Up @@ -205,6 +207,7 @@ runuser -u kuma-dp -- \

cmd.Flags().StringArrayVar(&args.ExcludeOutboundTCPPortsForUIDs, "exclude-outbound-tcp-ports-for-uids", []string{}, "tcp outbound ports to exclude for specific UIDs in a format of ports:uids where both ports and uids can be a single value, a list, a range or a combination of all, e.g. 3000-5000:103,104,106-108 would mean exclude ports from 3000 to 5000 for UIDs 103, 104, 106, 107, 108")
cmd.Flags().StringArrayVar(&args.ExcludeOutboundUDPPortsForUIDs, "exclude-outbound-udp-ports-for-uids", []string{}, "udp outbound ports to exclude for specific UIDs in a format of ports:uids where both ports and uids can be a single value, a list, a range or a combination of all, e.g. 3000-5000:103,104,106-108 would mean exclude ports from 3000 to 5000 for UIDs 103, 104, 106, 107, 108")
cmd.Flags().StringArrayVar(&args.VnetNetworks, "vnet", []string{}, "virtual networks in a format of interfaceNameRegex:CIDR split by ':' where interface name doesn't have to be exact name e.g. docker0:172.17.0.0/16, br+:172.18.0.0/16, iface:::1/64")

return cmd
}
Expand Down Expand Up @@ -261,6 +264,7 @@ func configureTransparentProxy(cmd *cobra.Command, args *transparentProxyArgs) e
EbpfCgroupPath: args.EbpfCgroupPath,
EbpfTCAttachIface: args.EbpfTCAttachIface,
EbpfProgramsSourcePath: args.EbpfProgramsSourcePath,
VnetNetworks: args.VnetNetworks,
Stdout: cmd.OutOrStdout(),
Stderr: cmd.OutOrStderr(),
}
Expand Down
1 change: 1 addition & 0 deletions docs/generated/cmd/kumactl/kumactl_install_transparent-proxy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ kumactl install transparent-proxy [flags]
--skip-dns-conntrack-zone-split skip applying conntrack zone splitting iptables rules
--store-firewalld store the iptables changes with firewalld
--verbose verbose
--vnet stringArray virtual networks in a format of interfaceNameRegex:CIDR split by ':' where interface name doesn't have to be exact name e.g. docker0:172.17.0.0/16, br+:172.18.0.0/16, iface:::1/64
```

### Options inherited from parent commands
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/gruntwork-io/terratest v0.40.24
github.com/hoisie/mustache v0.0.0-20160804235033-6375acf62c69
github.com/kelseyhightower/envconfig v1.4.0
github.com/kumahq/kuma-net v0.8.6
github.com/kumahq/kuma-net v0.8.7
github.com/kumahq/protoc-gen-kumadoc v0.3.1
github.com/lib/pq v1.10.7
github.com/miekg/dns v1.1.50
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/ktrysmt/go-bitbucket v0.6.4/go.mod h1:9u0v3hsd2rqCHRIpbir1oP7F58uo5dq19sBYvuMoyQ4=
github.com/kumahq/gateway-api v0.0.0-20221019125100-747a4fedfd7a h1:szFGMVdySxtKAjCxO3JUncfr1JGWOIlQaqWnrTUJsBc=
github.com/kumahq/gateway-api v0.0.0-20221019125100-747a4fedfd7a/go.mod h1:x0AP6gugkFV8fC/oTlnOMU0pnmuzIR8LfIPRVUjxSqA=
github.com/kumahq/kuma-net v0.8.6 h1:/luArNTn/3LfQxK00D0FpAP3Shf5BkbXCqCfsGQcJ9s=
github.com/kumahq/kuma-net v0.8.6/go.mod h1:aqhBHsY3LQCTvBOr7oU1r2hwjTn9vhXUKDJXJokkSCM=
github.com/kumahq/kuma-net v0.8.7 h1:hsE4j7YZz5KJgmC82BSw+x+pCZLzEy5L7xuJy2WMkIY=
github.com/kumahq/kuma-net v0.8.7/go.mod h1:aqhBHsY3LQCTvBOr7oU1r2hwjTn9vhXUKDJXJokkSCM=
github.com/kumahq/protoc-gen-kumadoc v0.3.1 h1:tY2dGQJTYVGkhxAHN154fddcWDRy55Pl4+oLT+FhsHo=
github.com/kumahq/protoc-gen-kumadoc v0.3.1/go.mod h1:F+c9RjgKlv1Q3UEoPJCtMJw8Fd+X5PfG5jlkTSfZOMA=
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
Expand Down
1 change: 1 addition & 0 deletions pkg/transparentproxy/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type TransparentProxyConfig struct {
EbpfCgroupPath string
EbpfTCAttachIface string
EbpfProgramsSourcePath string
VnetNetworks []string
Stdout io.Writer
Stderr io.Writer
}
3 changes: 3 additions & 0 deletions pkg/transparentproxy/transparentproxy_experimental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ func (tp *ExperimentalTransparentProxy) Setup(tpConfig *config.TransparentProxyC
Port: agentDNSListenerPort,
ConntrackZoneSplit: !tpConfig.SkipDNSConntrackZoneSplit,
},
VNet: kumanet_config.VNet{
Networks: tpConfig.VnetNetworks,
},
},
Ebpf: kumanet_config.Ebpf{
Enabled: tpConfig.EbpfEnabled,
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/distros.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ PULP_DIST_NAME="alpine"
ENVOY_VERSION=$("${SCRIPT_DIR}/../envoy/version.sh")
[ -z "$KUMA_CONFIG_PATH" ] && KUMA_CONFIG_PATH=pkg/config/app/kuma-cp/kuma-cp.defaults.yaml
CTL_NAME="kumactl"
[ -z "$EBPF_PROGRAMS_IMAGE" ] && EBPF_PROGRAMS_IMAGE="kumahq/kuma-net-ebpf:0.8.6"
[ -z "$EBPF_PROGRAMS_IMAGE" ] && EBPF_PROGRAMS_IMAGE="kumahq/kuma-net-ebpf:0.8.7"

function get_envoy() {
local distro=$1
Expand Down
2 changes: 1 addition & 1 deletion tools/releases/dockerfiles/Dockerfile.kuma-init
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE_ARCH=amd64
# When updatinng image version, remember to update it in tools/releases/distros.sh as well
ARG EBPF_IMAGE=kumahq/kuma-net-ebpf:0.8.6
ARG EBPF_IMAGE=kumahq/kuma-net-ebpf:0.8.7

FROM --platform=linux/$BASE_IMAGE_ARCH $EBPF_IMAGE as ebpf
FROM --platform=linux/$BASE_IMAGE_ARCH ubuntu:jammy
Expand Down