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

Jump to bottom

Bug 1720332: images/kube-proxy: update to 4.1, add iptables wrappers #23235

Merged
merged 2 commits into from Jul 17, 2019
Merged

Bug 1720332: images/kube-proxy: update to 4.1, add iptables wrappers #23235

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
bb51d4c
images/kube-proxy: update to 4.1, add iptables wrappers
squeed Jun 13, 2019
e256696
images/kube-proxy: copy iptables wrapper scripts from sdn
squeed Jun 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions images/kube-proxy/Dockerfile
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions images/kube-proxy/Dockerfile.rhel
View file
Open in desktop
@@ -1,9 +1,17 @@
FROM registry.svc.ci.openshift.org/ocp/4.0:hyperkube
FROM registry.svc.ci.openshift.org/ocp/4.1:hyperkube

RUN INSTALL_PKGS="iptables conntrack-tools" && \
RUN INSTALL_PKGS="conntrack-tools" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
yum clean all && rm -rf /var/cache/*

COPY ./images/kube-proxy/scripts/iptables /usr/sbin/
COPY ./images/kube-proxy/scripts/iptables-save /usr/sbin/
COPY ./images/kube-proxy/scripts/iptables-restore /usr/sbin/
COPY ./images/kube-proxy/scripts/ip6tables /usr/sbin/
COPY ./images/kube-proxy/scripts/ip6tables-save /usr/sbin/
COPY ./images/kube-proxy/scripts/ip6tables-restore /usr/sbin/
COPY ./images/kube-proxy/scripts/iptables /usr/sbin/

LABEL io.k8s.display-name="Kubernetes kube-proxy" \
io.k8s.description="Provides kube-proxy for external CNI plugins" \
io.openshift.tags="openshift,kube-proxy" \
Expand Down
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/ip6tables
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/ip6tables "$@"
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/ip6tables-restore
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/ip6tables-restore "$@"
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/ip6tables-save
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/ip6tables-save "$@"
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/iptables
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/iptables "$@"
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/iptables-restore
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/iptables-restore "$@"
3 changes: 3 additions & 0 deletions images/kube-proxy/scripts/iptables-save
View file
Open in desktop
@@ -0,0 +1,3 @@
#!/bin/sh

exec chroot /host /usr/sbin/iptables-save "$@"