Skip to content

Commit 890911b

Browse files
committed
📂 Update openshift specific files.
1 parent 2f8d84f commit 890911b

17 files changed

+668
-227
lines changed

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

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

OWNERS_ALIASES

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

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"

openshift/generate.sh

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
repo_root_dir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")/..
6+
7+
release=$(yq r openshift/project.yaml project.tag)
8+
release=${release/knative/release}
9+
10+
function resolve_resources(){
11+
echo $@
12+
13+
local dir=$1
14+
local resolved_file_name=$2
15+
16+
local version=${release/release-/}
17+
18+
echo "Writing resolved yaml to $resolved_file_name"
19+
20+
for yaml in "$dir"/*.yaml; do
21+
echo "Resolving ${yaml}"
22+
23+
echo "---" >> "$resolved_file_name"
24+
25+
sed \
26+
-e "s+eventing.knative.dev/release: devel+eventing.knative.dev/release: ${version}+" \
27+
-e "s+app.kubernetes.io/version: devel+app.kubernetes.io/version: ${version}+" \
28+
"$yaml" >> "$resolved_file_name"
29+
done
30+
}
31+
32+
"${repo_root_dir}/hack/update-deps.sh"
33+
34+
GOFLAGS='' go run github.com/openshift-knative/hack/cmd/generate@latest \
35+
--root-dir "${repo_root_dir}" \
36+
--generators dockerfile \
37+
--excludes "vendor.*" \
38+
--excludes "third_party.*" \
39+
--images-from eventing \
40+
--images-from eventing-kafka-broker
41+
42+
"$repo_root_dir/hack/update-codegen.sh"
43+
44+
rm -rf "${repo_root_dir}/openshift/release/artifacts"
45+
mkdir -p "${repo_root_dir}/openshift/release/artifacts"
46+
resolve_resources "${repo_root_dir}/config/eventing-istio/roles" "${repo_root_dir}/openshift/release/artifacts/eventing-istio-controller.yaml"
47+
resolve_resources "${repo_root_dir}/config/eventing-istio/controller" "${repo_root_dir}/openshift/release/artifacts/eventing-istio-controller.yaml"

0 commit comments

Comments
 (0)