Skip to content

Commit ed1b540

Browse files
dsimanskdsimansk
authored
[release-v1.20] Add generator scripts (#877)
1 parent 8d4d475 commit ed1b540

File tree

19 files changed

+688
-211
lines changed

19 files changed

+688
-211
lines changed

‎openshift/ci-operator/build-image/Dockerfile‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# DO NOT EDIT! Generated Dockerfile.
22

3-
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
3+
FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
44

55
# Dockerfile to bootstrap build and test in openshift-ci
6-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.23-openshift-4.19 as builder
6+
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 as builder
77

88
ARG TARGETARCH
99

10-
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
1111

1212
RUN ln -s /usr/bin/oc /usr/bin/kubectl
1313

14-
RUN yum install -y httpd-tools
14+
RUN dnf install -y httpd-tools
1515

1616
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
1717
chmod 700 ./get-helm-3

‎openshift/ci-operator/build-image/kubernetes.repo‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎openshift/ci-operator/generate-ci-config.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ base_images:
3030
base:
3131
name: ubi-minimal
3232
namespace: ocp
33-
tag: "8"
33+
tag: "9"
3434
binary_build_commands: |
3535
TAG=${tag} make install
3636
TAG=${tag} make build-cross

‎openshift/ci-operator/knative-images/cli-artifacts/Dockerfile‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Not generated yet!
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
4+
5+
# ---------- BUILD STAGE ----------
6+
FROM $GO_BUILDER AS builder
7+
WORKDIR /workspace
8+
# Allow copying from higher directory when context is limited
9+
COPY . .
10+
ENV TAG="v1.20.0"
11+
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:a05d68ed4c6852177cf76d50064d489165acbe291e4dff499ed4b77c605f8b42
12+
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:720c9d42f5af97557f01be26f84515489f3cbe5c34c87fd40a123c1a7c2b627b
13+
# Build binaries
14+
# RUN make build-cross-package
15+
RUN ./hack/build.sh -p linux amd64
16+
RUN ./hack/build.sh -p linux ppc64le
17+
RUN ./hack/build.sh -p linux s390x
18+
RUN ./hack/build.sh -p linux arm64
19+
RUN ./hack/build.sh -p darwin amd64
20+
RUN ./hack/build.sh -p darwin arm64
21+
RUN ./hack/build.sh -p windows amd64
22+
23+
RUN chmod +x kn-linux-amd64 kn-linux-ppc64le kn-linux-s390x kn-windows-amd64.exe kn-darwin-amd64 kn-linux-arm64 kn-darwin-arm64
24+
25+
## ---------- PACKAGING STAGE ----------
26+
RUN dnf install -y tar zip
27+
28+
RUN tar --transform='flags=r;s|kn-linux-amd64|kn|' -zcf kn-linux-amd64.tar.gz kn-linux-amd64 LICENSE \
29+
&& tar --transform='flags=r;s|kn-linux-ppc64le|kn|' -zcf kn-linux-ppc64le.tar.gz kn-linux-ppc64le LICENSE \
30+
&& tar --transform='flags=r;s|kn-linux-s390x|kn|' -zcf kn-linux-s390x.tar.gz kn-linux-s390x LICENSE \
31+
&& tar --transform='flags=r;s|kn-darwin-amd64|kn|' -zcf kn-macos-amd64.tar.gz kn-darwin-amd64 LICENSE \
32+
&& tar --transform='flags=r;s|kn-linux-arm64|kn|' -zcf kn-linux-arm64.tar.gz kn-linux-arm64 LICENSE \
33+
&& tar --transform='flags=r;s|kn-darwin-arm64|kn|' -zcf kn-macos-arm64.tar.gz kn-darwin-arm64 LICENSE
34+
35+
RUN mkdir "windows" && mv kn-windows-amd64.exe ./windows/kn.exe && cp LICENSE ./windows/ && zip --quiet --junk-path - windows/* > kn-windows-amd64.zip
36+
37+
# ---------- FINAL RUNTIME IMAGE ----------
38+
FROM $GO_RUNTIME
39+
RUN mkdir -p /usr/share/kn/{linux_amd64,linux_arm64,linux_ppc64le,linux_s390x,macos_amd64,macos_arm64,windows}
40+
41+
COPY --from=builder /workspace/kn-linux-amd64.tar.gz /usr/share/kn/linux_amd64/
42+
COPY --from=builder /workspace/kn-linux-ppc64le.tar.gz /usr/share/kn/linux_ppc64le/
43+
COPY --from=builder /workspace/kn-linux-s390x.tar.gz /usr/share/kn/linux_s390x/
44+
COPY --from=builder /workspace/kn-macos-amd64.tar.gz /usr/share/kn/macos_amd64/
45+
COPY --from=builder /workspace/kn-windows-amd64.zip /usr/share/kn/windows/
46+
COPY --from=builder /workspace/kn-linux-arm64.tar.gz /usr/share/kn/linux_arm64/
47+
COPY --from=builder /workspace/kn-macos-arm64.tar.gz /usr/share/kn/macos_arm64/
48+
COPY --from=builder /workspace/LICENSE /licenses/
49+
50+
USER 65532
51+
52+
LABEL \
53+
com.redhat.component="openshift-serverless-1-client-cli-artifacts-rhel9-container" \
54+
name="openshift-serverless-1/kn-client-cli-artifacts-rhel9" \
55+
version=$VERSION \
56+
summary="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
57+
maintainer="[email protected]" \
58+
description="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
59+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
60+
io.k8s.description="Red Hat OpenShift Serverless Client Cli Artifacts" \
61+
io.openshift.tags="cli-artifacts" \
62+
release=$VERSION \
63+
vendor="Red Hat, Inc." \
64+
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"

‎openshift/ci-operator/knative-images/client/Dockerfile‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎openshift/ci-operator/knative-images/client/Dockerfile.cliartifacts‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎openshift/ci-operator/knative-images/kn/Dockerfile‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# DO NOT EDIT! Generated Dockerfile for cmd/kn.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
4+
5+
FROM $GO_BUILDER as builder
6+
7+
WORKDIR /workspace
8+
COPY . .
9+
10+
ENV CGO_ENABLED=1
11+
ENV GOEXPERIMENT=strictfipsruntime
12+
ENV GOFLAGS='-mod=mod'
13+
14+
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel9@sha256:a05d68ed4c6852177cf76d50064d489165acbe291e4dff499ed4b77c605f8b42
15+
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel9@sha256:720c9d42f5af97557f01be26f84515489f3cbe5c34c87fd40a123c1a7c2b627b
16+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
17+
18+
FROM $GO_RUNTIME
19+
20+
ARG VERSION=knative-v1.20
21+
22+
COPY --from=builder /usr/bin/main /ko-app/kn
23+
COPY LICENSE /licenses/
24+
25+
USER 65532
26+
27+
LABEL \
28+
com.redhat.component="openshift-serverless-1-kn-client-kn-rhel9-container" \
29+
name="openshift-serverless-1/kn-client-kn-rhel9" \
30+
version=$VERSION \
31+
summary="Red Hat OpenShift Serverless 1 Client Kn" \
32+
maintainer="[email protected]" \
33+
description="Red Hat OpenShift Serverless 1 Client Kn" \
34+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \
35+
io.k8s.description="Red Hat OpenShift Serverless Client Kn" \
36+
io.openshift.tags="kn" \
37+
vendor="Red Hat, Inc." \
38+
release=$VERSION \
39+
cpe="cpe:/a:redhat:openshift_serverless:1.40::el9"
40+
41+
ENTRYPOINT ["/ko-app/kn"]

‎openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile‎

100644100755
Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
1-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/grpc-ping.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
4+
5+
FROM $GO_BUILDER as builder
6+
7+
WORKDIR /workspace
8+
COPY . .
9+
10+
ENV CGO_ENABLED=1
11+
ENV GOEXPERIMENT=strictfipsruntime
12+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/serving/test/test_images/grpc-ping
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/grpc-ping
20+
COPY LICENSE /licenses/
21+
222
USER 65532
323

4-
ADD grpc-ping /ko-app/grpc-ping
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-grpc-ping-rhel9-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-grpc-ping-rhel9" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-grpc-ping" \
34+
vendor="Red Hat, Inc." \
35+
release=$VERSION \
36+
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
537

6-
ENTRYPOINT ["/ko-app/grpc-ping"]
38+
ENTRYPOINT ["/ko-app/grpc-ping"]

‎openshift/ci-operator/knative-test-images/helloworld/Dockerfile‎

100644100755
Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
1-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for test/test_images/helloworld.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
4+
5+
FROM $GO_BUILDER as builder
6+
7+
WORKDIR /workspace
8+
COPY . .
9+
10+
ENV CGO_ENABLED=1
11+
ENV GOEXPERIMENT=strictfipsruntime
12+
ENV GOFLAGS='-mod=mod'
13+
14+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/helloworld
15+
16+
FROM $GO_RUNTIME
17+
18+
ARG VERSION=knative-v1.20
19+
20+
COPY --from=builder /usr/bin/main /ko-app/helloworld
21+
COPY LICENSE /licenses/
22+
223
USER 65532
324

4-
ADD helloworld /ko-app/helloworld
25+
LABEL \
26+
com.redhat.component="openshift-serverless-1-client-test-test-images-helloworld-rhel9-container" \
27+
name="openshift-serverless-1/client-test-test-images-helloworld-rhel9" \
28+
version=$VERSION \
29+
summary="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
30+
maintainer="[email protected]" \
31+
description="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
32+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
33+
io.k8s.description="Red Hat OpenShift Serverless Client Test Test Images Helloworld" \
34+
io.openshift.tags="test-test-images-helloworld" \
35+
vendor="Red Hat, Inc." \
36+
release=$VERSION \
37+
cpe="cpe:/a:redhat:openshift_serverless:1.40::el9"
538

6-
ENTRYPOINT ["/ko-app/helloworld"]
39+
ENTRYPOINT ["/ko-app/helloworld"]

‎openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile‎

100644100755
Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,38 @@
1-
# Do not edit! This file was generated via Makefile
2-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
4+
5+
FROM $GO_BUILDER as builder
6+
7+
WORKDIR /workspace
8+
COPY . .
9+
10+
ENV CGO_ENABLED=1
11+
ENV GOEXPERIMENT=strictfipsruntime
12+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/servingcontainer
20+
COPY LICENSE /licenses/
21+
322
USER 65532
423

5-
ADD servingcontainer /ko-app/servingcontainer
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer-rhel9-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer-rhel9" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer" \
34+
vendor="Red Hat, Inc." \
35+
release=$VERSION \
36+
cpe="cpe:/a:redhat:openshift_serverless:1.37::el9"
37+
638
ENTRYPOINT ["/ko-app/servingcontainer"]

0 commit comments

Comments
 (0)