Skip to content

Commit 44bd809

Browse files
committed
fix: Configure cluster nodes to accept insecure bastion registry
- Change oc-mirror flag from --dest-skip-tls to --dest-tls-verify=false (correct v2 syntax) - Add MachineConfig manifests to configure insecure registry on all cluster nodes - Update deploy-cluster.sh to copy MachineConfig before generating ignition - Add imageContentSources to install-config for bastion registry - Ensures cluster nodes can pull images from HTTP registry at 10.0.1.4:5000
1 parent 8266f5a commit 44bd809

4 files changed

Lines changed: 52 additions & 2 deletions

File tree

rhdp-isolated/bastion/deploy-cluster.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,16 @@ fi
129129
cp openshift-install-upi/install-config.yaml openshift-install-upi/install-config.yaml.backup
130130
log_success "Install config generated"
131131

132+
# Copy insecure registry MachineConfig to manifests
133+
log_info "Adding insecure registry configuration for cluster nodes..."
134+
mkdir -p openshift-install-upi/openshift
135+
if [ -f rhdp-isolated/bastion/manifests/99-insecure-registry.yaml ]; then
136+
cp rhdp-isolated/bastion/manifests/99-insecure-registry.yaml openshift-install-upi/openshift/
137+
log_success "Insecure registry MachineConfig added"
138+
else
139+
log_warn "Insecure registry manifest not found, cluster may have issues pulling from HTTP registry"
140+
fi
141+
132142
# ============================================================================
133143
# STEP 3: Generate Ignition Configs
134144
# ============================================================================

rhdp-isolated/bastion/install-config.yaml.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@ pullSecret: '{{ pull_secret }}'
4848
sshKey: '{{ ssh_key }}'
4949
imageDigestSources:
5050
{{ image_digest_sources | indent(2, True) }}
51+
imageContentSources:
52+
- mirrors:
53+
- 10.0.1.4:5000
54+
source: 10.0.1.4:5000
5155

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
apiVersion: machineconfiguration.openshift.io/v1
2+
kind: MachineConfig
3+
metadata:
4+
labels:
5+
machineconfiguration.openshift.io/role: master
6+
name: 99-master-insecure-registry
7+
spec:
8+
config:
9+
ignition:
10+
version: 3.2.0
11+
storage:
12+
files:
13+
- contents:
14+
source: data:text/plain;charset=utf-8;base64,W1tyZWdpc3RyeV1dCmxvY2F0aW9uID0gIjEwLjAuMS40OjUwMDAiCmluc2VjdXJlID0gdHJ1ZQo=
15+
mode: 0644
16+
overwrite: true
17+
path: /etc/containers/registries.conf.d/99-bastion-registry.conf
18+
---
19+
apiVersion: machineconfiguration.openshift.io/v1
20+
kind: MachineConfig
21+
metadata:
22+
labels:
23+
machineconfiguration.openshift.io/role: worker
24+
name: 99-worker-insecure-registry
25+
spec:
26+
config:
27+
ignition:
28+
version: 3.2.0
29+
storage:
30+
files:
31+
- contents:
32+
source: data:text/plain;charset=utf-8;base64,W1tyZWdpc3RyeV1dCmxvY2F0aW9uID0gIjEwLjAuMS40OjUwMDAiCmluc2VjdXJlID0gdHJ1ZQo=
33+
mode: 0644
34+
overwrite: true
35+
path: /etc/containers/registries.conf.d/99-bastion-registry.conf
36+

rhdp-isolated/bastion/mirror.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ log_info "oc-mirror will use auth from: ${MERGED_AUTH_FILE}"
141141
START_TIME=$(date +%s)
142142

143143
log_info "Executing oc-mirror..."
144-
log_info "Command: oc-mirror --config=${MIRROR_WORKSPACE}/imageset-config.yaml --workspace file://${MIRROR_WORKSPACE} docker://${REGISTRY_URL} --v2 --dest-skip-tls"
144+
log_info "Command: oc-mirror --config=${MIRROR_WORKSPACE}/imageset-config.yaml --workspace file://${MIRROR_WORKSPACE} docker://${REGISTRY_URL} --v2 --dest-tls-verify=false"
145145

146146
if oc-mirror \
147147
--config="${MIRROR_WORKSPACE}/imageset-config.yaml" \
148148
--workspace "file://${MIRROR_WORKSPACE}" \
149149
"docker://${REGISTRY_URL}" \
150150
--v2 \
151-
--dest-skip-tls; then
151+
--dest-tls-verify=false; then
152152

153153
END_TIME=$(date +%s)
154154
DURATION=$((END_TIME - START_TIME))

0 commit comments

Comments
 (0)