Skip to content

Commit

Permalink
odo dev: Add support for non-exec commands part of a composite run …
Browse files Browse the repository at this point in the history 
…or debug command (#5923)

* Initial commit

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Move ValidateResourceExist(s) from pkg/service to pkg/devfile/adapters/kubernetes/component

* Fix odo dev cleanup

* Fix multiple deployment issue

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* DRY the code

* Fix unit test failure

* Add integration tests

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* remove comment

* Add isPartOfComponent to GetLabels, and GetSelector

* Add unit tests for changes in ListResourcesToDeleteFromDevfile

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Fix unit test failures due to removal of component label

* Enhance integration tests

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Use a single devfile.yaml

* Fix test failures

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Fix rebase conflicts, add new tests for remote Dockerfile URI, and rm3l's review

Signed-off-by: Parthvi Vala <pvala@redhat.com>

Co-authored-by: Parthvi Vala <pvala@redhat.com>
Co-authored-by: Armel Soro <armel@rm3l.org>
Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Attempt at fixing integration tests

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Fix integration tests

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Mockgen

* Changes post rebase

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Attempt at fixing integration tests

Signed-off-by: Parthvi Vala <pvala@redhat.com>

* Fix rebase mishap

Signed-off-by: Parthvi Vala <pvala@redhat.com>

Co-authored-by: Armel Soro <armel@rm3l.org>
  • Loading branch information
@valaparthvi @rm3l
valaparthvi and rm3l authored Aug 10, 2022
1 parent c384f54 commit 224069c
Show file tree
Hide file tree
Showing 48 changed files with 1,590 additions and 1,095 deletions.
5 changes: 3 additions & 2 deletions pkg/binding/binding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import (
"fmt"
"path/filepath"

"github.com/redhat-developer/odo/pkg/project"
bindingApis "github.com/redhat-developer/service-binding-operator/apis"
bindingApi "github.com/redhat-developer/service-binding-operator/apis/binding/v1alpha1"
specApi "github.com/redhat-developer/service-binding-operator/apis/spec/v1alpha3"

"github.com/redhat-developer/odo/pkg/project"

"github.com/devfile/library/pkg/devfile/parser"
devfilefs "github.com/devfile/library/pkg/testingutil/filesystem"
"gopkg.in/yaml.v2"
Expand Down Expand Up @@ -301,7 +302,7 @@ func (o *BindingClient) checkServiceBindingOperatorInstalled() error {

func (o *BindingClient) CheckServiceBindingsInjectionDone(componentName string, appName string) (bool, error) {

deployment, err := o.kubernetesClient.GetOneDeployment(componentName, appName)
deployment, err := o.kubernetesClient.GetOneDeployment(componentName, appName, true)
if err != nil {
// If not deployment yet => all bindings are done
if _, ok := err.(*kclient.DeploymentNotFoundError); ok {
Expand Down
4 changes: 2 additions & 2 deletions pkg/component/component.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func Exists(client kclient.ClientInterface, componentName, applicationName strin

// GetOnePod gets a pod using the component and app name
func GetOnePod(client kclient.ClientInterface, componentName string, appName string) (*corev1.Pod, error) {
return client.GetRunningPodFromSelector(odolabels.GetSelector(componentName, appName, odolabels.ComponentDevMode))
return client.GetRunningPodFromSelector(odolabels.GetSelector(componentName, appName, odolabels.ComponentDevMode, false))
}

// Log returns log from component
Expand Down Expand Up @@ -209,7 +209,7 @@ func ListAllClusterComponents(client kclient.ClientInterface, namespace string)
}

func getResourcesForComponent(client kclient.ClientInterface, name string, namespace string) ([]unstructured.Unstructured, error) {
selector := labels.GetSelector(name, "app", labels.ComponentAnyMode)
selector := labels.GetSelector(name, "app", labels.ComponentAnyMode, false)
resourceList, err := client.GetAllResourcesFromSelector(selector, namespace)
if err != nil {
return nil, err
Expand Down
46 changes: 25 additions & 21 deletions pkg/component/delete/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"path/filepath"

"github.com/devfile/library/pkg/devfile/parser"
"k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
kerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -36,7 +37,7 @@ func NewDeleteComponentClient(kubeClient kclient.ClientInterface) *DeleteCompone
// It only returns resources not owned by another resource of the component, letting the garbage collector do its job
func (do *DeleteComponentClient) ListClusterResourcesToDelete(componentName string, namespace string) ([]unstructured.Unstructured, error) {
var result []unstructured.Unstructured
selector := odolabels.GetSelector(componentName, "app", odolabels.ComponentAnyMode)
selector := odolabels.GetSelector(componentName, "app", odolabels.ComponentAnyMode, false)
list, err := do.kubeClient.GetAllResourcesFromSelector(selector, namespace)
if err != nil {
return nil, err
Expand Down Expand Up @@ -90,7 +91,7 @@ func references(list []unstructured.Unstructured, ownerRef metav1.OwnerReference

// ListResourcesToDeleteFromDevfile parses all the devfile components and returns a list of resources that are present on the cluster and can be deleted
func (do DeleteComponentClient) ListResourcesToDeleteFromDevfile(devfileObj parser.DevfileObj, appName string, mode string) (isInnerLoopDeployed bool, resources []unstructured.Unstructured, err error) {

var deployment *v1.Deployment
if mode == odolabels.ComponentDevMode || mode == odolabels.ComponentAnyMode {
// Inner Loop
// Fetch the deployment of the devfile component
Expand All @@ -101,7 +102,7 @@ func (do DeleteComponentClient) ListResourcesToDeleteFromDevfile(devfileObj pars
return isInnerLoopDeployed, resources, fmt.Errorf("failed to get the resource %q name for component %q; cause: %w", kclient.DeploymentKind, componentName, err)
}

deployment, err := do.kubeClient.GetDeploymentByName(deploymentName)
deployment, err = do.kubeClient.GetDeploymentByName(deploymentName)
if err != nil && !kerrors.IsNotFound(err) {
return isInnerLoopDeployed, resources, err
}
Expand All @@ -120,27 +121,30 @@ func (do DeleteComponentClient) ListResourcesToDeleteFromDevfile(devfileObj pars
}
}

if mode == odolabels.ComponentDeployMode || mode == odolabels.ComponentAnyMode {
// Outer Loop
// Parse the devfile for outerloop K8s resources
localResources, err := libdevfile.ListKubernetesComponents(devfileObj, filepath.Dir(devfileObj.Ctx.GetAbsPath()))
// Parse the devfile for K8s resources; these may belong to either innerloop or outerloop
localResources, err := libdevfile.ListKubernetesComponents(devfileObj, filepath.Dir(devfileObj.Ctx.GetAbsPath()))
if err != nil {
return isInnerLoopDeployed, resources, fmt.Errorf("failed to gather resources for deletion: %w", err)
}
for _, lr := range localResources {
var gvr *meta.RESTMapping
gvr, err = do.kubeClient.GetRestMappingFromUnstructured(lr)
if err != nil {
return isInnerLoopDeployed, resources, fmt.Errorf("failed to gather resources for deletion: %w", err)
continue
}
for _, lr := range localResources {
var gvr *meta.RESTMapping
gvr, err = do.kubeClient.GetRestMappingFromUnstructured(lr)
if err != nil {
continue
}
// Try to fetch the resource from the cluster; if it exists, append it to the resources list
var cr *unstructured.Unstructured
cr, err = do.kubeClient.GetDynamicResource(gvr.Resource, lr.GetName())
if err != nil {
continue
// Try to fetch the resource from the cluster; if it exists, append it to the resources list
var cr *unstructured.Unstructured
cr, err = do.kubeClient.GetDynamicResource(gvr.Resource, lr.GetName())
// If a specific mode is asked for, then make sure it matches with the cr's mode.
if err != nil || (mode != odolabels.ComponentAnyMode && odolabels.GetMode(cr.GetLabels()) != mode) {
if cr != nil {
klog.V(4).Infof("Ignoring resource: %s/%s; its mode(%s) does not match with the given mode(%s)", gvr.Resource.Resource, lr.GetName(), odolabels.GetMode(cr.GetLabels()), mode)
} else {
klog.V(4).Infof("Ignoring resource: %s/%s; it does not exist on the cluster", gvr.Resource.Resource, lr.GetName())
}
resources = append(resources, *cr)
continue
}
resources = append(resources, *cr)
}

return isInnerLoopDeployed, resources, nil
Expand All @@ -155,7 +159,7 @@ func (do *DeleteComponentClient) ExecutePreStopEvents(devfileObj parser.DevfileO
klog.V(4).Infof("Gathering information for component: %q", componentName)

klog.V(3).Infof("Checking component status for %q", componentName)
selector := odolabels.GetSelector(componentName, appName, odolabels.ComponentDevMode)
selector := odolabels.GetSelector(componentName, appName, odolabels.ComponentDevMode, false)
pod, err := do.kubeClient.GetRunningPodFromSelector(selector)
if err != nil {
klog.V(1).Info("Component not found on the cluster.")
Expand Down
Loading

0 comments on commit 224069c

Please sign in to comment.