mirror of
https://github.com/kubevela/kubevela.git
synced 2026-05-08 10:27:42 +00:00
dbfd6a1d10
* Fix: prioritize namespace flag for `vela up` Currently, CLI applies application to `default` namespace when there is no explicit namespace in application spec, even if the namespace flag is set. This commit fixes issue by overriding the namespace if the namespace flag is set. Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit4cf07dcd97) * Test: add test cases for overriding namespaces Signed-off-by: Sunghoon Kang <hoon@linecorp.com> (cherry picked from commit5ba93541e4) Co-authored-by: Sunghoon Kang <hoon@linecorp.com>
90 lines
2.8 KiB
Go
90 lines
2.8 KiB
Go
/*
|
|
Copyright 2021 The KubeVela Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package cli
|
|
|
|
import (
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
corev1beta1 "github.com/oam-dev/kubevela/apis/core.oam.dev/v1beta1"
|
|
"github.com/oam-dev/kubevela/apis/types"
|
|
common2 "github.com/oam-dev/kubevela/pkg/utils/common"
|
|
cmdutil "github.com/oam-dev/kubevela/pkg/utils/util"
|
|
"github.com/oam-dev/kubevela/references/common"
|
|
)
|
|
|
|
// NewUpCommand will create command for applying an AppFile
|
|
func NewUpCommand(c common2.Args, order string, ioStream cmdutil.IOStreams) *cobra.Command {
|
|
appFilePath := new(string)
|
|
cmd := &cobra.Command{
|
|
Use: "up",
|
|
DisableFlagsInUseLine: true,
|
|
Short: "Apply an appfile or application from file",
|
|
Long: "Create or update vela application from file or URL, both appfile or application object format are supported.",
|
|
Annotations: map[string]string{
|
|
types.TagCommandOrder: order,
|
|
types.TagCommandType: types.TypeStart,
|
|
},
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
namespace, err := GetFlagNamespaceOrEnv(cmd, c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
kubecli, err := c.GetClient()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
body, err := common.ReadRemoteOrLocalPath(*appFilePath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if common.IsAppfile(body) {
|
|
o := &common.AppfileOptions{
|
|
Kubecli: kubecli,
|
|
IO: ioStream,
|
|
Namespace: namespace,
|
|
}
|
|
return o.Run(*appFilePath, o.Namespace, c)
|
|
}
|
|
var app corev1beta1.Application
|
|
err = yaml.Unmarshal(body, &app)
|
|
if err != nil {
|
|
return errors.Wrap(err, "File format is illegal, only support vela appfile format or OAM Application object yaml")
|
|
}
|
|
|
|
// Override namespace if namespace flag is set. We should check if namespace is `default` or not
|
|
// since GetFlagNamespaceOrEnv returns default namespace when failed to get current env.
|
|
if namespace != "" && namespace != types.DefaultAppNamespace {
|
|
app.SetNamespace(namespace)
|
|
}
|
|
err = common.ApplyApplication(app, ioStream, kubecli)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
cmd.SetOut(ioStream.Out)
|
|
cmd.Flags().StringVarP(appFilePath, "file", "f", "", "specify file path for appfile or application, it could be a remote url.")
|
|
|
|
addNamespaceAndEnvArg(cmd)
|
|
return cmd
|
|
}
|