Skip to content

Commit 33e2e1a

Browse files
committed
📂 Update openshift specific files.
1 parent c13da73 commit 33e2e1a

17 files changed

+676
-244
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-235
Original file line numberDiff line numberDiff line change
@@ -1,243 +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-
- ReToCode
7-
- skonto
8-
backstage-plugins-reviewers:
9-
- aliok
10-
- cali0707
11-
- leo6leo
12-
- pierdipi
13-
backstage-plugins-writers:
14-
- aliok
15-
- cali0707
16-
- leo6leo
17-
- pierdipi
18-
client-wg-leads:
19-
- dsimansk
20-
- rhuss
21-
client-writers:
22-
- dsimansk
23-
- rhuss
24-
discovery-approvers:
25-
- lberk
26-
docs-writers:
27-
- csantanapr
28-
- retocode
29-
- skonto
30-
eventing-autoscaler-keda-approvers: []
31-
eventing-awssqs-approvers:
32-
- lberk
33-
- matzew
34-
eventing-ceph-approvers:
35-
- lberk
36-
- matzew
37-
eventing-couchdb-approvers:
38-
- lberk
39-
- lionelvillard
40-
- matzew
41-
eventing-github-approvers:
42-
- lberk
43-
- matzew
44-
eventing-gitlab-approvers:
45-
- lberk
46-
- matzew
47-
- sebgoa
48-
eventing-kafka-approvers:
49-
- aliok
50-
- lberk
51-
- matzew
52-
- pierDipi
53-
eventing-kafka-broker-approvers:
2+
eventing-approvers:
543
- aliok
55-
- matzew
56-
- pierDipi
57-
eventing-kafka-broker-reviewers:
58-
- Leo6Leo
59-
- cali0707
60-
eventing-kafka-writers: []
61-
eventing-natss-approvers:
62-
- astelmashenko
63-
- dan-j
64-
eventing-prometheus-approvers:
4+
- creydr
655
- lberk
666
- matzew
67-
eventing-rabbitmq-approvers:
68-
- ikavgo
69-
- mkuratczyk
70-
eventing-redis-approvers:
71-
- aavarghese
72-
- lionelvillard
73-
- matzew
7+
- mgencur
8+
- pierdipi
9+
- skonto
7410
eventing-reviewers:
75-
- Leo6Leo
76-
- cali0707
77-
- creydr
78-
eventing-wg-leads:
79-
- pierDipi
80-
eventing-writers:
81-
- Leo6Leo
8211
- aliok
83-
- cali0707
8412
- creydr
85-
- lionelvillard
86-
- matzew
87-
- pierDipi
88-
func-tastic-approvers:
89-
- lance
90-
- lkingland
91-
- matejvasek
92-
- nainaz
93-
- salaboy
94-
functastic-writers:
95-
- lance
96-
- lkingland
97-
- matejvasek
98-
- matzew
99-
- nainaz
100-
- salaboy
101-
function-runtime-approvers:
102-
- lance
103-
- lkingland
104-
- matejvasek
105-
- matzew
106-
- nainaz
107-
- salaboy
108-
function-runtime-writers:
109-
- lance
110-
- lkingland
111-
- matejvasek
13+
- lberk
11214
- matzew
113-
- nainaz
114-
- salaboy
115-
homebrew-kn-plugins-approvers:
116-
- dsimansk
117-
- rhuss
118-
kn-plugin-admin-approvers:
119-
- dsimansk
120-
- rhuss
121-
kn-plugin-event-approvers:
122-
- cardil
123-
- rhuss
124-
kn-plugin-operator-approvers:
125-
- dsimansk
126-
- houshengbo
127-
- rhuss
128-
kn-plugin-quickstart-approvers:
129-
- dsimansk
130-
- psschwei
131-
- rhuss
132-
kn-plugin-sample-approvers:
133-
- dsimansk
134-
- rhuss
135-
kn-plugin-service-log-approvers:
136-
- rhuss
137-
kn-plugin-source-kafka-approvers:
138-
- daisy-ycguo
139-
- dsimansk
140-
- rhuss
141-
kn-plugin-source-kamelet-approvers:
142-
- christophd
143-
- rhuss
144-
knative-admin:
145-
- aliok
146-
- cardil
147-
- davidhadas
148-
- dprotaso
149-
- dsimansk
150-
- evankanderson
151-
- knative-automation
152-
- knative-prow-releaser-robot
153-
- knative-prow-robot
154-
- knative-prow-updater-robot
155-
- knative-test-reporter-robot
156-
- nainaz
157-
- psschwei
158-
- salaboy
159-
- upodroid
160-
knative-release-leads: []
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-
- psschwei
195-
- rhuss
196-
security-wg-leads:
197-
- davidhadas
198-
- evankanderson
199-
security-writers:
200-
- davidhadas
201-
- evankanderson
202-
serving-approvers:
203-
- ReToCode
204-
- skonto
205-
serving-progressive-rollout-approvers:
206-
- alexagriffith
207-
- houshengbo
208-
- sukumargaonkar
209-
- yuzisun
210-
serving-reviewers:
211-
- izabelacg
212-
- retocode
213-
- skonto
214-
serving-triage:
215-
- izabelacg
216-
- retocode
217-
- skonto
218-
serving-wg-leads:
219-
- dprotaso
220-
serving-writers:
221-
- ReToCode
222-
- dprotaso
223-
- skonto
224-
steering-committee:
225-
- aliok
226-
- davidhadas
227-
- dprotaso
228-
- dsimansk
229-
- evankanderson
230-
- nainaz
231-
- psschwei
232-
- salaboy
233-
technical-oversight-committee: []
234-
ux-wg-leads:
235-
- cali0707
236-
- leo6leo
237-
- mmejia02
238-
- zainabhusain227
239-
ux-writers:
240-
- cali0707
241-
- leo6leo
242-
- mmejia02
243-
- 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,34 @@
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 /go/src/cmd/controller
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+
21+
USER 65532
22+
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-istio-controller-rhel8-container" \
25+
name="openshift-serverless-1/eventing-istio-controller-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Istio Controller" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Istio Controller" \
32+
io.openshift.tags="controller"
33+
34+
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)