Skip to content
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

add support for alreadyexists in storage #414

Merged
merged 1 commit into from
Nov 25, 2024
Merged

add support for alreadyexists in storage #414

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
28 changes: 27 additions & 1 deletion pkg/storage/v1/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

"github.com/kubescape/node-agent/pkg/config"
"github.com/kubescape/node-agent/pkg/storage"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/util/retry"

"github.com/cenkalti/backoff/v4"
"github.com/kubescape/go-logger"
Expand Down Expand Up @@ -149,8 +151,30 @@ func (sc Storage) GetApplicationActivity(namespace, name string) (*v1beta1.Appli

func (sc Storage) CreateFilteredSBOM(SBOM *v1beta1.SBOMSyftFiltered) error {
_, err := sc.StorageClient.SBOMSyftFiltereds(sc.namespace).Create(context.Background(), SBOM, metav1.CreateOptions{})
if err != nil {
switch {
case errors.IsAlreadyExists(err):
retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
// retrieve the latest version before attempting update
// RetryOnConflict uses exponential backoff to avoid exhausting the apiserver
result, getErr := sc.StorageClient.SBOMSyftFiltereds(sc.namespace).Get(context.Background(), SBOM.Name, metav1.GetOptions{ResourceVersion: "metadata"})
if getErr != nil {
return getErr
}
// update the SBOM manifest
result.Annotations = SBOM.Annotations
result.Labels = SBOM.Labels
result.Spec = SBOM.Spec
// try to send the updated workload configuration scan manifest
_, updateErr := sc.StorageClient.SBOMSyftFiltereds(sc.namespace).Update(context.Background(), result, metav1.UpdateOptions{})
return updateErr
})
if retryErr != nil {
return retryErr
}
case err != nil:
return err
default:
return nil
}
return nil
}
Expand Down Expand Up @@ -190,6 +214,7 @@ func (sc Storage) modifyName(n string) string {
}
return n
}

func (sc Storage) modifyNameP(n *string) {
if sc.multiplier != nil {
*n = fmt.Sprintf("%s-%d", *n, *sc.multiplier)
Expand All @@ -201,6 +226,7 @@ func (sc Storage) revertNameP(n *string) {
*n = strings.TrimSuffix(*n, fmt.Sprintf("-%d", *sc.multiplier))
}
}

func getMultiplier() *int {
if m := os.Getenv("MULTIPLY"); m != "true" {
return nil
Expand Down
Loading