Skip to content
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

Jump to bottom

Remove debugs logs. #570

Merged
merged 2 commits into from
Aug 20, 2024
Merged

Remove debugs logs. #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9652253
use source_uri from model metadata
MUzairS15 Aug 20, 2024
2dea939
remove debug logs
MUzairS15 Aug 20, 2024
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
11 changes: 8 additions & 3 deletions models/meshmodel/core/v1beta1/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ type ArtifactHub struct{}
const MesheryAnnotationPrefix = "design.meshery.io"

func (ah ArtifactHub) HandleDependents(comp component.ComponentDefinition, kc *kubernetes.Client, isDeploy, performUpgrade bool) (summary string, err error) {
sourceURI, err := utils.Cast[string](comp.Metadata.AdditionalProperties["source_uri"]) // should be part of registrant data(?)
if err != nil {
sourceURI, ok := comp.Model.Metadata.AdditionalProperties["source_uri"] // should be part of registrant data(?)
if !ok {
return summary, err
}

Expand All @@ -72,9 +72,14 @@ func (ah ArtifactHub) HandleDependents(comp component.ComponentDefinition, kc *k
act = kubernetes.INSTALL
}

_sourceURI, err := utils.Cast[string](sourceURI)
if err != nil {
return summary, err
}

if sourceURI != "" {
err = kc.ApplyHelmChart(kubernetes.ApplyHelmChartConfig{
URL: sourceURI,
URL: _sourceURI,
Namespace: comp.Configuration["namespace"].(string),
CreateNamespace: true,
Action: act,
Expand Down
1 change: 0 additions & 1 deletion models/meshmodel/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ func (rm *RegistryManager) GetRegistrants(f *models.HostFilter) ([]models.MeshMo

var response []models.MeshModelHostsWithEntitySummary

fmt.Println("result--------------------------", result)
for _, r := range result {
res := models.MeshModelHostsWithEntitySummary{
Connection: r.Connection,
Expand Down
3 changes: 0 additions & 3 deletions models/meshmodel/registry/v1beta1/component_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package v1beta1

import (
"fmt"

"github.com/layer5io/meshkit/database"
"github.com/layer5io/meshkit/models/meshmodel/entity"
"github.com/layer5io/meshkit/models/meshmodel/registry"
Expand Down Expand Up @@ -139,7 +137,6 @@ func (componentFilter *ComponentFilter) Get(db *database.Handler) ([]entity.Enti
err := finder.
Scan(&componentDefinitionsWithModel).Error
if err != nil {
fmt.Println("line 123 : =+++++++++++++++", err)
return nil, 0, 0, err
}

Expand Down
2 changes: 0 additions & 2 deletions utils/kubernetes/apply-manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package kubernetes

import (
"context"
"fmt"
"strings"

v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -95,7 +94,6 @@ func (client *Client) ApplyManifest(contents []byte, recvOptions ApplyOptions) e
return err
}
} else {
fmt.Println("Creating object", object)
_, err = createObject(helper, options.Namespace, object, options.Update)
if err != nil && !kubeerror.IsAlreadyExists(err) {
if recvOptions.IgnoreErrors {
Expand Down
Loading