Skip to content

Commit ab2ebb0

Browse files
committed
UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
1 parent 3afcece commit ab2ebb0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.22-openshift-4.18
4+
tag: rhel-9-release-golang-1.23-openshift-4.19

build/pause/Dockerfile.Rhel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/github.com/openshift/kubernetes/build/pause
33
COPY . .
44
RUN mkdir -p bin && \
55
gcc -Os -Wall -Werror -o bin/pause ./linux/pause.c
66

7-
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
7+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
88
COPY --from=builder /go/src/github.com/openshift/kubernetes/build/pause/bin/pause /usr/bin/pod
99
LABEL io.k8s.display-name="OpenShift Pod" \
1010
io.k8s.description="This is a component of OpenShift and contains the binary that holds the pod namespaces." \

openshift-hack/images/hyperkube/Dockerfile.rhel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/k8s.io/kubernetes
33
COPY . .
44
RUN make WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler cmd/kubelet cmd/watch-termination openshift-hack/cmd/k8s-tests openshift-hack/cmd/k8s-tests-ext' && \
@@ -8,7 +8,7 @@ RUN make WHAT='cmd/kube-apiserver cmd/kube-controller-manager cmd/kube-scheduler
88
/tmp/build && \
99
gzip /tmp/build/k8s-tests-ext
1010

11-
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
11+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
1212
RUN yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False iproute && yum clean all
1313
COPY --from=builder /tmp/build/* /usr/bin/
1414
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \

openshift-hack/images/tests/Dockerfile.rhel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
22
WORKDIR /go/src/k8s.io/kubernetes
33
COPY . .
44
RUN make WHAT=openshift-hack/e2e/k8s-e2e.test; \
@@ -9,7 +9,7 @@ RUN make WHAT=openshift-hack/e2e/k8s-e2e.test; \
99
cp /go/src/k8s.io/kubernetes/openshift-hack/test-kubernetes-e2e.sh /tmp/build/; \
1010
cp /go/src/k8s.io/kubernetes/openshift-hack/images/kube-proxy/test-kube-proxy.sh /tmp/build/
1111

12-
FROM registry.ci.openshift.org/ocp/4.18:tools
12+
FROM registry.ci.openshift.org/ocp/4.19:tools
1313
COPY --from=builder /tmp/build/k8s-e2e.test /usr/bin/
1414
COPY --from=builder /tmp/build/ginkgo /usr/bin/
1515
COPY --from=builder /tmp/build/test-kubernetes-e2e.sh /usr/bin/

0 commit comments

Comments
 (0)