Skip to content

Commit 9677b9e

Browse files
committed
📂 Update openshift specific files.
1 parent 4eadf92 commit 9677b9e

17 files changed

+668
-235
lines changed

Diff for: Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
generate:
2+
./openshift/generate.sh
3+
.PHONY: generate
4+
5+
generate-release: generate
6+
.PHONY: generate
7+
8+
e2e-tests:
9+
./openshift/install.sh
10+
./openshift/e2e-tests.sh
11+
.PHONY: e2e-tests

Diff for: OWNERS

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1+
# The OWNERS file is used by prow to automatically merge approved PRs.
2+
13
approvers:
2-
- technical-oversight-committee
3-
- knative-release-leads
4-
- eventing-wg-leads
5-
- eventing-writers
4+
- eventing-approvers
65

7-
# Reviewers are suggested from the reviewers list first, then the approvers
8-
# list. To add reviewers while spreading the load among existing approvers,
9-
# copy the approvers to the reviewers list too.
10-
# reviewers:
11-
# TODO: fill in the owning WG
6+
reviewers:
7+
- eventing-reviewers

Diff for: OWNERS_ALIASES

+7-226
Original file line numberDiff line numberDiff line change
@@ -1,234 +1,15 @@
1-
# This file is auto-generated from peribolos.
2-
# Do not modify this file, instead modify peribolos/knative-extensions.yaml
3-
41
aliases:
5-
autoscaler-keda-approvers:
6-
- skonto
7-
backstage-plugins-reviewers:
8-
- aliok
9-
- cali0707
10-
- leo6leo
11-
- pierdipi
12-
backstage-plugins-writers:
13-
- aliok
14-
- cali0707
15-
- leo6leo
16-
- pierdipi
17-
client-wg-leads:
18-
- dsimansk
19-
- rhuss
20-
client-writers:
21-
- dsimansk
22-
- rhuss
23-
discovery-approvers:
24-
- lberk
25-
docs-writers:
26-
- csantanapr
27-
- skonto
28-
eventing-autoscaler-keda-approvers: []
29-
eventing-awssqs-approvers:
30-
- lberk
31-
- matzew
32-
eventing-ceph-approvers:
33-
- lberk
34-
- matzew
35-
eventing-couchdb-approvers:
36-
- lberk
37-
- lionelvillard
38-
- matzew
39-
eventing-github-approvers:
40-
- lberk
41-
- matzew
42-
eventing-gitlab-approvers:
43-
- lberk
44-
- matzew
45-
- sebgoa
46-
eventing-kafka-approvers:
2+
eventing-approvers:
473
- aliok
4+
- creydr
485
- lberk
496
- matzew
50-
- pierDipi
51-
eventing-kafka-broker-approvers:
52-
- aliok
53-
- matzew
54-
- pierDipi
55-
eventing-kafka-broker-reviewers:
56-
- Leo6Leo
57-
- cali0707
58-
eventing-kafka-writers: []
59-
eventing-natss-approvers:
60-
- astelmashenko
61-
- dan-j
62-
eventing-prometheus-approvers:
63-
- lberk
64-
- matzew
65-
eventing-rabbitmq-approvers:
66-
- ikavgo
67-
- mkuratczyk
68-
eventing-redis-approvers:
69-
- aavarghese
70-
- lionelvillard
71-
- matzew
7+
- mgencur
8+
- pierdipi
9+
- skonto
7210
eventing-reviewers:
73-
- Leo6Leo
74-
- cali0707
75-
- creydr
76-
eventing-wg-leads:
77-
- creydr
78-
- pierDipi
79-
eventing-writers:
80-
- Leo6Leo
8111
- aliok
82-
- cali0707
8312
- creydr
84-
- lionelvillard
85-
- matzew
86-
- pierDipi
87-
func-tastic-approvers:
88-
- lance
89-
- lkingland
90-
- matejvasek
91-
- nainaz
92-
- salaboy
93-
functastic-writers:
94-
- lance
95-
- lkingland
96-
- matejvasek
97-
- matzew
98-
- nainaz
99-
- salaboy
100-
function-runtime-approvers:
101-
- lance
102-
- lkingland
103-
- matejvasek
104-
- matzew
105-
- nainaz
106-
- salaboy
107-
function-runtime-writers:
108-
- lance
109-
- lkingland
110-
- matejvasek
111-
- matzew
112-
- nainaz
113-
- salaboy
114-
homebrew-kn-plugins-approvers:
115-
- dsimansk
116-
- rhuss
117-
kn-plugin-admin-approvers:
118-
- dsimansk
119-
- rhuss
120-
kn-plugin-event-approvers:
121-
- cardil
122-
- rhuss
123-
kn-plugin-operator-approvers:
124-
- dsimansk
125-
- houshengbo
126-
- rhuss
127-
kn-plugin-quickstart-approvers:
128-
- dsimansk
129-
- rhuss
130-
kn-plugin-sample-approvers:
131-
- dsimansk
132-
- rhuss
133-
kn-plugin-service-log-approvers:
134-
- rhuss
135-
kn-plugin-source-kafka-approvers:
136-
- daisy-ycguo
137-
- dsimansk
138-
- rhuss
139-
kn-plugin-source-kamelet-approvers:
140-
- christophd
141-
- rhuss
142-
knative-admin:
143-
- aliok
144-
- cardil
145-
- dprotaso
146-
- dsimansk
147-
- evankanderson
148-
- knative-automation
149-
- knative-prow-releaser-robot
150-
- knative-prow-robot
151-
- knative-prow-updater-robot
152-
- knative-test-reporter-robot
153-
- matzew
154-
- nrrso
155-
- skonto
156-
- upodroid
157-
knative-release-leads:
158-
- dprotaso
159-
- dsimansk
160-
- skonto
161-
knative-robots:
162-
- knative-automation
163-
- knative-prow-releaser-robot
164-
- knative-prow-robot
165-
- knative-prow-updater-robot
166-
- knative-test-reporter-robot
167-
net-contour-approvers:
168-
- KauzClay
169-
- dprotaso
170-
net-gateway-api-approvers:
171-
- dprotaso
172-
net-http01-approvers: []
173-
net-istio-approvers:
174-
- skonto
175-
net-kourier-approvers:
176-
- skonto
177-
operations-wg-leads:
178-
- houshengbo
179-
operations-writers:
180-
- dprotaso
181-
- houshengbo
182-
- upodroid
183-
productivity-leads:
184-
- cardil
185-
- upodroid
186-
productivity-wg-leads:
187-
- cardil
188-
- upodroid
189-
productivity-writers:
190-
- cardil
191-
- upodroid
192-
security-guard-approvers:
193-
- davidhadas
194-
- rhuss
195-
security-wg-leads:
196-
- davidhadas
197-
- evankanderson
198-
security-writers:
199-
- davidhadas
200-
- evankanderson
201-
serving-approvers:
202-
- dsimansk
203-
- skonto
204-
serving-progressive-rollout-approvers:
205-
- alexagriffith
206-
- houshengbo
207-
- sukumargaonkar
208-
- yuzisun
209-
serving-reviewers:
210-
- skonto
211-
serving-triage:
212-
- skonto
213-
serving-wg-leads:
214-
- dprotaso
215-
serving-writers:
216-
- dprotaso
217-
- dsimansk
218-
- skonto
219-
steering-committee:
220-
- aliok
221-
- dprotaso
222-
- evankanderson
13+
- lberk
22314
- matzew
224-
- nrrso
225-
ux-wg-leads:
226-
- cali0707
227-
- leo6leo
228-
- mmejia02
229-
- zainabhusain227
230-
ux-writers:
231-
- cali0707
232-
- leo6leo
233-
- mmejia02
234-
- zainabhusain227
15+
- pierdipi

Diff for: openshift/ci-operator/build-image/Dockerfile

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# DO NOT EDIT! Generated Dockerfile.
2+
3+
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
4+
5+
# Dockerfile to bootstrap build and test in openshift-ci
6+
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
7+
8+
ARG TARGETARCH
9+
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
11+
12+
RUN ln -s /usr/bin/oc /usr/bin/kubectl
13+
14+
RUN yum install -y httpd-tools
15+
16+
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
17+
chmod 700 ./get-helm-3
18+
19+
RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
20+
21+
RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
22+
RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/[email protected]
23+
24+
# go install creates $GOPATH/.cache with root permissions, we delete it here
25+
# to avoid permission issues with the runtime users
26+
RUN rm -rf $GOPATH/.cache
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# DO NOT EDIT! Generated Dockerfile for cmd/controller.
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 ./cmd/controller
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-nightly
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/controller
20+
COPY LICENSE /licenses/
21+
22+
USER 65532
23+
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-eventing-istio-controller-rhel8-container" \
26+
name="openshift-serverless-1/eventing-istio-controller-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
32+
io.k8s.description="Red Hat OpenShift Serverless Eventing Istio Controller" \
33+
io.openshift.tags="controller"
34+
35+
ENTRYPOINT ["/usr/bin/controller"]

Diff for: openshift/ci-operator/source-image/Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# DO NOT EDIT! Generated Dockerfile.
2+
3+
FROM src
4+
5+
RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh || true
6+
RUN chmod +x vendor/knative.dev/pkg/hack/generate-knative.sh || true
7+
RUN chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh || true

Diff for: openshift/e2e-tests.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
4+
5+
export SKIP_INITIALIZE=true
6+
export GOPATH=/tmp/go
7+
export GOCACHE=/tmp/go-cache
8+
export ARTIFACTS=${ARTIFACT_DIR:-$(mktemp -u -t -d)}
9+
10+
"${repo_root_dir}/test/e2e-tests.sh"

0 commit comments

Comments
 (0)