remove ES performance tests and patches (#917)

Makefile

@@ -30,14 +30,6 @@ test-e2e:
 	./openshift/e2e-tests.sh
 .PHONY: test-e2e
 
-perf-tests:
-	export ES_DEVELOPMENT=true && \
-	export ES_HOST_PORT=search-perfscale-dev-chmf5l4sh66lvxbnadi4bznl3a.us-west-2.es.amazonaws.com && \
-	export USE_OPEN_SEARCH=true && \
-	export SYSTEM_NAMESPACE=knative-serving && \
-	./openshift/perf-tests.sh
-.PHONY: perf-tests
-
 test-e2e-tls:
 	ENABLE_TLS="true" ./openshift/e2e-tests.sh
 .PHONY: test-e2e-tls

openshift/ci-operator/knative-perf-images/dataplane-probe/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/dataplane-probe.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/dataplane-probe
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/dataplane-probe
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/dataplane-probe /ko-app/dataplane-probe
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-dataplane-probe-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-dataplane-probe-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Dataplane Probe" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Dataplane Probe" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Dataplane Probe" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Dataplane Probe" \
+      io.openshift.tags="test-performance-benchmarks-dataplane-probe"
+
 ENTRYPOINT ["/ko-app/dataplane-probe"]

openshift/ci-operator/knative-perf-images/load-test/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/load-test.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/load-test
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/load-test
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/load-test /ko-app/load-test
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-load-test-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-load-test-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Load Test" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Load Test" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Load Test" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Load Test" \
+      io.openshift.tags="test-performance-benchmarks-load-test"
+
 ENTRYPOINT ["/ko-app/load-test"]

openshift/ci-operator/knative-perf-images/real-traffic-test/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/real-traffic-test.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/real-traffic-test
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/real-traffic-test
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/real-traffic-test /ko-app/real-traffic-test
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-real-traffic-test-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-real-traffic-test-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Real Traffic Test" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Real Traffic Test" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Real Traffic Test" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Real Traffic Test" \
+      io.openshift.tags="test-performance-benchmarks-real-traffic-test"
+
 ENTRYPOINT ["/ko-app/real-traffic-test"]

openshift/ci-operator/knative-perf-images/reconciliation-delay/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/reconciliation-delay.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/reconciliation-delay
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/reconciliation-delay
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/reconciliation-delay /ko-app/reconciliation-delay
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-reconciliation-delay-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-reconciliation-delay-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Reconciliation Delay" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Reconciliation Delay" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Reconciliation Delay" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Reconciliation Delay" \
+      io.openshift.tags="test-performance-benchmarks-reconciliation-delay"
+
 ENTRYPOINT ["/ko-app/reconciliation-delay"]

openshift/ci-operator/knative-perf-images/rollout-probe/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/rollout-probe.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/rollout-probe
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/rollout-probe
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/rollout-probe /ko-app/rollout-probe
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-rollout-probe-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-rollout-probe-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Rollout Probe" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Rollout Probe" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Rollout Probe" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Rollout Probe" \
+      io.openshift.tags="test-performance-benchmarks-rollout-probe"
+
 ENTRYPOINT ["/ko-app/rollout-probe"]

openshift/ci-operator/knative-perf-images/scale-from-zero/Dockerfile

@@ -1,13 +1,33 @@
-# Do not edit! This file was generated via Makefile
-FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
+# DO NOT EDIT! Generated Dockerfile for test/performance/benchmarks/scale-from-zero.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
+ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
+
+FROM $GO_BUILDER as builder
 
 COPY . .
 
-RUN ./openshift/in-docker-patch.sh
-RUN make perf-install
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/performance/benchmarks/scale-from-zero
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-v1.15
+
+COPY --from=builder /usr/bin/main /ko-app/scale-from-zero
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal
 USER 65532
 
-COPY --from=builder /go/bin/scale-from-zero /ko-app/scale-from-zero
+LABEL \
+      com.redhat.component="openshift-serverless-1-serving-test-performance-benchmarks-scale-from-zero-rhel8-container" \
+      name="openshift-serverless-1/serving-test-performance-benchmarks-scale-from-zero-rhel8" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Scale From Zero" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Scale From Zero" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Serving Test Performance Benchmarks Scale From Zero" \
+      io.k8s.description="Red Hat OpenShift Serverless Serving Test Performance Benchmarks Scale From Zero" \
+      io.openshift.tags="test-performance-benchmarks-scale-from-zero"
+
 ENTRYPOINT ["/ko-app/scale-from-zero"]

openshift/generate.sh

@@ -16,5 +16,18 @@ rm -rf "$tmp_dir"
 $(go env GOPATH)/bin/generate \
   --root-dir "${repo_root_dir}" \
   --generators dockerfile \
+  --dockerfile-test-dir "ci-operator/knative-perf-images" \
   --app-file-fmt "/ko-app/%s" \
+  --includes "test/performance/benchmarks.*" \
   --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"
+
+mv "${repo_root_dir}"/openshift/images.yaml "${repo_root_dir}"/openshift/images.yaml.bak
+
+$(go env GOPATH)/bin/generate \
+  --root-dir "${repo_root_dir}" \
+  --generators dockerfile \
+  --app-file-fmt "/ko-app/%s" \
+  --dockerfile-image-builder-fmt "registry.ci.openshift.org/openshift/release:rhel-8-release-golang-%s-openshift-4.17"
+
+cat "${repo_root_dir}"/openshift/images.yaml.bak >> "${repo_root_dir}"/openshift/images.yaml
+rm "${repo_root_dir}"/openshift/images.yaml.bak

openshift/images.yaml

@@ -26,3 +26,9 @@ knative.dev/serving/test/test_images/slowstart: registry.ci.openshift.org/opensh
 knative.dev/serving/test/test_images/timeout: registry.ci.openshift.org/openshift/knative-serving-test-timeout:knative-v1.15
 knative.dev/serving/test/test_images/volumes: registry.ci.openshift.org/openshift/knative-serving-test-volumes:knative-v1.15
 knative.dev/serving/test/test_images/wsserver: registry.ci.openshift.org/openshift/knative-serving-test-wsserver:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/dataplane-probe: registry.ci.openshift.org/openshift/knative-serving-test-dataplane-probe:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/load-test: registry.ci.openshift.org/openshift/knative-serving-test-load-test:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/real-traffic-test: registry.ci.openshift.org/openshift/knative-serving-test-real-traffic-test:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/reconciliation-delay: registry.ci.openshift.org/openshift/knative-serving-test-reconciliation-delay:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/rollout-probe: registry.ci.openshift.org/openshift/knative-serving-test-rollout-probe:knative-v1.15
+knative.dev/serving/test/performance/benchmarks/scale-from-zero: registry.ci.openshift.org/openshift/knative-serving-test-scale-from-zero:knative-v1.15