Skip to content

Commit 161bc52

Browse files
danmanoropenshift-merge-bot[bot]
authored andcommitted
NO-ISSUE: Bump installer version to use dual-stack
1 parent d9fa7ec commit 161bc52

4,967 files changed

Lines changed: 1454005 additions & 72877 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 as builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as builder
22
ARG TARGETOS
33
ARG TARGETARCH
44

@@ -19,12 +19,12 @@ RUN CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o bu
1919
RUN CGO_ENABLED=1 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o build/server cmd/server/main.go
2020

2121

22-
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
22+
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
2323

2424
ARG DATA_DIR=/data
2525
RUN mkdir $DATA_DIR && chmod 775 $DATA_DIR
2626

27-
RUN dnf install -y nmstate-libs-2.2.33-1.el9_4.x86_64 nmstate-2.2.33-1.el9_4.x86_64 && dnf clean all && rm -rf /var/cache/dnf/*
27+
RUN dnf install -y nmstate-libs-2.2.48-1.el9_4.x86_64 nmstate-2.2.48-1.el9_4.x86_64 && dnf clean all && rm -rf /var/cache/dnf/*
2828

2929
WORKDIR /
3030
COPY --from=builder /opt/app-root/src/build/manager /usr/local/bin/

bundle/manifests/extensions.hive.openshift.io_imageclusterinstalls.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,27 @@ spec:
284284
MachineNetwork is the subnet provided by user for the ocp cluster.
285285
This will be used to create the node network and choose ip address for the node.
286286
Equivalent to install-config.yaml's machineNetwork.
287+
Deprecated: Use MachineNetworks instead.
287288
type: string
289+
machineNetworks:
290+
description: |-
291+
MachineNetworks is the list of IP address pools for machines.
292+
This enables dual-stack support by allowing multiple networks.
293+
If both MachineNetwork and MachineNetworks are specified, MachineNetwork should match
294+
the first element of MachineNetworks.
295+
Use instead of MachineNetwork.
296+
items:
297+
description: MachineNetworkEntry is a single IP address block for
298+
node IP blocks.
299+
properties:
300+
cidr:
301+
description: CIDR is the IP block address pool for machines
302+
within the cluster.
303+
type: string
304+
required:
305+
- cidr
306+
type: object
307+
type: array
288308
nodeIP:
289309
description: |-
290310
NodeIP is the desired IP for the host

bundle/manifests/image-based-install-operator.clusterserviceversion.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@ metadata:
2323
"imageSetRef": {
2424
"name": "4.14.10"
2525
},
26+
"machineNetworks": [
27+
{
28+
"cidr": "192.0.2.0/24"
29+
},
30+
{
31+
"cidr": "2001:db8::/64"
32+
}
33+
],
2634
"nodeIP": "192.0.2.100"
2735
}
2836
}
2937
]
3038
capabilities: Basic Install
31-
createdAt: "2025-02-18T20:07:47Z"
39+
createdAt: "2025-08-26T08:13:06Z"
3240
operators.operatorframework.io/builder: operator-sdk-v1.30.0
3341
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
3442
name: image-based-install-operator.v0.0.1
@@ -227,6 +235,10 @@ spec:
227235
value: /certs/tls.crt
228236
- name: PORT
229237
value: "8000"
238+
- name: TMPDIR
239+
value: /data
240+
- name: XDG_CACHE_HOME
241+
value: /data/.cache
230242
image: controller:latest
231243
name: server
232244
ports:
@@ -248,6 +260,8 @@ spec:
248260
name: data
249261
- mountPath: /certs
250262
name: certs
263+
- mountPath: /tmp
264+
name: tmp
251265
securityContext:
252266
runAsNonRoot: true
253267
seccompProfile:
@@ -257,6 +271,8 @@ spec:
257271
volumes:
258272
- emptyDir: {}
259273
name: data
274+
- emptyDir: {}
275+
name: tmp
260276
- name: certs
261277
secret:
262278
secretName: ibi-config-serving-certs

config/crd/bases/extensions.hive.openshift.io_imageclusterinstalls.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ spec:
288288
description: |-
289289
MachineNetworks is the list of IP address pools for machines.
290290
This enables dual-stack support by allowing multiple networks.
291-
If both MachineNetwork and MachineNetworks are specified, MachineNetworks takes precedence.
291+
If both MachineNetwork and MachineNetworks are specified, MachineNetwork should match
292+
the first element of MachineNetworks.
292293
Use instead of MachineNetwork.
293294
items:
294295
description: MachineNetworkEntry is a single IP address block for

config/manager/manager.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ spec:
8888
value: /certs/tls.crt
8989
- name: PORT
9090
value: "8000"
91+
- name: TMPDIR
92+
value: /data
93+
- name: XDG_CACHE_HOME
94+
value: /data/.cache
9195
ports:
9296
- name: config-server
9397
containerPort: 8000
@@ -107,9 +111,13 @@ spec:
107111
mountPath: /data
108112
- name: certs
109113
mountPath: /certs
114+
- name: tmp
115+
mountPath: /tmp
110116
volumes:
111117
- name: data
112118
emptyDir: {}
119+
- name: tmp
120+
emptyDir: {}
113121
- name: certs
114122
secret:
115123
secretName: ibi-config-serving-certs

0 commit comments

Comments
 (0)