Skip to content

Commit

Permalink
Revert "fix(ci): format files"
Browse files Browse the repository at this point in the history
This reverts commit e5e1a46.

Signed-off-by: Bart Smykla <[email protected]>
  • Loading branch information
bartsmykla committed Mar 30, 2024
1 parent e5e1a46 commit c1bbea8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
12 changes: 5 additions & 7 deletions api/mesh/v1alpha1/dataplane.proto
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ message Dataplane {
}
}


// Gateway describes a service that ingress should not be proxied.
message Gateway {
enum GatewayType {
Expand Down Expand Up @@ -234,16 +235,13 @@ message Dataplane {
// TransparentProxying describes configuration for transparent proxying.
message TransparentProxying {
enum IpFamilyMode {
// This value is to support backward compatibility and should not be
// used in new data plane objects.
// This value is to support backward compatibility and should not be used in new data plane objects.
UnSpecified = 0;
// Enables transparent proxying for both IPv4 and IPv6 traffic, This is
// the default.
// Enables transparent proxying for both IPv4 and IPv6 traffic, This is the default.
DualStack = 1;
// Enables transparent proxying for IPv4 traffic only.
IPv4 = 2;
// Enables transparent proxying for IPv6 traffic only. This mode is to
// be supported in the future.
// Enables transparent proxying for IPv6 traffic only. This mode is to be supported in the future.
IPv6 = 3;
}

Expand Down Expand Up @@ -273,7 +271,7 @@ message Dataplane {
repeated string reachable_services = 5;

// The IP family mode to enable for. Can be "IPv4" or "DualStack".
IpFamilyMode ip_family_mode = 6;
IpFamilyMode ip_family_mode = 6;
}

// Gateway describes a configuration of the gateway of the data plane proxy.
Expand Down
8 changes: 4 additions & 4 deletions pkg/transparentproxy/iptables/builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ func createRulesFile(ipv6 bool) (*os.File, error) {
}

type restorer struct {
cfg config.Config
ipv6 bool
dnsServers []string
executables *executables
cfg config.Config
ipv6 bool
dnsServers []string
executables *executables
}

func newIPTablesRestorer(
Expand Down

0 comments on commit c1bbea8

Please sign in to comment.