📂 Update openshift specific files.

Author: serverless-qe

Makefile

@@ -0,0 +1,11 @@
+generate:
+	./openshift/generate.sh
+.PHONY: generate
+
+generate-release: generate
+.PHONY: generate
+
+e2e-tests:
+	./openshift/install.sh
+	./openshift/e2e-tests.sh
+.PHONY: e2e-tests

OWNERS

@@ -1,11 +1,20 @@
+# The OWNERS file is used by prow to automatically merge approved PRs.
+
+# DO NOT EDIT! File generated via https://github.com/openshift-knative/hack/tree/main/config.
+
 approvers:
-  - technical-oversight-committee
-  - knative-release-leads
-  - eventing-wg-leads
-  - eventing-writers
+- aliok
+- Cali0707
+- creydr
+- Kaustubh-pande
+- lberk
+- matzew
+- rudyredhat1
+- twoGiants
 
-# Reviewers are suggested from the reviewers list first, then the approvers
-# list. To add reviewers while spreading the load among existing approvers,
-# copy the approvers to the reviewers list too.
-# reviewers:
-# TODO: fill in the owning WG
+reviewers:
+- aliok
+- Cali0707
+- creydr
+- lberk
+- matzew

OWNERS_ALIASES

@@ -1,197 +1,15 @@
-# This file is auto-generated from peribolos.
-# Do not modify this file, instead modify peribolos/knative-extensions.yaml
-
 aliases:
-  autoscaler-keda-approvers:
-  - skonto
-  backstage-plugins-reviewers:
-  - Leo6Leo
-  - aliok
-  - cali0707
-  - pierDipi
-  backstage-plugins-writers:
-  - Leo6Leo
+  eventing-approvers:
   - aliok
-  - cali0707
-  - pierDipi
-  client-wg-leads:
-  - dsimansk
-  client-writers:
-  - dsimansk
-  discovery-approvers:
-  - lberk
-  eventing-autoscaler-keda-approvers: []
-  eventing-awssqs-approvers:
-  - lberk
-  - matzew
-  eventing-ceph-approvers:
-  - lberk
-  - matzew
-  eventing-couchdb-approvers:
-  - lberk
-  - matzew
-  eventing-github-approvers:
-  - lberk
-  - matzew
-  eventing-gitlab-approvers:
-  - lberk
-  - matzew
-  eventing-kafka-approvers:
-  - aliok
-  - lberk
-  - matzew
-  - pierDipi
-  eventing-kafka-broker-approvers:
-  - aliok
-  - matzew
-  - pierDipi
-  eventing-kafka-broker-reviewers:
-  - Leo6Leo
-  - cali0707
-  eventing-kafka-writers: []
-  eventing-natss-approvers:
-  - astelmashenko
-  - dan-j
-  eventing-prometheus-approvers:
+  - creydr
   - lberk
   - matzew
-  eventing-rabbitmq-approvers:
-  - ikavgo
-  eventing-redis-approvers:
-  - aavarghese
-  - matzew
+  - mgencur
+  - pierdipi
+  - skonto
   eventing-reviewers:
-  - Leo6Leo
-  - cali0707
-  - creydr
-  eventing-wg-leads:
-  - creydr
-  - pierDipi
-  eventing-writers:
-  - Leo6Leo
   - aliok
-  - cali0707
   - creydr
+  - lberk
   - matzew
-  - pierDipi
-  func-tastic-approvers:
-  - lkingland
-  - matejvasek
-  - salaboy
-  functastic-writers:
-  - lkingland
-  - matejvasek
-  - matzew
-  - salaboy
-  function-runtime-approvers:
-  - lkingland
-  - matejvasek
-  - matzew
-  - salaboy
-  function-runtime-writers:
-  - lkingland
-  - matejvasek
-  - matzew
-  - salaboy
-  homebrew-kn-plugins-approvers:
-  - dsimansk
-  kn-plugin-admin-approvers:
-  - dsimansk
-  kn-plugin-event-approvers:
-  - cardil
-  kn-plugin-operator-approvers:
-  - dsimansk
-  - houshengbo
-  kn-plugin-quickstart-approvers:
-  - dsimansk
-  kn-plugin-sample-approvers:
-  - dsimansk
-  kn-plugin-service-log-approvers:
-  - dsimansk
-  kn-plugin-source-kafka-approvers:
-  - dsimansk
-  kn-plugin-source-kamelet-approvers:
-  - christophd
-  knative-admin:
-  - aliok
-  - arsenetar
-  - cardil
-  - dprotaso
-  - dsimansk
-  - evankanderson
-  - knative-automation
-  - knative-prow-releaser-robot
-  - knative-prow-robot
-  - knative-prow-updater-robot
-  - knative-test-reporter-robot
-  - matzew
-  - upodroid
-  knative-release-leads:
-  - dprotaso
-  - dsimansk
-  knative-robots:
-  - knative-automation
-  - knative-prow-releaser-robot
-  - knative-prow-robot
-  - knative-prow-updater-robot
-  - knative-test-reporter-robot
-  net-contour-approvers:
-  - dprotaso
-  net-gateway-api-approvers:
-  - dprotaso
-  net-istio-approvers:
-  - skonto
-  net-kourier-approvers:
-  - skonto
-  operations-wg-leads:
-  - houshengbo
-  operations-writers:
-  - dprotaso
-  - houshengbo
-  - upodroid
-  productivity-leads:
-  - cardil
-  - upodroid
-  productivity-wg-leads:
-  - cardil
-  - upodroid
-  productivity-writers:
-  - cardil
-  - upodroid
-  security-guard-approvers:
-  - davidhadas
-  security-wg-leads:
-  - davidhadas
-  - evankanderson
-  security-writers:
-  - davidhadas
-  - evankanderson
-  serving-approvers:
-  - dsimansk
-  - skonto
-  serving-reviewers:
-  - skonto
-  serving-triage:
-  - skonto
-  serving-wg-leads:
-  - dprotaso
-  serving-writers:
-  - dprotaso
-  - dsimansk
-  - skonto
-  steering-committee:
-  - aliok
-  - arsenetar
-  - dprotaso
-  - evankanderson
-  - matzew
-  ux-wg-leads:
-  - Leo6Leo
-  - cali0707
-  - mmejia02
-  - zainabhusain227
-  ux-writers:
-  - Leo6Leo
-  - cali0707
-  - mmejia02
-  - zainabhusain227
+  - pierdipi

openshift/ci-operator/build-image/Dockerfile

@@ -0,0 +1,26 @@
+# DO NOT EDIT! Generated Dockerfile.
+
+FROM registry.ci.openshift.org/ocp/4.19:cli-artifacts as tools
+
+# Dockerfile to bootstrap build and test in openshift-ci
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 as builder
+
+ARG TARGETARCH
+
+COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel9 /usr/bin/oc
+
+RUN ln -s /usr/bin/oc /usr/bin/kubectl
+
+RUN dnf install -y httpd-tools
+
+RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
+    chmod 700 ./get-helm-3
+
+RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
+
+RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
+RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/[email protected]
+
+# go install creates $GOPATH/.cache with root permissions, we delete it here
+# to avoid permission issues with the runtime users
+RUN rm -rf $GOPATH/.cache

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

@@ -0,0 +1,38 @@
+# DO NOT EDIT! Generated Dockerfile for cmd/controller.
+ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
+ARG GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
+
+FROM $GO_BUILDER as builder
+
+WORKDIR /workspace
+COPY . .
+
+ENV CGO_ENABLED=1
+ENV GOEXPERIMENT=strictfipsruntime
+
+RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/controller
+
+FROM $GO_RUNTIME
+
+ARG VERSION=knative-nightly
+
+COPY --from=builder /usr/bin/main /usr/bin/controller
+COPY LICENSE /licenses/
+
+USER 65532
+
+LABEL \
+      com.redhat.component="openshift-serverless-1-kn-eventing-istio-controller-rhel9-container" \
+      name="openshift-serverless-1/kn-eventing-istio-controller-rhel9" \
+      version=$VERSION \
+      summary="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
+      maintainer="[email protected]" \
+      description="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
+      io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
+      io.k8s.description="Red Hat OpenShift Serverless Eventing Istio Controller" \
+      io.openshift.tags="controller" \
+      vendor="Red Hat, Inc." \
+      release=$VERSION \
+      cpe="cpe:/a:redhat:openshift_serverless:::el9"
+
+ENTRYPOINT ["/usr/bin/controller"]

openshift/ci-operator/source-image/Dockerfile

@@ -0,0 +1,7 @@
+# DO NOT EDIT! Generated Dockerfile.
+
+FROM src
+
+RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh || true
+RUN chmod +x vendor/knative.dev/pkg/hack/generate-knative.sh || true
+RUN chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh || true

openshift/e2e-tests.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
+
+export SKIP_INITIALIZE=true
+export GOPATH=/tmp/go
+export GOCACHE=/tmp/go-cache
+export ARTIFACTS=${ARTIFACT_DIR:-$(mktemp -u -t -d)}
+
+"${repo_root_dir}/test/e2e-tests.sh"

openshift/generate.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
+
+release=$(yq r openshift/project.yaml project.tag)
+release=${release/knative/release}
+
+function resolve_resources(){
+  echo $@
+
+  local dir=$1
+  local resolved_file_name=$2
+
+  local version=${release/release-/}
+
+  echo "Writing resolved yaml to $resolved_file_name"
+
+  for yaml in "$dir"/*.yaml; do
+    echo "Resolving ${yaml}"
+
+    echo "---" >> "$resolved_file_name"
+
+    sed \
+        -e "s+eventing.knative.dev/release: devel+eventing.knative.dev/release: ${version}+" \
+        -e "s+app.kubernetes.io/version: devel+app.kubernetes.io/version: ${version}+" \
+        "$yaml" >> "$resolved_file_name"
+  done
+}
+
+"${repo_root_dir}/hack/update-deps.sh"
+
+GOFLAGS='' go run github.com/openshift-knative/hack/cmd/generate@latest \
+  --root-dir "${repo_root_dir}" \
+  --generators dockerfile \
+  --excludes "vendor.*" \
+  --excludes "third_party.*" \
+  --images-from eventing \
+  --images-from eventing-kafka-broker
+
+"$repo_root_dir/hack/update-codegen.sh"
+
+rm -rf "${repo_root_dir}/openshift/release/artifacts"
+mkdir -p "${repo_root_dir}/openshift/release/artifacts"
+resolve_resources "${repo_root_dir}/config/eventing-istio/roles" "${repo_root_dir}/openshift/release/artifacts/eventing-istio-controller.yaml"
+resolve_resources "${repo_root_dir}/config/eventing-istio/controller" "${repo_root_dir}/openshift/release/artifacts/eventing-istio-controller.yaml"