openshift · matzew · Apr 27, 2020 · Apr 27, 2020 · Apr 24, 2020
diff --git a/Makefile b/Makefile
@@ -0,0 +1,52 @@
+#This makefile is used by ci-operator
+
+CGO_ENABLED=0
+GOOS=linux
+CORE_IMAGES=$(shell find ./cmd -name main.go ! -path "./cmd/broker/*" ! -path "./cmd/mtbroker/*" | sed 's/main.go//')
+TEST_IMAGES=$(shell find ./test/test_images -mindepth 1 -maxdepth 1 -type d)
+
+# Guess location of openshift/release repo. NOTE: override this if it is not correct.
+OPENSHIFT=${CURDIR}/../../github.com/openshift/release
+
+install:
+	go install $(CORE_IMAGES)
+	go build -o $(GOPATH)/bin/broker_ingress ./cmd/broker/ingress/
+	go build -o $(GOPATH)/bin/broker_filter ./cmd/broker/filter/
+	go build -o $(GOPATH)/bin/mtbroker_ingress ./cmd/mtbroker/ingress/
+	go build -o $(GOPATH)/bin/mtbroker_filter ./cmd/mtbroker/filter/
+.PHONY: install
+
+test-install:
+	go install $(TEST_IMAGES)
+.PHONY: test-install
+
+test-e2e:
+	sh openshift/e2e-tests-openshift.sh
+.PHONY: test-e2e
+
+test-origin-conformance:
+	sh TEST_ORIGIN_CONFORMANCE=true openshift/e2e-tests-openshift.sh
+.PHONY: test-origin-conformance
+
+# Generate Dockerfiles used by ci-operator. The files need to be committed manually.
+generate-dockerfiles:
+	rm -rf openshift/ci-operator/knative-images/*
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-images $(CORE_IMAGES)
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-images broker_ingress
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-images broker_filter
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-images mtbroker_ingress
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-images mtbroker_filter
+	rm -rf openshift/ci-operator/knative-test-images/*
+	./openshift/ci-operator/generate-dockerfiles.sh openshift/ci-operator/knative-test-images $(TEST_IMAGES)
+.PHONY: generate-dockerfiles
+
+# Generate an aggregated knative yaml file with replaced image references
+generate-release:
+	./openshift/release/generate-release.sh $(RELEASE)
+.PHONY: generate-release
+
+# Update CI configuration in the $(OPENSHIFT) directory.
+# NOTE: Makes changes outside this repository.
+update-ci:
+	sh ./openshift/ci-operator/update-ci.sh $(OPENSHIFT) $(CORE_IMAGES)
+.PHONY: update-ci
diff --git a/OWNERS b/OWNERS
@@ -1,29 +1,8 @@
-# Approvers in this repo should also be added to the eventing-contrib
-# approvers list.
+# The OWNERS file is used by prow to automatically merge approved PRs.
+
 approvers:
-- evankanderson
-- grantr
-- Harwayne
-- vaikas
-- n3wscott
-- matzew
-- nachocano
-- lionelvillard
+- eventing-approvers
 
-# 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:
-- evankanderson
-- grantr
-- Harwayne
-- vaikas
-- n3wscott
-- matzew
-- nachocano
-- lionelvillard
-# Add reviewers below
-- liu-cong
-- yolocs
-- aslom
-- lberk
+- eventing-reviewers
+
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -1,24 +1,25 @@
 aliases:
-  # These aliases are for OWNERS of the various Channel implementations. These
-  # Are in addition to the repo level OWNERS.
-
-  performance-approvers:
-  - chaodaiG
-  - chizhg
-  - slinkydeveloper
-  performance-reviewers:
-  - chaodaiG
-  - chizhg
-  - slinkydeveloper
-
-  productivity-approvers:
-  - chaodaiG
-  - chizhg
-  productivity-reviewers:
-  - chaodaiG
-  - chizhg
-  - steuhs
-  - yt3liu
-
-  channel-reviewers:
-  - slinkydeveloper
+  eventing-approvers:
+  - alanfx
+  - mgencur
+  - mvinkler
+  - jcrossley3
+  - bobmcwhirter
+  - markusthoemmes
+  - evanchooly
+  - arilivigni
+  - matzew
+  - lberk
+  - aliok
+  eventing-reviewers:
+  - alanfx
+  - mgencur
+  - mvinkler
+  - jcrossley3
+  - bobmcwhirter
+  - markusthoemmes
+  - evanchooly
+  - arilivigni
+  - matzew
+  - lberk
+  - aliok
diff --git a/openshift/ci-operator/Dockerfile.in b/openshift/ci-operator/Dockerfile.in
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD ${bin} /usr/bin/${bin}
+ENTRYPOINT ["/usr/bin/${bin}"]
diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile
@@ -0,0 +1,11 @@
+# Dockerfile to bootstrap build and test in openshift-ci
+
+FROM openshift/origin-release:golang-1.13
+
+# Add kubernetes repository
+ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/
+
+RUN yum install -y kubectl ansible
+
+# Allow runtime users to add entries to /etc/passwd
+RUN chmod g+rw /etc/passwd
diff --git a/openshift/ci-operator/build-image/kubernetes.repo b/openshift/ci-operator/build-image/kubernetes.repo
@@ -0,0 +1,7 @@
+[kubernetes]
+name=Kubernetes
+baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
diff --git a/openshift/ci-operator/generate-ci-config.sh b/openshift/ci-operator/generate-ci-config.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+branch=${1-'knative-v0.6.0'}
+openshift=${2-'4.2'}
+
+cat <<EOF
+tag_specification:
+  name: '$openshift'
+  namespace: ocp
+promotion:
+  cluster: https://api.ci.openshift.org
+  namespace: openshift
+  name: $branch
+base_images:
+  base:
+    name: '$openshift'
+    namespace: ocp
+    tag: base
+build_root:
+  project_image:
+    dockerfile_path: openshift/ci-operator/build-image/Dockerfile
+canonical_go_repository: knative.dev/eventing
+binary_build_commands: make install
+test_binary_build_commands: make test-install
+tests:
+- as: e2e-aws-ocp-${openshift//./}
+  commands: "make test-e2e"
+  openshift_installer_src:
+    cluster_profile: aws
+resources:
+  '*':
+    limits:
+      memory: 6Gi
+    requests:
+      cpu: 4
+      memory: 6Gi
+  'bin':
+    limits:
+      memory: 6Gi
+    requests:
+      cpu: 4
+      memory: 6Gi
+
+images:
+EOF
+
+core_images=$(find ./openshift/ci-operator/knative-images -mindepth 1 -maxdepth 1 -type d | LC_COLLATE=posix sort)
+for img in $core_images; do
+  image_base=$(basename $img)
+  to_image=$(echo ${image_base//_/-})
+  cat <<EOF
+- dockerfile_path: openshift/ci-operator/knative-images/$image_base/Dockerfile
+  from: base
+  inputs:
+    bin:
+      paths:
+      - destination_dir: .
+        source_path: /go/bin/$image_base
+  to: knative-eventing-$to_image
+EOF
+done
+
+test_images=$(find ./openshift/ci-operator/knative-test-images -mindepth 1 -maxdepth 1 -type d | LC_COLLATE=posix sort)
+for img in $test_images; do
+  image_base=$(basename $img)
+  to_image=$(echo ${image_base//_/-})
+  cat <<EOF
+- dockerfile_path: openshift/ci-operator/knative-test-images/$image_base/Dockerfile
+  from: base
+  inputs:
+    test-bin:
+      paths:
+      - destination_dir: .
+        source_path: /go/bin/$image_base
+  to: knative-eventing-test-$to_image
+EOF
+done
diff --git a/openshift/ci-operator/generate-dockerfiles.sh b/openshift/ci-operator/generate-dockerfiles.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+function generate_dockefiles() {
+  local target_dir=$1; shift
+  # Remove old images and re-generate, avoid stale images hanging around.
+  for img in $@; do
+    local image_base=$(basename $img)
+    mkdir -p $target_dir/$image_base
+    bin=$image_base envsubst < openshift/ci-operator/Dockerfile.in > $target_dir/$image_base/Dockerfile
+  done
+}
+
+generate_dockefiles $@
diff --git a/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile b/openshift/ci-operator/knative-images/apiserver_receive_adapter/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD apiserver_receive_adapter /usr/bin/apiserver_receive_adapter
+ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"]
diff --git a/openshift/ci-operator/knative-images/broker_filter/Dockerfile b/openshift/ci-operator/knative-images/broker_filter/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD broker_filter /usr/bin/broker_filter
+ENTRYPOINT ["/usr/bin/broker_filter"]
diff --git a/openshift/ci-operator/knative-images/broker_ingress/Dockerfile b/openshift/ci-operator/knative-images/broker_ingress/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD broker_ingress /usr/bin/broker_ingress
+ENTRYPOINT ["/usr/bin/broker_ingress"]
diff --git a/openshift/ci-operator/knative-images/channel_broker/Dockerfile b/openshift/ci-operator/knative-images/channel_broker/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD channel_broker /usr/bin/channel_broker
+ENTRYPOINT ["/usr/bin/channel_broker"]
diff --git a/openshift/ci-operator/knative-images/channel_controller/Dockerfile b/openshift/ci-operator/knative-images/channel_controller/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD channel_controller /usr/bin/channel_controller
+ENTRYPOINT ["/usr/bin/channel_controller"]
diff --git a/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile b/openshift/ci-operator/knative-images/channel_dispatcher/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD channel_dispatcher /usr/bin/channel_dispatcher
+ENTRYPOINT ["/usr/bin/channel_dispatcher"]
diff --git a/openshift/ci-operator/knative-images/controller/Dockerfile b/openshift/ci-operator/knative-images/controller/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD controller /usr/bin/controller
+ENTRYPOINT ["/usr/bin/controller"]
diff --git a/openshift/ci-operator/knative-images/mtbroker_filter/Dockerfile b/openshift/ci-operator/knative-images/mtbroker_filter/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD mtbroker_filter /usr/bin/mtbroker_filter
+ENTRYPOINT ["/usr/bin/mtbroker_filter"]
diff --git a/openshift/ci-operator/knative-images/mtbroker_ingress/Dockerfile b/openshift/ci-operator/knative-images/mtbroker_ingress/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD mtbroker_ingress /usr/bin/mtbroker_ingress
+ENTRYPOINT ["/usr/bin/mtbroker_ingress"]
diff --git a/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile b/openshift/ci-operator/knative-images/mtchannel_broker/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD mtchannel_broker /usr/bin/mtchannel_broker
+ENTRYPOINT ["/usr/bin/mtchannel_broker"]
diff --git a/openshift/ci-operator/knative-images/mtping/Dockerfile b/openshift/ci-operator/knative-images/mtping/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD mtping /usr/bin/mtping
+ENTRYPOINT ["/usr/bin/mtping"]
diff --git a/openshift/ci-operator/knative-images/ping/Dockerfile b/openshift/ci-operator/knative-images/ping/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD ping /usr/bin/ping
+ENTRYPOINT ["/usr/bin/ping"]
diff --git a/openshift/ci-operator/knative-images/pong/Dockerfile b/openshift/ci-operator/knative-images/pong/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD pong /usr/bin/pong
+ENTRYPOINT ["/usr/bin/pong"]
diff --git a/openshift/ci-operator/knative-images/sendevent/Dockerfile b/openshift/ci-operator/knative-images/sendevent/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD sendevent /usr/bin/sendevent
+ENTRYPOINT ["/usr/bin/sendevent"]
diff --git a/openshift/ci-operator/knative-images/v0.14.0/Dockerfile b/openshift/ci-operator/knative-images/v0.14.0/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD v0.14.0 /usr/bin/v0.14.0
+ENTRYPOINT ["/usr/bin/v0.14.0"]
diff --git a/openshift/ci-operator/knative-images/webhook/Dockerfile b/openshift/ci-operator/knative-images/webhook/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD webhook /usr/bin/webhook
+ENTRYPOINT ["/usr/bin/webhook"]
diff --git a/openshift/ci-operator/knative-test-images/eventdetails/Dockerfile b/openshift/ci-operator/knative-test-images/eventdetails/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD eventdetails /usr/bin/eventdetails
+ENTRYPOINT ["/usr/bin/eventdetails"]
diff --git a/openshift/ci-operator/knative-test-images/filterevents/Dockerfile b/openshift/ci-operator/knative-test-images/filterevents/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD filterevents /usr/bin/filterevents
+ENTRYPOINT ["/usr/bin/filterevents"]
diff --git a/openshift/ci-operator/knative-test-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-test-images/heartbeats/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD heartbeats /usr/bin/heartbeats
+ENTRYPOINT ["/usr/bin/heartbeats"]
diff --git a/openshift/ci-operator/knative-test-images/logevents/Dockerfile b/openshift/ci-operator/knative-test-images/logevents/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD logevents /usr/bin/logevents
+ENTRYPOINT ["/usr/bin/logevents"]
diff --git a/openshift/ci-operator/knative-test-images/performance/Dockerfile b/openshift/ci-operator/knative-test-images/performance/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD performance /usr/bin/performance
+ENTRYPOINT ["/usr/bin/performance"]
diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD print /usr/bin/print
+ENTRYPOINT ["/usr/bin/print"]
diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile
@@ -0,0 +1,5 @@
+# Do not edit! This file was generated via Makefile
+FROM openshift/origin-base
+
+ADD recordevents /usr/bin/recordevents
+ENTRYPOINT ["/usr/bin/recordevents"]