Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Feature] Force spec apply even if conflicting resources exist with different deployment ID (#2338)

Browse Source 
* Added allowconflicts flag to specs
* Made changes for all resources
* Added help for allowconflicts flag
* Changed function isObjectMetaEqual
This commit is contained in:
Ankit Chawla
2022-02-02 12:28:41 +05:30
committed by GitHub
parent 590eefaa52
commit 3ac188124e
6 changed files with 85 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/spec/validate.go
+14 -10
View File
@@ -31,6 +31,7 @@ import (
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/console"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
"github.com/fission/fission/pkg/utils"
"github.com/fission/fission/pkg/utils/gitrepo"
@@ -71,7 +72,7 @@ func (opts *ValidateSubCommand) run(input cli.Input) error {
return errors.Wrap(err, "error validating specs")
}
err = resourceConflictCheck(opts.Client(), fr)
err = resourceConflictCheck(opts.Client(), fr, input.Bool(flagkey.SpecAllowConflicts))
if err != nil {
return errors.Wrap(err, "name conflict error")
}
@@ -89,7 +90,7 @@ func (opts *ValidateSubCommand) run(input cli.Input) error {
// the same name is already present in the same cluster namespace.
// If a same name resource exists in the same namespace, a name
// conflict error will be returned.
func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
func resourceConflictCheck(c client.Interface, fr *FissionResources, specAllowConflicts bool) error {
deployUID := fr.DeploymentConfig.UID
result := utils.MultiErrorWithFormat()
@@ -99,7 +100,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.Functions {
for _, cObj := range fnList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -112,7 +113,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.Environments {
for _, cObj := range envList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -125,7 +126,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.Packages {
for _, cObj := range pkgList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -138,7 +139,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.HttpTriggers {
for _, cObj := range httptriggerList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -151,7 +152,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.MessageQueueTriggers {
for _, cObj := range mqtriggerList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -164,7 +165,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.TimeTriggers {
for _, cObj := range timetriggerList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -177,7 +178,7 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
}
for _, sObj := range fr.KubernetesWatchTriggers {
for _, cObj := range kubewatchtriggerList {
if err := isResourceConflicts(deployUID, &sObj, &cObj); err != nil {
if err := isResourceConflicts(deployUID, &sObj, &cObj, specAllowConflicts); err != nil {
result = multierror.Append(result, err)
break
}
@@ -187,10 +188,13 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources) error {
return result.ErrorOrNil()
}
func isResourceConflicts(deployUID string, specObj fv1.MetadataAccessor, clusterObj fv1.MetadataAccessor) error {
func isResourceConflicts(deployUID string, specObj fv1.MetadataAccessor, clusterObj fv1.MetadataAccessor, specAllowConflicts bool) error {
if specObj.GetObjectMeta().GetName() == clusterObj.GetObjectMeta().GetName() &&
specObj.GetObjectMeta().GetNamespace() == clusterObj.GetObjectMeta().GetNamespace() &&
deployUID != clusterObj.GetObjectMeta().GetAnnotations()[FISSION_DEPLOYMENT_UID_KEY] {
if specAllowConflicts {
return nil
}
return fmt.Errorf("%v: '%v/%v' with different deploy uid already exists",
clusterObj.GetObjectKind().GroupVersionKind().Kind, clusterObj.GetObjectMeta().GetName(), clusterObj.GetObjectMeta().GetNamespace())
}