Skip to content

Commit 09050a3

Browse files
authored
Readd vendor (#542)
1 parent 17b0730 commit 09050a3

File tree

6,223 files changed

+1743717
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,223 files changed

+1743717
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
CGO_ENABLED=0
1818
GOOS ?=
1919
GOARCH ?=
20-
TEST_IMAGES=./test/test_images/helloworld knative.dev/serving/test/test_images/grpc-ping knative.dev/serving/test/test_images/multicontainer/servingcontainer knative.dev/serving/test/test_images/multicontainer/sidecarcontainer
20+
TEST_IMAGES=./test/test_images/helloworld ./vendor/knative.dev/serving/test/test_images/grpc-ping ./vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer ./vendor/knative.dev/serving/test/test_images/multicontainer/sidecarcontainer
2121
TEST=
2222
TEST_IMAGE_TAG ?= latest
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ COPY . .
1010
ENV CGO_ENABLED=1
1111
ENV GOEXPERIMENT=strictfipsruntime
1212

13-
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:63fbd304ffb93e5883b987ac90a476cd9ff9946f164ca8acb9c1a95fee84bcb3
14-
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:1d2a8b786bd09301530d37440ce6501527cfd511ba78d97da5eda952a6558ebe
13+
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:ec396c2f94a67e7831eec687c7b34e274798d46d41d575acab740d42d332dfb1
14+
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:1ed5e830ea5f3c84bbedebc5be6e33690114efe0c723dbf262896902753c6930
1515
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
1616

1717
FROM $GO_RUNTIME
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
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-8-release-golang-1.22-openshift-4.17
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/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.16
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-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-grpc-ping-rhel8" \
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"
534

6-
ENTRYPOINT ["/ko-app/grpc-ping"]
35+
ENTRYPOINT ["/ko-app/grpc-ping"]
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
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-8-release-golang-1.22-openshift-4.17
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/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.16
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-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer-rhel8" \
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+
635
ENTRYPOINT ["/ko-app/servingcontainer"]
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
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/sidecarcontainer.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/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/sidecarcontainer
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.16
18+
19+
COPY --from=builder /usr/bin/main /ko-app/sidecarcontainer
20+
COPY LICENSE /licenses/
21+
322
USER 65532
423

5-
ADD sidecarcontainer /ko-app/sidecarcontainer
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer"
34+
635
ENTRYPOINT ["/ko-app/sidecarcontainer"]

openshift/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ install_generate_hack_tool || exit 1
2121
--root-dir "${repo_root_dir}" \
2222
--generators dockerfile \
2323
--app-file-fmt "/ko-app/%s" \
24+
--excludes ".*k8s\\.io.*" \
25+
--excludes ".*knative.dev/pkg/codegen.*" \
26+
--excludes ".*knative.dev/hack/cmd/script.*" \
2427
--dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"
2528

2629
#git apply $repo_root_dir/openshift/dockerfile.patch

openshift/images.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
knative.dev/client/cmd/kn: registry.ci.openshift.org/openshift/knative-client-kn:knative-v1.16
22
knative.dev/client/test/test_images/helloworld: registry.ci.openshift.org/openshift/knative-client-test-helloworld:knative-v1.16
3+
knative.dev/serving/test/test_images/grpc-ping: registry.ci.openshift.org/openshift/knative-client-test-grpc-ping:knative-v1.16
4+
knative.dev/serving/test/test_images/multicontainer/servingcontainer: registry.ci.openshift.org/openshift/knative-client-test-servingcontainer:knative-v1.16
5+
knative.dev/serving/test/test_images/multicontainer/sidecarcontainer: registry.ci.openshift.org/openshift/knative-client-test-sidecarcontainer:knative-v1.16

vendor/contrib.go.opencensus.io/exporter/ocagent/.gitignore

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/contrib.go.opencensus.io/exporter/ocagent/.travis.yml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)