Skip to content

Commit de10c06

Browse files
Fix clusterClaimInfo unmarshalling
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 907c570 commit de10c06

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

pkg/manager/config.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,17 @@ func GetConfigValues(kc client.Client, opts *ManagerOptions, cs *certstore.CertS
160160

161161
for _, cc := range cluster.Status.ClusterClaims {
162162
if cc.Name == kmapi.ClusterClaimKeyInfo {
163-
var info kmapi.ClusterInfo
163+
var info kmapi.ClusterClaimInfo
164164
if err := yaml.Unmarshal([]byte(cc.Value), &info); err != nil {
165165
return nil, err
166166
}
167-
if slices.Contains(info.ClusterManagers, kmapi.ClusterManagerOpenShift.Name()) {
168-
unstructured.RemoveNestedField(values, "image", "securityContext", "runAsUser")
169-
unstructured.RemoveNestedField(values, "podSecurityContext", "fsGroup")
167+
if slices.Contains(info.ClusterMetadata.ClusterManagers, kmapi.ClusterManagerOpenShift.Name()) {
168+
if err := unstructured.SetNestedField(values, nil, "image", "securityContext", "runAsUser"); err != nil {
169+
return nil, err
170+
}
171+
if err := unstructured.SetNestedField(values, nil, "podSecurityContext", "fsGroup"); err != nil {
172+
return nil, err
173+
}
170174
}
171175
break
172176
}

0 commit comments

Comments
 (0)