Skip to content

Commit 5e9816d

Browse files
Modify values correctly for openshift
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent de10c06 commit 5e9816d

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

pkg/manager/config.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,24 @@ func GetConfigValues(kc client.Client, opts *ManagerOptions, cs *certstore.CertS
138138
return nil, err
139139
}
140140

141+
for _, cc := range cluster.Status.ClusterClaims {
142+
if cc.Name == kmapi.ClusterClaimKeyInfo {
143+
var info kmapi.ClusterClaimInfo
144+
if err := yaml.Unmarshal([]byte(cc.Value), &info); err != nil {
145+
return nil, err
146+
}
147+
if slices.Contains(info.ClusterMetadata.ClusterManagers, kmapi.ClusterManagerOpenShift.Name()) {
148+
if err := unstructured.SetNestedField(vals, nil, "image", "securityContext", "runAsUser"); err != nil {
149+
return nil, err
150+
}
151+
if err := unstructured.SetNestedField(vals, nil, "podSecurityContext", "fsGroup"); err != nil {
152+
return nil, err
153+
}
154+
}
155+
break
156+
}
157+
}
158+
141159
var sec corev1.Secret
142160
err = kc.Get(context.Background(), types.NamespacedName{Name: common.LicenseSecret, Namespace: cluster.Name}, &sec)
143161
if err != nil && kerr.IsNotFound(err) {
@@ -158,24 +176,6 @@ func GetConfigValues(kc client.Client, opts *ManagerOptions, cs *certstore.CertS
158176
}
159177
}
160178

161-
for _, cc := range cluster.Status.ClusterClaims {
162-
if cc.Name == kmapi.ClusterClaimKeyInfo {
163-
var info kmapi.ClusterClaimInfo
164-
if err := yaml.Unmarshal([]byte(cc.Value), &info); err != nil {
165-
return nil, err
166-
}
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-
}
174-
}
175-
break
176-
}
177-
}
178-
179179
return vals, nil
180180
}
181181
}

0 commit comments

Comments
 (0)