Skip to content

Commit 09fb0a2

Browse files
committed
fix: Clean up install-config.yaml errors for bastion registry
- Set additionalTrustBundle to empty string (HTTP registry, no cert needed) - Remove imageContentSources (conflicts with imageDigestSources from IDMS) - Remove bootstrapExternalStaticGateway (unknown field, causes warning) - Keep bootstrapExternalStaticIP for UPI static bootstrap IP Fixes: - "invalid block" error for additionalTrustBundle - "cannot set imageContentSources and imageDigestSources at the same time" error
1 parent f966eed commit 09fb0a2

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ platform:
4242
computeSubnet: {{ worker_subnet_name }}
4343
networkResourceGroupName: {{ RESOURCEGROUP }}
4444
bootstrapExternalStaticIP: "10.0.10.4"
45-
bootstrapExternalStaticGateway: "10.0.10.1"
4645
publish: External
4746
pullSecret: '{{ pull_secret }}'
4847
sshKey: '{{ ssh_key }}'
4948
imageDigestSources:
5049
{{ image_digest_sources | indent(2, True) }}
51-
imageContentSources:
52-
- mirrors:
53-
- 10.0.1.4:5000
54-
source: 10.0.1.4:5000
5550

rhdp-isolated/bastion/rhdp-cluster-define-disconnected.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def setup_install(
148148

149149
# Bastion registry uses HTTP (no TLS), so no certificate needed
150150
rprint("[info]Using bastion-hosted HTTP registry (no TLS certificate needed)[/info]")
151-
additional_trust_bundle = "# Bastion registry uses HTTP (no TLS)"
151+
additional_trust_bundle = "" # Empty string for HTTP registry
152152

153153
# Parse IDMS files to imageDigestSources
154154
cluster_resources_dir = pattern_dir / "cluster-resources"

0 commit comments

Comments
 (0)