Iter

Author: ajanikow

pkg/apis/deployment/v1/license_spec.go

@@ -93,7 +93,7 @@ func (s LicenseSpec) GetTelemetry() bool {
 
 // GetInventory returns the license Inventory
 func (s LicenseSpec) GetInventory() bool {
-	return util.OptionalType(s.Telemetry, true)
+	return util.OptionalType(s.Inventory, true)
 }
 
 // Validate validates the LicenseSpec

pkg/apis/deployment/v2alpha1/license_spec.go

@@ -93,7 +93,7 @@ func (s LicenseSpec) GetTelemetry() bool {
 
 // GetInventory returns the license Inventory
 func (s LicenseSpec) GetInventory() bool {
-	return util.OptionalType(s.Telemetry, true)
+	return util.OptionalType(s.Inventory, true)
 }
 
 // Validate validates the LicenseSpec

pkg/crd/crds/database-deployment.schema.generated.yaml

@@ -27514,6 +27514,9 @@ v2alpha1:
               expirationGracePeriod:
                 description: ExpirationGracePeriod defines the expiration grace period for the license
                 type: string
+              inventory:
+                description: Inventory defines if inventory is collected
+                type: boolean
               mode:
                 description: Mode Defines the mode of license
                 enum:

pkg/deployment/reconcile/action_license_generate.go

@@ -164,7 +164,7 @@ func (a *actionLicenseGenerate) Start(ctx context.Context) (bool, error) {
 
 	if expires.After(license.Expires()) {
 		// License will expire before grace period, reduce to 90%
-		expires = time.Now().Add(time.Duration(math.Round(float64(time.Since(license.Expires())) * api.LicenseExpirationGraceRatio)))
+		expires = time.Now().Add(time.Duration(math.Round(float64(time.Until(license.Expires())) * api.LicenseExpirationGraceRatio)))
 	}
 
 	if err := a.actionCtx.WithStatusUpdate(ctx, func(s *api.DeploymentStatus) bool {