Skip to content

Commit 96ceb3c

Browse files
authored
Merge pull request #8819 from adobes1/4.23-port-okd-configs
ART-14479: Port 4.22 OKD configs to 4.23
2 parents ff82390 + 537a168 commit 96ceb3c

10 files changed

+48
-6
lines changed

images/marketplace-operator.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ name: openshift/ose-operator-marketplace-rhel9
2929
payload_name: operator-marketplace
3030
owners:
3131
32+
okd:
33+
content:
34+
source:
35+
dockerfile: Dockerfile.okd

images/monitoring-plugin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,8 @@ konflux:
5050
cachito:
5151
mode: emulation
5252
network_mode: open
53+
okd:
54+
content:
55+
source:
56+
dockerfile: Dockerfile
57+
modifications: []

images/networking-console-plugin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ konflux:
5151
cachito:
5252
mode: emulation
5353
network_mode: open # Bunch of yarn dependencies, not sure how to fix
54+
okd:
55+
content:
56+
source:
57+
dockerfile: Dockerfile
58+
modifications: []

images/oc-mirror-plugin.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ owners:
4141
konflux:
4242
cachito:
4343
mode: removal
44+
okd:
45+
content:
46+
source:
47+
dockerfile: images/cli/Dockerfile.ci

images/okd-only-upi-installer.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ owners:
4545
4646
konflux:
4747
network_mode: open
48+
no_shell: true # Image uses minimal base images (govc, pwsh, yq) without /bin/sh
49+
okd:
50+
mode: enabled

images/openshift-enterprise-pod.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ name: openshift/ose-pod-rhel9
3636
payload_name: pod
3737
owners:
3838
39+
okd:
40+
content:
41+
source:
42+
dockerfile: Dockerfile.Rhel

images/ose-cluster-samples-operator.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ name: openshift/ose-cluster-samples-rhel9-operator
2828
payload_name: cluster-samples-operator
2929
owners:
3030
31+
okd:
32+
content:
33+
source:
34+
dockerfile: Dockerfile.okd

images/ose-cluster-update-keys.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ name: openshift/ose-cluster-update-keys-rhel9
3131
payload_name: cluster-update-keys
3232
owners:
3333
34+
okd:
35+
content:
36+
source:
37+
dockerfile: Dockerfile

images/ose-etcd.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cachito:
1414
- path: tools/mod
1515
content:
1616
source:
17-
dockerfile: Dockerfile.art
17+
dockerfile: Dockerfile.rhel
1818
git:
1919
branch:
2020
target: openshift-{MAJOR}.{MINOR}
@@ -58,7 +58,11 @@ owners:
5858
5959
maintainer:
6060
component: "Etcd"
61-
konflux:
61+
okd:
6262
content:
6363
source:
64-
dockerfile: Dockerfile.rhel
64+
modifications:
65+
- action: replace
66+
match: "RUN GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh"
67+
replacement: |-
68+
RUN export GOTOOLCHAIN="go${GO_VERSION#v}" && GOFLAGS='-mod=readonly' GO_BUILD_FLAGS='-v' ./build.sh

images/ose-installer-etcd-artifacts.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ cachito:
1515
- path: tools/mod
1616
content:
1717
source:
18-
dockerfile: Dockerfile.installer.art
18+
dockerfile: Dockerfile.installer.art-cachi2
1919
git:
2020
branch:
2121
target: openshift-{MAJOR}.{MINOR}
@@ -60,7 +60,12 @@ external_scanners:
6060
sast_scanning:
6161
jira_integration:
6262
enabled: false
63-
konflux:
63+
okd:
6464
content:
6565
source:
66-
dockerfile: Dockerfile.installer.art-cachi2
66+
modifications:
67+
- action: replace
68+
match: |-
69+
RUN export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \
70+
replacement: |-
71+
RUN export GOTOOLCHAIN="go${GO_VERSION#v}" && export GOFLAGS='-mod=readonly' && export GO_BUILD_FLAGS='-v' \

0 commit comments

Comments
 (0)