mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #2610 from ddysher/node-namespace
Fix node namespace.
This commit is contained in:
commit
585afa1bae
@ -551,6 +551,9 @@ func ValidateBoundPod(pod *api.BoundPod) (errors []error) {
|
||||
// ValidateMinion tests if required fields in the minion are set.
|
||||
func ValidateMinion(minion *api.Minion) errs.ValidationErrorList {
|
||||
allErrs := errs.ValidationErrorList{}
|
||||
if len(minion.Namespace) != 0 {
|
||||
allErrs = append(allErrs, errs.NewFieldInvalid("namespace", minion.Namespace))
|
||||
}
|
||||
if len(minion.Name) == 0 {
|
||||
allErrs = append(allErrs, errs.NewFieldRequired("name", minion.Name))
|
||||
}
|
||||
|
@ -155,8 +155,10 @@ func ResourceFromFile(filename string, typer runtime.ObjectTyper, mapper meta.RE
|
||||
// prevents a user from unintentionally updating the wrong namespace.
|
||||
func CompareNamespaceFromFile(cmd *cobra.Command, namespace string) error {
|
||||
defaultNamespace := getKubeNamespace(cmd)
|
||||
if defaultNamespace != namespace {
|
||||
return fmt.Errorf("the namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace)
|
||||
if len(namespace) > 0 {
|
||||
if defaultNamespace != namespace {
|
||||
return fmt.Errorf("the namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
@ -59,10 +59,6 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan apiserver.RE
|
||||
api.FillObjectMetaSystemFields(ctx, &minion.ObjectMeta)
|
||||
|
||||
return apiserver.MakeAsync(func() (runtime.Object, error) {
|
||||
// TODO: Need to fill in any server-set fields (uid, timestamp, etc) before
|
||||
// returning minion. Can't do it properly at the moment because the registry
|
||||
// healthchecking, which might cause it to not return the minion at all. Fix
|
||||
// this after we move the healthchecking out of the minion registry.
|
||||
err := rs.registry.CreateMinion(ctx, minion)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
Loading…
Reference in New Issue
Block a user