Skip to content

Commit 4464d84

Browse files
smarterclaytonsmarterclayton
committed
Create a hyperkube and hypershift image and RPMs
Remove both binaries from the origin binary. Future images will depend on these instead of openshift-control-plane.
1 parent 0d964fa commit 4464d84

File tree

13 files changed

+101
-59
lines changed

13 files changed

+101
-59
lines changed

‎hack/lib/constants.sh‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ readonly OS_ALL_IMAGES=(
311311
origin-pod
312312
origin-base
313313
origin-cli
314+
origin-hypershift
315+
origin-hyperkube
314316
origin-control-plane
315317
origin-node
316318
origin-deployer
@@ -347,16 +349,18 @@ function os::build::images() {
347349
( os::build::image "${tag_prefix}-cli" images/cli ) &
348350

349351
# images that depend on "${tag_prefix}-base" or "${tag_prefix}-cli"
350-
( os::build::image "${tag_prefix}-control-plane" images/origin ) &
351-
( os::build::image "${tag_prefix}-egress-router" images/egress/router ) &
352-
( os::build::image "${tag_prefix}-egress-http-proxy" images/egress/http-proxy ) &
353-
( os::build::image "${tag_prefix}-egress-dns-proxy" images/egress/dns-proxy ) &
352+
( os::build::image "${tag_prefix}-hyperkube" images/hyperkube ) &
353+
( os::build::image "${tag_prefix}-hypershift" images/hypershift ) &
354+
( os::build::image "${tag_prefix}-control-plane" images/origin ) &
355+
( os::build::image "${tag_prefix}-egress-router" images/egress/router ) &
356+
( os::build::image "${tag_prefix}-egress-http-proxy" images/egress/http-proxy ) &
357+
( os::build::image "${tag_prefix}-egress-dns-proxy" images/egress/dns-proxy ) &
358+
( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
354359

355360
for i in `jobs -p`; do wait $i; done
356361

357-
# images that depend on "${tag_prefix}-control-plane
362+
# images that depend on "${tag_prefix}-control-plane"
358363
( os::build::image "${tag_prefix}-haproxy-router" images/router/haproxy ) &
359-
( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
360364
( os::build::image "${tag_prefix}-deployer" images/deployer ) &
361365
( os::build::image "${tag_prefix}-recycler" images/recycler ) &
362366
( os::build::image "${tag_prefix}-docker-builder" images/builder/docker/docker-builder ) &

‎images/hyperkube/.cccp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
job-id: origin-hyperkube

‎images/hyperkube/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# This is the official OpenShift CLI image. It can be used to get a CLI environment
3+
# for OpenShift.
4+
#
5+
# The standard name for this image is openshift/origin-hyperkube
6+
#
7+
FROM openshift/origin-base
8+
9+
RUN INSTALL_PKGS="origin-hyperkube" && \
10+
yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
11+
rpm -V ${INSTALL_PKGS} && \
12+
yum clean all
13+
14+
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
15+
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
16+
io.openshift.tags="openshift,hyperkube"

‎images/hyperkube/OWNERS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
reviewers:
2+
- smarterclayton
3+
- stevekuznetsov
4+
- sdodson
5+
approvers:
6+
- smarterclayton
7+
- kargakis
8+
- stevekuznetsov

‎images/hyperkube/bin/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

‎images/hypershift/.cccp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
job-id: origin-hyperkube

‎images/hypershift/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# This is the official OpenShift CLI image. It can be used to get a CLI environment
3+
# for OpenShift.
4+
#
5+
# The standard name for this image is openshift/origin-hypershift
6+
#
7+
FROM openshift/origin-base
8+
9+
RUN INSTALL_PKGS="origin-hypershift" && \
10+
yum --enablerepo=origin-local-release install -y ${INSTALL_PKGS} && \
11+
rpm -V ${INSTALL_PKGS} && \
12+
yum clean all
13+
14+
LABEL io.k8s.display-name="OpenShift Server Commands" \
15+
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
16+
io.openshift.tags="openshift,hypershift"

‎images/hypershift/OWNERS‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
reviewers:
2+
- smarterclayton
3+
- stevekuznetsov
4+
- sdodson
5+
approvers:
6+
- smarterclayton
7+
- kargakis
8+
- stevekuznetsov

‎images/hypershift/bin/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

‎images/ipfailover/keepalived/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#
2-
# VIP failover monitoring container for OpenShift Origin.
2+
# VIP failover monitoring container for OpenShift.
33
#
44
# ImageName: openshift/origin-keepalived-ipfailover
55
#
6-
FROM openshift/origin-control-plane
6+
FROM openshift/origin-base
77

88
RUN INSTALL_PKGS="kmod keepalived iproute psmisc nmap-ncat net-tools ipset ipset-libs" && \
99
yum install -y $INSTALL_PKGS && \
1010
rpm -V $INSTALL_PKGS && \
1111
yum clean all
1212
COPY . /var/lib/ipfailover/keepalived/
1313

14-
LABEL io.k8s.display-name="OpenShift Origin IP Failover" \
15-
io.k8s.description="This is a component of OpenShift Origin and runs a clustered keepalived instance across multiple hosts to allow highly available IP addresses." \
14+
LABEL io.k8s.display-name="OpenShift IP Failover" \
15+
io.k8s.description="This is a component of OpenShift and runs a clustered keepalived instance across multiple hosts to allow highly available IP addresses." \
1616
io.openshift.tags="openshift,ha,ip,failover"
1717
EXPOSE 1985
1818
WORKDIR /var/lib/ipfailover

0 commit comments

Comments
 (0)