Merge commit '7eb07eebff9bc1297c87a04ee4d703b491bc8ca2'

This commit is contained in:
Lorenzo Manacorda
2016-10-19 12:37:12 +02:00
4 changed files with 20 additions and 5 deletions

View File

@@ -81,7 +81,7 @@ func deploy(c Client, args []string) {
username = flags.String("u", "", "Username to report to deploy service (default with be current user)")
services ArrayFlags
)
flag.Var(&services, "service", "Service to update (can be repeated)")
flags.Var(&services, "service", "Service to update (can be repeated)")
if err := flags.Parse(args); err != nil {
usage()
return

View File

@@ -20,10 +20,12 @@ type Deployment struct {
// Config for the deployment system for a user.
type Config struct {
RepoURL string `json:"repo_url" yaml:"repo_url"`
RepoBranch string `json:"repo_branch" yaml:"repo_branch"`
RepoPath string `json:"repo_path" yaml:"repo_path"`
RepoBranch string `json:"repo_branch" yaml:"repo_branch"`
RepoKey string `json:"repo_key" yaml:"repo_key"`
KubeconfigPath string `json:"kubeconfig_path" yaml:"kubeconfig_path"`
AutoApply bool `json:"auto_apply" yaml:"auto_apply"`
Notifications []NotificationConfig `json:"notifications" yaml:"notifications"`
@@ -35,7 +37,8 @@ type Config struct {
// NotificationConfig describes how to send notifications
type NotificationConfig struct {
SlackWebhookURL string `json:"slack_webhook_url" yaml:"slack_webhook_url"`
SlackUsername string `json:"slack_username" yaml:"slack_username"`
MessageTemplate string `json:"message_template" yaml:"message_template"`
SlackWebhookURL string `json:"slack_webhook_url" yaml:"slack_webhook_url"`
SlackUsername string `json:"slack_username" yaml:"slack_username"`
MessageTemplate string `json:"message_template" yaml:"message_template"`
ApplyMessageTemplate string `json:"apply_message_template" yaml:"apply_message_template"`
}