Skip to content

Commit 0dd91e2

Browse files
smarterclaytonsmarterclayton
committed
Rename base origin images and remove unused content
We drop openvswitch, rename node to origin-node, and remove system container support for anything except node.
1 parent f00f810 commit 0dd91e2

39 files changed

+43
-877
lines changed

‎examples/atomic-registry/allinone/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openshift/origin
1+
FROM openshift/origin-control-plane
22
MAINTAINER Aaron Weitekamp <[email protected]>
33

44
ADD install.sh run.sh uninstall.sh /container/bin/

‎examples/atomic-registry/systemd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#FROM registry.access.redhat.com/openshift3/ose
2-
FROM openshift/origin
2+
FROM openshift/origin-control-plane
33

44
LABEL name="projectatomic/atomic-registry-install" \
55
vendor="Project Atomic" \

‎examples/gitserver/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# The standard name for this image is openshift/origin-gitserver
55
#
6-
FROM openshift/origin
6+
FROM openshift/origin-control-plane
77

88
COPY bin/gitserver /usr/bin/gitserver
99
COPY hooks/ /var/lib/git-hooks/

‎hack/build-local-images.py

-7
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,6 @@
135135
},
136136
"files": {}
137137
},
138-
"openvswitch": {
139-
"directory": "openvswitch",
140-
"binaries": {
141-
"openshift": "/usr/bin/openshift"
142-
},
143-
"files": {}
144-
},
145138
"template-service-broker": {
146139
"directory": "template-service-broker",
147140
"binaries": {

‎hack/lib/constants.sh

+7-19
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ readonly OS_IMAGE_COMPILE_TARGETS_LINUX=(
3737
)
3838
readonly OS_SCRATCH_IMAGE_COMPILE_TARGETS_LINUX=(
3939
images/pod
40-
examples/hello-openshift
4140
)
4241
readonly OS_IMAGE_COMPILE_BINARIES=("${OS_SCRATCH_IMAGE_COMPILE_TARGETS_LINUX[@]##*/}" "${OS_IMAGE_COMPILE_TARGETS_LINUX[@]##*/}")
4342

@@ -309,9 +308,10 @@ readonly -f os::build::clean_windows_versioninfo
309308

310309
# OS_ALL_IMAGES is the list of images built by os::build::images.
311310
readonly OS_ALL_IMAGES=(
312-
origin
313-
origin-base
314311
origin-pod
312+
origin-base
313+
origin-control-plane
314+
origin-node
315315
origin-deployer
316316
origin-docker-builder
317317
origin-keepalived-ipfailover
@@ -323,9 +323,6 @@ readonly OS_ALL_IMAGES=(
323323
origin-egress-dns-proxy
324324
origin-recycler
325325
origin-template-service-broker
326-
hello-openshift
327-
openvswitch
328-
node
329326
)
330327

331328
# os::build::images builds all images in this repo.
@@ -341,9 +338,6 @@ function os::build::images() {
341338
fi
342339
}
343340

344-
# Link or copy image binaries to the appropriate locations.
345-
ln_or_cp "${OS_OUTPUT_BINPATH}/linux/amd64/hello-openshift" examples/hello-openshift/bin
346-
347341
# determine the correct tag prefix
348342
tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}"
349343

@@ -352,31 +346,25 @@ function os::build::images() {
352346
( os::build::image "${tag_prefix}-template-service-broker" images/template-service-broker ) &
353347

354348
# images that depend on "${tag_prefix}-base"
355-
( os::build::image "${tag_prefix}" images/origin ) &
349+
( os::build::image "${tag_prefix}-control-plane" images/origin ) &
356350
( os::build::image "${tag_prefix}-egress-router" images/egress/router ) &
357351
( os::build::image "${tag_prefix}-egress-http-proxy" images/egress/http-proxy ) &
358352
( os::build::image "${tag_prefix}-egress-dns-proxy" images/egress/dns-proxy ) &
359353

360354
for i in `jobs -p`; do wait $i; done
361355

362-
# images that depend on "${tag_prefix}
356+
# images that depend on "${tag_prefix}-control-plane
363357
( os::build::image "${tag_prefix}-haproxy-router" images/router/haproxy ) &
364358
( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
365359
( os::build::image "${tag_prefix}-deployer" images/deployer ) &
366360
( os::build::image "${tag_prefix}-recycler" images/recycler ) &
367361
( os::build::image "${tag_prefix}-docker-builder" images/builder/docker/docker-builder ) &
368362
( os::build::image "${tag_prefix}-sti-builder" images/builder/docker/sti-builder ) &
369363
( os::build::image "${tag_prefix}-f5-router" images/router/f5 ) &
370-
( os::build::image "openshift/node" images/node ) &
364+
( os::build::image "${tag_prefix}-node" images/node ) &
371365

372366
for i in `jobs -p`; do wait $i; done
373367

374-
# images that depend on "openshift/node"
375-
( os::build::image "openshift/openvswitch" images/openvswitch ) &
376-
377-
# extra images (not part of infrastructure)
378-
( os::build::image "openshift/hello-openshift" examples/hello-openshift ) &
379-
380-
for i in `jobs -p`; do wait $i; done
368+
docker tag "${tag_prefix}-control-plane" "${tag_prefix}"
381369
}
382370
readonly -f os::build::images

‎hack/push-release.sh

+14
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ if [[ "${OS_PUSH_BASE_REGISTRY-}" != "" || "${tag}" != "" ]]; then
7070
docker tag "openshift/${image}:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}${image}${tag}"
7171
done
7272
done
73+
# TODO: remove in 3.11
74+
for tag in "${tags[@]}"; do
75+
docker tag "openshift/origin-control-plane:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}"
76+
docker tag "openshift/origin-node:${source_tag}" "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}"
77+
done
7378
fi
7479

7580
for image in "${images[@]}"; do
@@ -78,5 +83,14 @@ for image in "${images[@]}"; do
7883
docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}${image}${tag}"
7984
done
8085
done
86+
# TODO: remove in 3.11
87+
for tag in "${tags[@]}"; do
88+
os::log::info "Pushing ${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}..."
89+
docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}origin${tag}"
90+
done
91+
for tag in "${tags[@]}"; do
92+
os::log::info "Pushing ${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}..."
93+
docker push ${PUSH_OPTS} "${OS_PUSH_BASE_REGISTRY-}${OS_PUSH_BASE_REPO}node${tag}"
94+
done
8195

8296
ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"

‎images/builder/docker/docker-builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# The standard name for this image is openshift/origin-docker-builder
1212
#
13-
FROM openshift/origin
13+
FROM openshift/origin-control-plane
1414

1515
LABEL io.k8s.display-name="OpenShift Origin Docker Builder" \
1616
io.k8s.description="This is a component of OpenShift Origin and is responsible for executing Docker image builds." \

‎images/builder/docker/sti-builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# The standard name for this image is openshift/origin-sti-builder
1212
#
13-
FROM openshift/origin
13+
FROM openshift/origin-control-plane
1414

1515
LABEL io.k8s.display-name="OpenShift Origin S2I Builder" \
1616
io.k8s.description="This is a component of OpenShift Origin and is responsible for executing source-to-image (s2i) image builds." \

‎images/deployer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# The standard name for this image is openshift/origin-deployer
1212
#
13-
FROM openshift/origin
13+
FROM openshift/origin-control-plane
1414

1515
LABEL io.k8s.display-name="OpenShift Origin Deployer" \
1616
io.k8s.description="This is a component of OpenShift Origin and executes the user deployment process to roll out new containers. It may be used as a base image for building your own custom deployer image." \

‎images/ipfailover/keepalived/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# ImageName: openshift/origin-keepalived-ipfailover
55
#
6-
FROM openshift/origin
6+
FROM openshift/origin-control-plane
77

88
RUN INSTALL_PKGS="kmod keepalived iproute psmisc nmap-ncat net-tools" && \
99
yum install -y $INSTALL_PKGS && \

‎images/node/Dockerfile

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,30 @@
11
#
2-
# This is an OpenShift Origin node image with integrated OpenvSwitch SDN
3-
# If you do not require OVS SDN use the openshift/origin image instead.
2+
# This is an OpenShift Origin node image with integrated OpenvSwitch SDN.
43
#
54
# This image expects to have a volume mounted at /etc/origin/node that contains
65
# a KUBECONFIG file giving the node permission to talk to the master and a
76
# node configuration file.
87
#
9-
# The standard name for this image is openshift/node
8+
# The standard name for this image is openshift/origin-node
109
#
11-
FROM openshift/origin
10+
FROM openshift/origin-control-plane
1211

1312
COPY scripts/* /usr/local/bin/
1413
COPY system-container/system-container-wrapper.sh /usr/local/bin/
1514
COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
1615

17-
RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \
16+
RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
1817
libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
1918
binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
2019
iscsi-initiator-utils bind-utils" && \
2120
yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
2221
rpm -V $INSTALL_PKGS && \
23-
yum clean all && \
24-
mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
25-
26-
# Copy the cni plugins to the host file system when they are present, so that they can be shared with cri-o
27-
RUN if test -e /opt/cni/bin; then mkdir -p /exports/hostfs/opt/cni/bin/ && cp -r /opt/cni/bin/* /exports/hostfs/opt/cni/bin/; fi
22+
yum clean all
2823

2924
LABEL io.k8s.display-name="OpenShift Origin Node" \
3025
io.k8s.description="This is a component of OpenShift Origin and contains the software for individual nodes when using SDN." \
3126
io.openshift.tags="openshift,node"
3227

33-
VOLUME /etc/origin/node
3428
ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
3529

3630
ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]

‎images/node/Dockerfile.centos7

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
11
#
22
# This is an OpenShift Origin node image with integrated OpenvSwitch SDN
3-
# If you do not require OVS SDN use the openshift/origin image instead.
43
#
5-
# This image expects to have a volume mounted at /etc/origin/node that contains
6-
# a KUBECONFIG file giving the node permission to talk to the master and a
7-
# node configuration file.
4+
# The standard name for this image is openshift/origin-node
85
#
9-
# The standard name for this image is openshift/node
10-
#
11-
FROM openshift/origin
6+
FROM openshift/origin-control-plane
127

138
COPY scripts/* /usr/local/bin/
149
COPY system-container/system-container-wrapper.sh /usr/local/bin/
1510
COPY system-container/manifest.json system-container/config.json.template system-container/service.template system-container/tmpfiles.template /exports/
1611

17-
RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools openvswitch \
12+
RUN INSTALL_PKGS="origin-sdn-ovs libmnl libnetfilter_conntrack conntrack-tools \
1813
libnfnetlink iptables iproute bridge-utils procps-ng ethtool socat openssl \
1914
binutils xz kmod-libs kmod sysvinit-tools device-mapper-libs dbus \
2015
iscsi-initiator-utils bind-utils" && \
2116
yum --enablerepo=origin-local-release install -y $INSTALL_PKGS && \
2217
rpm -V $INSTALL_PKGS && \
23-
yum clean all && \
24-
mkdir -p /usr/lib/systemd/system/origin-node.service.d /usr/lib/systemd/system/docker.service.d
25-
26-
# Copy the cni plugins to the host file system when they are present, so that they can be shared with cri-o
27-
RUN if test -e /opt/cni/bin; then mkdir -p /exports/hostfs/opt/cni/bin/ && cp -r /opt/cni/bin/* /exports/hostfs/opt/cni/bin/; fi
18+
yum clean all
2819

2920
LABEL io.k8s.display-name="OpenShift Origin Node" \
3021
io.k8s.description="This is a component of OpenShift Origin and contains the software for individual nodes when using SDN." \
3122
io.openshift.tags="openshift,node"
3223

33-
VOLUME /etc/origin/node
3424
ENV KUBECONFIG=/etc/origin/node/node.kubeconfig
3525

3626
ENTRYPOINT [ "/usr/local/bin/origin-node-run.sh" ]

‎images/observe/Dockerfile

-15
This file was deleted.

‎images/observe/OWNERS

-4
This file was deleted.

‎images/openvswitch/.cccp.yml

-1
This file was deleted.

‎images/openvswitch/Dockerfile

-25
This file was deleted.

‎images/openvswitch/OWNERS

-9
This file was deleted.

‎images/openvswitch/scripts/ovs-run.sh

-15
This file was deleted.

0 commit comments

Comments
 (0)