Skip to content

Commit c0ffe7f

Browse files
committed
UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
1 parent ac375b5 commit c0ffe7f

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

openshift-hack/images/installer-kube-apiserver-artifacts/Dockerfile.rhel

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
# the kube-apiserver layered on top of the cluster-native Linux installer image.
33
# The resulting image is used to build the openshift-install binary.
44

5-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macbuilder
5+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macbuilder
66
ARG TAGS=""
77
WORKDIR /go/src/k8s.io/kubernetes
88
COPY . .
99
ENV KUBE_BUILD_PLATFORMS=darwin/amd64
1010
ENV KUBE_STATIC_OVERRIDES=kube-apiserver
1111
RUN make WHAT='cmd/kube-apiserver'
1212

13-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS macarmbuilder
13+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS macarmbuilder
1414
ARG TAGS=""
1515
WORKDIR /go/src/k8s.io/kubernetes
1616
COPY . .
1717
ENV KUBE_BUILD_PLATFORMS=darwin/arm64
1818
ENV KUBE_STATIC_OVERRIDES=kube-apiserver
1919
RUN make WHAT='cmd/kube-apiserver'
2020

21-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxbuilder
21+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxbuilder
2222
ARG TAGS=""
2323
WORKDIR /go/src/k8s.io/kubernetes
2424
COPY . .
@@ -27,7 +27,7 @@ ENV KUBE_BUILD_PLATFORMS=linux/amd64
2727
ENV KUBE_STATIC_OVERRIDES=kube-apiserver
2828
RUN make WHAT='cmd/kube-apiserver'
2929

30-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS linuxarmbuilder
30+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS linuxarmbuilder
3131
ARG TAGS=""
3232
WORKDIR /go/src/k8s.io/kubernetes
3333
COPY . .
@@ -36,15 +36,15 @@ ENV KUBE_BUILD_PLATFORMS=linux/arm64
3636
ENV KUBE_STATIC_OVERRIDES=kube-apiserver
3737
RUN make WHAT='cmd/kube-apiserver'
3838

39-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
39+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
4040
ARG TAGS=""
4141
WORKDIR /go/src/k8s.io/kubernetes
4242
COPY . .
4343
ENV GO_COMPLIANCE_EXCLUDE=".*"
4444
ENV KUBE_STATIC_OVERRIDES=kube-apiserver
4545
RUN make WHAT='cmd/kube-apiserver'
4646

47-
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
47+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
4848
COPY --from=macbuilder /go/src/k8s.io/kubernetes/_output/local/bin/darwin/amd64/kube-apiserver /usr/share/openshift/darwin/amd64/kube-apiserver
4949
COPY --from=macarmbuilder /go/src/k8s.io/kubernetes/_output/local/bin/darwin/arm64/kube-apiserver /usr/share/openshift/darwin/arm64/kube-apiserver
5050
COPY --from=linuxbuilder /go/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/kube-apiserver /usr/share/openshift/linux/amd64/kube-apiserver

openshift-hack/images/kube-proxy/Dockerfile.rhel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 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-proxy' && \
55
mkdir -p /tmp/build && \
66
cp /go/src/k8s.io/kubernetes/_output/local/bin/linux/$(go env GOARCH)/kube-proxy /tmp/build
77

8-
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
99
RUN INSTALL_PKGS="conntrack-tools iptables nftables" && \
1010
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
1111
yum clean all && rm -rf /var/cache/*

0 commit comments

Comments
 (0)