Skip to content

Force creation of generic items into AppWrapper deployment namespace #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Force creation of generic items into AppWrapper deployment namespace #665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61ee4e7
Force creation of generic items into namespace of AppWrapper
tardieu Oct 18, 2023
324aa60
Restrict resource deletion to AppWrapper namespace
tardieu Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions pkg/controller/queuejobresources/genericresource/genericresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,24 @@ func (gr *GenericResources) Cleanup(aw *arbv1.AppWrapper, awr *arbv1.AppWrapperG
}

unstruct.Object = blob.(map[string]interface{}) // set object to the content of the blob after Unmarshalling
namespace := ""
namespace := aw.Namespace // only delete resources from AppWrapper namespace
if md, ok := unstruct.Object["metadata"]; ok {

metadata := md.(map[string]interface{})
if objectName, ok := metadata["name"]; ok {
name = objectName.(string)
}
if objectns, ok := metadata["namespace"]; ok {
namespace = objectns.(string)
if objectns.(string) != namespace {
err := fmt.Errorf("[Cleanup] resource namespace \"%s\" is different from AppWrapper namespace \"%s\"", objectns.(string), namespace)
return name, gvk, err
}
}
}

// Get the resource to see if it exists
// Get the resource to see if it exists in the AppWrapper namespace
labelSelector := fmt.Sprintf("%s=%s, %s=%s", appwrapperJobName, aw.Name, resourceName, unstruct.GetName())
inEtcd, err := dclient.Resource(rsrc).List(context.Background(), metav1.ListOptions{LabelSelector: labelSelector})
inEtcd, err := dclient.Resource(rsrc).Namespace(aw.Namespace).List(context.Background(), metav1.ListOptions{LabelSelector: labelSelector})
if err != nil {
return name, gvk, err
}
Expand Down Expand Up @@ -273,7 +276,7 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra
ownerRef := metav1.NewControllerRef(aw, appWrapperKind)
unstruct.Object = blob.(map[string]interface{}) // set object to the content of the blob after Unmarshalling
unstruct.SetOwnerReferences(append(unstruct.GetOwnerReferences(), *ownerRef))
namespace := "default"
namespace := aw.Namespace // only create resources in AppWrapper namespace
name := ""
if md, ok := unstruct.Object["metadata"]; ok {

Expand All @@ -282,7 +285,10 @@ func (gr *GenericResources) SyncQueueJob(aw *arbv1.AppWrapper, awr *arbv1.AppWra
name = objectName.(string)
}
if objectns, ok := metadata["namespace"]; ok {
namespace = objectns.(string)
if objectns.(string) != namespace {
err := fmt.Errorf("[SyncQueueJob] resource namespace \"%s\" is different from AppWrapper namespace \"%s\"", objectns.(string), namespace)
return []*v1.Pod{}, err
}
}
}
labels := map[string]string{}
Expand Down