diff --git a/internal/controller/api_service_accounts.go b/internal/controller/api_service_accounts.go index 14e979d..cdea23a 100644 --- a/internal/controller/api_service_accounts.go +++ b/internal/controller/api_service_accounts.go @@ -39,7 +39,6 @@ func (controller *Controller) createServiceAccount(ctx *gin.Context) responder.R } serviceAccount.CreatedAt = time.Now() - serviceAccount.Generation = 0 return controller.storeUpdate(func(txn storepkg.Transaction) responder.Responder { // Does the Service Account resource with this name already exists? @@ -81,8 +80,6 @@ func (controller *Controller) updateServiceAccount(ctx *gin.Context) responder.R return responder.Error(err) } - dbServiceAccount.Generation++ - if err := txn.SetServiceAccount(dbServiceAccount); err != nil { return responder.Code(http.StatusInternalServerError) } diff --git a/internal/controller/api_vms.go b/internal/controller/api_vms.go index c1a9683..d6d90b8 100644 --- a/internal/controller/api_vms.go +++ b/internal/controller/api_vms.go @@ -29,7 +29,6 @@ func (controller *Controller) createVM(ctx *gin.Context) responder.Responder { vm.Status = v1.VMStatusPending vm.CreatedAt = time.Now() vm.UID = uuid.New().String() - vm.Generation = 0 return controller.storeUpdate(func(txn storepkg.Transaction) responder.Responder { // Does the VM resource with this name already exists? @@ -73,7 +72,6 @@ func (controller *Controller) updateVM(ctx *gin.Context) responder.Responder { dbVM.Status = userVM.Status dbVM.StatusMessage = userVM.StatusMessage - dbVM.Generation++ if err := txn.SetVM(*dbVM); err != nil { return responder.Code(http.StatusInternalServerError) diff --git a/internal/controller/api_workers.go b/internal/controller/api_workers.go index 64087fb..df0b7c7 100644 --- a/internal/controller/api_workers.go +++ b/internal/controller/api_workers.go @@ -30,7 +30,6 @@ func (controller *Controller) createWorker(ctx *gin.Context) responder.Responder worker.LastSeen = currentTime } worker.CreatedAt = currentTime - worker.Generation = 0 return controller.storeUpdate(func(txn storepkg.Transaction) responder.Responder { // In case there already exist a worker with the same name, @@ -70,7 +69,6 @@ func (controller *Controller) updateWorker(ctx *gin.Context) responder.Responder } dbWorker.LastSeen = userWorker.LastSeen - dbWorker.Generation++ if err := txn.SetWorker(*dbWorker); err != nil { return responder.Code(http.StatusInternalServerError) diff --git a/internal/controller/controller.go b/internal/controller/controller.go index e4f312b..a837ef4 100644 --- a/internal/controller/controller.go +++ b/internal/controller/controller.go @@ -121,7 +121,6 @@ func (controller *Controller) EnsureServiceAccount(serviceAccount *v1.ServiceAcc } serviceAccount.CreatedAt = time.Now() - serviceAccount.Generation = 0 return controller.store.Update(func(txn storepkg.Transaction) error { return txn.SetServiceAccount(serviceAccount) diff --git a/pkg/resource/v1/v1.go b/pkg/resource/v1/v1.go index 8df9a02..c75cba4 100644 --- a/pkg/resource/v1/v1.go +++ b/pkg/resource/v1/v1.go @@ -16,11 +16,6 @@ type Meta struct { // It is populated by the Controller with the current time // when receiving a POST request. CreatedAt time.Time `json:"createdAt"` - - // Generation is a useful field for avoiding data races within a single UID. - // - // It is populated by the controller when receiving POST or PUT requests. - Generation int64 `json:"generation"` } type Worker struct {