github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-08-19 12:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoiding concurrent map write

Browse Source
This commit is contained in:
Dario Tranchitella
2021-06-16 08:49:50 +02:00
parent 44acfaed86
commit 46fc65a988
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/tenant_controller.go
+9 -6
View File
@@ -466,9 +466,10 @@ func (r *TenantReconciler) syncNamespaceMetadata(namespace string, tnt *capsulev
}
res, conflictErr = controllerutil.CreateOrUpdate(context.TODO(), r.Client, ns, func() error {
a := tnt.Spec.NamespacesMetadata.AdditionalAnnotations
if a == nil {
a = make(map[string]string)
a := make(map[string]string)
for k, v := range tnt.Spec.NamespacesMetadata.AdditionalAnnotations {
a[k] = v
}
if tnt.Spec.NodeSelector != nil {
@@ -508,10 +509,12 @@ func (r *TenantReconciler) syncNamespaceMetadata(namespace string, tnt *capsulev
ns.SetAnnotations(a)
l := tnt.Spec.NamespacesMetadata.AdditionalLabels
if l == nil {
l = make(map[string]string)
l := make(map[string]string)
for k, v := range tnt.Spec.NamespacesMetadata.AdditionalLabels {
l[k] = v
}
l["name"] = namespace
capsuleLabel, _ := capsulev1alpha1.GetTypeLabel(&capsulev1alpha1.Tenant{})
l[capsuleLabel] = tnt.GetName()