Skip to content

Commit 17fc4bc

Browse files
Merge pull request #2071 from rabi/OSPRH-36723
Preserve user EDPM registry configuration
2 parents bd0e67e + 88828b2 commit 17fc4bc

2 files changed

Lines changed: 53 additions & 3 deletions

File tree

‎internal/dataplane/inventory.go‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ func GenerateNodeSetInventory(ctx context.Context, helper *helper.Helper,
153153
return "", fmt.Errorf("failed to get MachineConfig registry configuration: %w", err)
154154
}
155155
} else {
156-
helper.GetLogger().Info("Mirror registries detected via IDMS/ICSP. Using OCP registry configuration.")
157-
nodeSetGroup.Vars["edpm_podman_registries_conf"] = registryConfig
158-
nodeSetGroup.Vars["edpm_podman_disconnected_ocp"] = hasMirrorRegistries
156+
helper.GetLogger().Info("Mirror registries detected via IDMS/ICSP. Using OCP registry configuration defaults.")
157+
setDefaultPodmanRegistryConfigVars(nodeSetGroup.Vars, hasMirrorRegistries, registryConfig)
159158
}
160159

161160
mirrorScopes, sourceByMirror, err := util.GetMirrorRegistryScopes(ctx, helper)
@@ -306,6 +305,15 @@ func populateInventoryFromIPAM(
306305
host.Vars["dns_search_domains"] = dnsSearchDomains
307306
}
308307

308+
func setDefaultPodmanRegistryConfigVars(vars map[string]interface{}, hasMirrorRegistries bool, registryConfig string) {
309+
if _, ok := vars["edpm_podman_registries_conf"]; !ok {
310+
vars["edpm_podman_registries_conf"] = registryConfig
311+
}
312+
if _, ok := vars["edpm_podman_disconnected_ocp"]; !ok {
313+
vars["edpm_podman_disconnected_ocp"] = hasMirrorRegistries
314+
}
315+
}
316+
309317
// set group ansible vars from NodeTemplate
310318
func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.Group,
311319
containerImages openstackv1.ContainerImages,

‎internal/dataplane/inventory_test.go‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,48 @@ func TestProcessConfigMapData_NumbersAsInts(t *testing.T) {
8686
}
8787
}
8888

89+
func TestSetDefaultPodmanRegistryConfigVars(t *testing.T) {
90+
tests := []struct {
91+
name string
92+
vars map[string]interface{}
93+
expectedConfig string
94+
expectedOCP bool
95+
}{
96+
{
97+
name: "sets registry configuration defaults",
98+
vars: map[string]interface{}{},
99+
expectedConfig: "ocp registry config",
100+
expectedOCP: true,
101+
},
102+
{
103+
name: "preserves user registry configuration vars",
104+
vars: map[string]interface{}{
105+
"edpm_podman_registries_conf": "director local mirror config",
106+
"edpm_podman_disconnected_ocp": false,
107+
},
108+
expectedConfig: "director local mirror config",
109+
expectedOCP: false,
110+
},
111+
{
112+
name: "preserves independently overridden registry configuration vars",
113+
vars: map[string]interface{}{
114+
"edpm_podman_disconnected_ocp": false,
115+
},
116+
expectedConfig: "ocp registry config",
117+
expectedOCP: false,
118+
},
119+
}
120+
121+
for _, tt := range tests {
122+
t.Run(tt.name, func(t *testing.T) {
123+
setDefaultPodmanRegistryConfigVars(tt.vars, true, "ocp registry config")
124+
125+
assert.Equal(t, tt.expectedConfig, tt.vars["edpm_podman_registries_conf"])
126+
assert.Equal(t, tt.expectedOCP, tt.vars["edpm_podman_disconnected_ocp"])
127+
})
128+
}
129+
}
130+
89131
func TestProcessSecretData_NumbersAsInts(t *testing.T) {
90132
tests := []struct {
91133
name string

0 commit comments

Comments
 (0)