Skip to content

Allow stored templates to be referenced from osc process #1269

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
openshift-bot merged 1 commit into from
Mar 10, 2015
Merged

Allow stored templates to be referenced from osc process #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hack/test-cmd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ osc get templates
osc create -f examples/sample-app/application-template-dockerbuild.json
osc get templates
osc get templates ruby-helloworld-sample
[ -n "$(osc get templates ruby-helloworld-sample -o json | osc process -f -)" ]
osc process ruby-helloworld-sample
osc describe templates ruby-helloworld-sample
osc delete templates ruby-helloworld-sample
osc get templates
Expand Down
57 changes: 41 additions & 16 deletions pkg/cmd/cli/cmd/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"io"
"strings"

"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
Expand Down Expand Up @@ -42,9 +43,12 @@ JSON and YAML formats are accepted.

Examples:

# Convert template.json into resource list
# Convert template.json file into resource list
$ %[1]s process -f template.json

# Convert stored template into resource list
$ %[1]s process foo

# Convert template.json into resource list
$ cat template.json | %[1]s process -f -
`
Expand All @@ -56,32 +60,53 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.
Short: "Process template into list of resources",
Long: fmt.Sprintf(processLongDesc, fullName),
Run: func(cmd *cobra.Command, args []string) {
filename := cmdutil.GetFlagString(cmd, "filename")
if len(filename) == 0 {
usageError(cmd, "Must pass a filename to update")
storedTemplate := ""
if len(args) > 0 {
storedTemplate = args[0]
}

schema, err := f.Validator(cmd)
checkErr(err)
filename := cmdutil.GetFlagString(cmd, "filename")
if len(storedTemplate) == 0 && len(filename) == 0 {
usageError(cmd, "Must pass a filename or name of stored template")
}

cfg, err := f.ClientConfig(cmd)
checkErr(err)
namespace, err := f.DefaultNamespace(cmd)
checkErr(err)

mapper, typer := f.Object(cmd)

mapping, _, _, data := cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)
obj, err := mapping.Codec.Decode(data)
client, _, err := f.Clients(cmd)
checkErr(err)

templateObj, ok := obj.(*api.Template)
if !ok {
checkErr(fmt.Errorf("cannot convert input to Template"))
var (
templateObj *api.Template
mapping *meta.RESTMapping
)

if len(storedTemplate) > 0 {
templateObj, err = client.Templates(namespace).Get(storedTemplate)
Copy link
Contributor

@bparees bparees Mar 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't you need to check this error in case the template didn't exist?

version, kind, err := mapper.VersionAndKindForResource("template")
if mapping, err = mapper.RESTMapping(kind, version); err != nil {
checkErr(err)
}
} else {
schema, err := f.Validator(cmd)
checkErr(err)
cfg, err := f.ClientConfig(cmd)
checkErr(err)
var (
ok bool
data []byte
)
mapping, _, _, data = cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)
obj, err := mapping.Codec.Decode(data)
checkErr(err)
templateObj, ok = obj.(*api.Template)
if !ok {
checkErr(fmt.Errorf("cannot convert input to Template"))
}
}

client, _, err := f.Clients(cmd)
checkErr(err)

if cmd.Flag("value").Changed {
injectUserVars(cmd, templateObj)
}
Expand Down