Skip to content

Commit

Permalink
Merge pull request #94 from StrongMonkey/update
Browse files Browse the repository at this point in the history
Update for rancher-compose-executor
  • Loading branch information
Denise authored Oct 2, 2017
2 parents 6d3423f + e1a0099 commit 9ae8d33
Show file tree
Hide file tree
Showing 22 changed files with 99 additions and 30 deletions.
5 changes: 3 additions & 2 deletions cmd/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/rancher/go-rancher/catalog"
"github.com/rancher/go-rancher/v2"
"github.com/rancher/rancher-compose-executor/utils"
"github.com/urfave/cli"
)

Expand Down Expand Up @@ -106,7 +107,7 @@ func isInCSV(value, csv string) bool {
return false
}

func isOrchestrationSupported(ctx *cli.Context, proj *client.Project, labels map[string]interface{}) bool {
func isOrchestrationSupported(ctx *cli.Context, proj *client.Project, labels map[string]string) bool {
// Only check for system templates
if !ctx.Bool("system") {
return true
Expand Down Expand Up @@ -287,7 +288,7 @@ func catalogInstall(ctx *cli.Context) error {
case "kubernetes":
stack, err := c.KubernetesStack.Create(&client.KubernetesStack{
Name: stackName,
Templates: templateVersion.Files,
Templates: utils.ToMapInterface(templateVersion.Files),
ExternalId: externalID,
Environment: answers,
System: ctx.Bool("system"),
Expand Down
4 changes: 2 additions & 2 deletions vendor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ github.com/mitchellh/mapstructure ca63d7c062ee3c9f34db231e352b60012b4fd0c1
github.com/opencontainers/runc cc29e3dded8e27ba8f65738f40d251c885030a28
github.com/patrickmn/go-cache 1881a9bccb818787f68c52bfba648c6cf34c34fa
github.com/pkg/errors 1d2e60385a13aaa66134984235061c2f9302520e
github.com/rancher/go-rancher 8416cdbe06e6015287a06425e11598235b73a045
github.com/rancher/go-rancher 5930bc9972974b77636635e7316b9ce078f17f23
github.com/rancher/rancher-catalog-service a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a
github.com/rancher/rancher-compose-executor v0.14.18
github.com/rancher/rancher-compose-executor v0.14.19
github.com/rancher/rancher-docker-api-proxy 461b5e7022698283030495cf5693680699ce9c28
github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
Expand Down
8 changes: 5 additions & 3 deletions vendor/github.com/rancher/go-rancher/catalog/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/rancher/go-rancher/catalog/common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/rancher/rancher-compose-executor/app/app.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9ae8d33

Please sign in to comment.