Skip to content

Commit

Permalink
Merge pull request #73 from chenchun/iptables
Browse files Browse the repository at this point in the history
Make hostport to cowork with ipvs kube-proxy
  • Loading branch information
Guanjun Gong committed May 21, 2020
2 parents ce578c1 + 71c3936 commit 6f27a69
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build/docker/galaxy-ipam/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN make build BINS="galaxy-ipam"
ARG TARGETARCH
ARG OUTPUTDIR="_output/bin-${TARGETARCH}"
RUN mv -f ${OUTPUTDIR}/* /

WORKDIR /



Expand Down
2 changes: 1 addition & 1 deletion build/docker/galaxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN make build BINS="galaxy"
ARG TARGETARCH
ARG OUTPUTDIR="_output/bin-${TARGETARCH}"
RUN mv -f ${OUTPUTDIR}/* /

WORKDIR /



Expand Down
2 changes: 1 addition & 1 deletion pkg/network/portmapping/iptables.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ func (h *PortMappingHandler) EnsureBasicRule() error {
"-m", "addrtype", "--dst-type", "LOCAL",
"-j", string(kubeHostportsChain)}
for _, tc := range tableChainsNeedJumpServices {
if _, err := h.Interface.EnsureRule(utiliptables.Prepend, tc.table, tc.chain, args...); err != nil {
if _, err := h.Interface.EnsureRule(utiliptables.Append, tc.table, tc.chain, args...); err != nil {
return fmt.Errorf("Failed to ensure that %s chain %s jumps to %s: %v", tc.table, tc.chain,
kubeHostportsChain, err)
}
Expand Down

0 comments on commit 6f27a69

Please sign in to comment.