Skip to content

Commit 6b940f9

Browse files
committed
📂 Update openshift specific files.
1 parent 1ae6d4b commit 6b940f9

File tree

17 files changed

+680
-210
lines changed

17 files changed

+680
-210
lines changed

Makefile

Lines changed: 11 additions & 0 deletions
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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
# The OWNERS file is used by prow to automatically merge approved PRs.
2+
3+
# DO NOT EDIT! File generated via https://github.com/openshift-knative/hack/tree/main/config.
4+
15
approvers:
2-
- technical-oversight-committee
3-
- knative-release-leads
4-
- eventing-wg-leads
5-
- eventing-writers
6+
- aliok
7+
- Cali0707
8+
- creydr
9+
- Kaustubh-pande
10+
- lberk
11+
- matzew
12+
- rudyredhat1
613

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
14+
reviewers:
15+
- aliok
16+
- Cali0707
17+
- creydr
18+
- lberk
19+
- matzew

OWNERS_ALIASES

Lines changed: 7 additions & 201 deletions
Original file line numberDiff line numberDiff line change
@@ -1,209 +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-
- Leo6Leo
9-
- aliok
10-
- cali0707
11-
- pierDipi
12-
backstage-plugins-writers:
13-
- Leo6Leo
14-
- aliok
15-
- cali0707
16-
- pierDipi
17-
client-wg-leads:
18-
- dsimansk
19-
client-writers:
20-
- dsimansk
21-
discovery-approvers:
22-
- lberk
23-
eventing-autoscaler-keda-approvers: []
24-
eventing-awssqs-approvers:
25-
- lberk
26-
- matzew
27-
eventing-ceph-approvers:
28-
- lberk
29-
- matzew
30-
eventing-couchdb-approvers:
31-
- lberk
32-
- matzew
33-
eventing-github-approvers:
34-
- lberk
35-
- matzew
36-
eventing-gitlab-approvers:
37-
- lberk
38-
- matzew
39-
eventing-kafka-approvers:
40-
- aliok
41-
- lberk
42-
- matzew
43-
- pierDipi
44-
eventing-kafka-broker-approvers:
2+
eventing-approvers:
453
- aliok
46-
- matzew
47-
- pierDipi
48-
eventing-kafka-broker-reviewers:
49-
- Leo6Leo
50-
- cali0707
51-
eventing-kafka-writers: []
52-
eventing-natss-approvers:
53-
- astelmashenko
54-
- dan-j
55-
eventing-prometheus-approvers:
4+
- creydr
565
- lberk
576
- matzew
58-
eventing-rabbitmq-approvers:
59-
- ikavgo
60-
eventing-redis-approvers:
61-
- aavarghese
62-
- matzew
7+
- mgencur
8+
- pierdipi
9+
- skonto
6310
eventing-reviewers:
64-
- Leo6Leo
65-
- cali0707
66-
- creydr
67-
eventing-wg-leads:
68-
- creydr
69-
- pierDipi
70-
eventing-writers:
71-
- Leo6Leo
7211
- aliok
73-
- cali0707
7412
- creydr
13+
- lberk
7514
- matzew
76-
- pierDipi
77-
func-tastic-approvers:
78-
- lkingland
79-
- matejvasek
80-
- nainaz
81-
- salaboy
82-
functastic-writers:
83-
- lkingland
84-
- matejvasek
85-
- matzew
86-
- nainaz
87-
- salaboy
88-
function-runtime-approvers:
89-
- lkingland
90-
- matejvasek
91-
- matzew
92-
- nainaz
93-
- salaboy
94-
function-runtime-writers:
95-
- lkingland
96-
- matejvasek
97-
- matzew
98-
- nainaz
99-
- salaboy
100-
homebrew-kn-plugins-approvers:
101-
- dsimansk
102-
kn-plugin-admin-approvers:
103-
- dsimansk
104-
kn-plugin-event-approvers:
105-
- cardil
106-
kn-plugin-operator-approvers:
107-
- dsimansk
108-
- houshengbo
109-
kn-plugin-quickstart-approvers:
110-
- dsimansk
111-
- psschwei
112-
kn-plugin-sample-approvers:
113-
- dsimansk
114-
kn-plugin-service-log-approvers:
115-
- dsimansk
116-
kn-plugin-source-kafka-approvers:
117-
- dsimansk
118-
kn-plugin-source-kamelet-approvers:
119-
- christophd
120-
knative-admin:
121-
- aliok
122-
- arsenetar
123-
- cardil
124-
- dprotaso
125-
- dsimansk
126-
- evankanderson
127-
- gauron99
128-
- knative-automation
129-
- knative-prow-releaser-robot
130-
- knative-prow-robot
131-
- knative-prow-updater-robot
132-
- knative-test-reporter-robot
133-
- matzew
134-
- skonto
135-
- upodroid
136-
knative-release-leads:
137-
- dprotaso
138-
- dsimansk
139-
- gauron99
140-
- skonto
141-
knative-robots:
142-
- knative-automation
143-
- knative-prow-releaser-robot
144-
- knative-prow-robot
145-
- knative-prow-updater-robot
146-
- knative-test-reporter-robot
147-
net-contour-approvers:
148-
- dprotaso
149-
net-gateway-api-approvers:
150-
- dprotaso
151-
net-istio-approvers:
152-
- skonto
153-
net-kourier-approvers:
154-
- skonto
155-
operations-wg-leads:
156-
- houshengbo
157-
operations-writers:
158-
- dprotaso
159-
- houshengbo
160-
- upodroid
161-
productivity-leads:
162-
- cardil
163-
- upodroid
164-
productivity-wg-leads:
165-
- cardil
166-
- upodroid
167-
productivity-writers:
168-
- cardil
169-
- upodroid
170-
security-guard-approvers:
171-
- davidhadas
172-
security-wg-leads:
173-
- davidhadas
174-
- evankanderson
175-
security-writers:
176-
- davidhadas
177-
- evankanderson
178-
serving-approvers:
179-
- dsimansk
180-
- skonto
181-
serving-progressive-rollout-approvers:
182-
- houshengbo
183-
- yuzisun
184-
serving-reviewers:
185-
- skonto
186-
serving-triage:
187-
- skonto
188-
serving-wg-leads:
189-
- dprotaso
190-
serving-writers:
191-
- dprotaso
192-
- dsimansk
193-
- skonto
194-
steering-committee:
195-
- aliok
196-
- arsenetar
197-
- dprotaso
198-
- evankanderson
199-
- matzew
200-
ux-wg-leads:
201-
- Leo6Leo
202-
- cali0707
203-
- mmejia02
204-
- zainabhusain227
205-
ux-writers:
206-
- Leo6Leo
207-
- cali0707
208-
- mmejia02
209-
- zainabhusain227
15+
- pierdipi
Lines changed: 26 additions & 0 deletions
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.24-openshift-4.20 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/skopeo@v1.17.0
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
Lines changed: 35 additions & 0 deletions
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.24-openshift-4.20
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="serverless-support@redhat.com" \
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"]
Lines changed: 7 additions & 0 deletions
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

Lines changed: 10 additions & 0 deletions
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

Lines changed: 47 additions & 0 deletions
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)