Skip to content

Commit

Permalink
Merge pull request #281 from Revolyssup/fix
Browse files Browse the repository at this point in the history
Fix breaking sample apps
  • Loading branch information
leecalcote authored Jul 12, 2022
2 parents 8bc4539 + e4f03d9 commit e39a451
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
1 change: 0 additions & 1 deletion build/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func init() {
if len(allVersions) == 0 {
return
}
fmt.Println("here0")
for i, v := range allVersions {
if i == len(allVersions)-1 { //only get AppVersion of latest chart version
//Executing the below function for all versions is redundant and takes time on startup, we only want to know the latest app version of latest version.
Expand Down
11 changes: 1 addition & 10 deletions consul/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ package consul

import (
"fmt"
"io/ioutil"
"path"
"sync"

"github.com/layer5io/meshery-adapter-library/adapter"
Expand Down Expand Up @@ -96,14 +94,7 @@ func (h *Consul) applyManifests(request adapter.OperationRequest, operation adap
}
} else {
for _, template := range operation.Templates {
p := path.Join("consul", "config_templates", string(template))
tpl, err := ioutil.ReadFile(p)
if err != nil {
errMx.Lock()
errs = append(errs, err)
errMx.Unlock()
continue
}
tpl := []byte(template.String())
merged, err := utils.MergeToTemplate(tpl, map[string]string{"namespace": request.Namespace})
if err != nil {
errMx.Lock()
Expand Down
1 change: 0 additions & 1 deletion consul/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func (h *Consul) ApplyOperation(ctx context.Context, request adapter.OperationRe
config.HTTPBinOperation,
config.ImageHubOperation,
config.BookInfoOperation:

status, err := h.applyManifests(request, *operation, kubeconfigs)
if err != nil {
e.Summary = fmt.Sprintf("Error while %s %s", status, opDesc)
Expand Down

0 comments on commit e39a451

Please sign in to comment.