Address review comments

api/v1alpha1/types_etcd.go

@@ -173,9 +173,9 @@ type BackupSpec struct {
 	// All full snapshots beyond this limit will be garbage collected.
 	// +optional
 	MaxBackupsLimitBasedGC *int32 `json:"maxBackupsLimitBasedGC,omitempty"`
-	// FullsnapLeaseUpdateRetryInterval defines the interval for retrying to update the full snapshot lease
+	// FullSnapshotLeaseUpdateInterval defines the interval for retrying to update the full snapshot lease.
 	// +optional
-	FullsnapLeaseUpdateRetryInterval *metav1.Duration `json:"fullsnapLeaseUpdateRetryInterval,omitempty"`
+	FullSnapshotLeaseUpdateInterval *metav1.Duration `json:"fullSnapshotLeaseUpdateInterval,omitempty"`
 	// GarbageCollectionPeriod defines the period for garbage collecting old backups
 	// +optional
 	GarbageCollectionPeriod *metav1.Duration `json:"garbageCollectionPeriod,omitempty"`

charts/druid/charts/crds/templates/10-crd-druid.gardener.cloud_etcds.yaml

@@ -162,14 +162,14 @@ spec:
                     description: EtcdSnapshotTimeout defines the timeout duration
                       for etcd FullSnapshot operation
                     type: string
+                  fullSnapshotLeaseUpdateInterval:
+                    description: FullSnapshotLeaseUpdateInterval defines the interval
+                      for retrying to update the full snapshot lease.
+                    type: string
                   fullSnapshotSchedule:
                     description: FullSnapshotSchedule defines the cron standard schedule
                       for full snapshots.
                     type: string
-                  fullsnapLeaseUpdateRetryInterval:
-                    description: FullsnapLeaseUpdateRetryInterval defines the interval
-                      for retrying to update the full snapshot lease
-                    type: string
                   garbageCollectionPeriod:
                     description: GarbageCollectionPeriod defines the period for garbage
                       collecting old backups

config/crd/bases/10-crd-druid.gardener.cloud_etcds.yaml

@@ -162,14 +162,14 @@ spec:
                     description: EtcdSnapshotTimeout defines the timeout duration
                       for etcd FullSnapshot operation
                     type: string
+                  fullSnapshotLeaseUpdateInterval:
+                    description: FullSnapshotLeaseUpdateInterval defines the interval
+                      for retrying to update the full snapshot lease.
+                    type: string
                   fullSnapshotSchedule:
                     description: FullSnapshotSchedule defines the cron standard schedule
                       for full snapshots.
                     type: string
-                  fullsnapLeaseUpdateRetryInterval:
-                    description: FullsnapLeaseUpdateRetryInterval defines the interval
-                      for retrying to update the full snapshot lease
-                    type: string
                   garbageCollectionPeriod:
                     description: GarbageCollectionPeriod defines the period for garbage
                       collecting old backups

pkg/component/etcd/statefulset/statefulset_test.go

@@ -1099,8 +1099,8 @@ func expectedBackupArgs(values *Values) Elements {
 	if values.DeltaSnapshotRetentionPeriod != nil {
 		elements[fmt.Sprintf("--delta-snapshot-retention-period=%s", values.DeltaSnapshotRetentionPeriod.Duration.String())] = Equal(fmt.Sprintf("--delta-snapshot-retention-period=%s", values.DeltaSnapshotRetentionPeriod.Duration.String()))
 	}
-	if values.FullsnapLeaseUpdateRetryInterval != nil {
-		elements[fmt.Sprintf("--fullsnap-lease-update-retry-interval=%s", values.FullsnapLeaseUpdateRetryInterval.Duration.String())] = Equal(fmt.Sprintf("--fullsnap-lease-update-retry-interval=%s", values.FullsnapLeaseUpdateRetryInterval.Duration.String()))
+	if values.FullSnapshotLeaseUpdateInterval != nil {
+		elements[fmt.Sprintf("--full-snapshot-lease-update-interval=%s", values.FullSnapshotLeaseUpdateInterval.Duration.String())] = Equal(fmt.Sprintf("--full-snapshot-lease-update-interval=%s", values.FullSnapshotLeaseUpdateInterval.Duration.String()))
 	}
 	return elements
 }

pkg/component/etcd/statefulset/values.go

@@ -69,9 +69,9 @@ type Values struct {
 	FailBelowRevision       string
 	VolumeClaimTemplateName string
 
-	FullSnapLeaseName                string
-	DeltaSnapLeaseName               string
-	FullsnapLeaseUpdateRetryInterval *metav1.Duration
+	FullSnapLeaseName               string
+	DeltaSnapLeaseName              string
+	FullSnapshotLeaseUpdateInterval *metav1.Duration
 
 	StorageCapacity *resource.Quantity
 	StorageClass    *string

pkg/component/etcd/statefulset/values_helper.go

@@ -78,9 +78,9 @@ func GenerateValues(
 
 		VolumeClaimTemplateName: volumeClaimTemplateName,
 
-		FullSnapLeaseName:                etcd.GetFullSnapshotLeaseName(),
-		DeltaSnapLeaseName:               etcd.GetDeltaSnapshotLeaseName(),
-		FullsnapLeaseUpdateRetryInterval: etcd.Spec.Backup.FullsnapLeaseUpdateRetryInterval,
+		FullSnapLeaseName:               etcd.GetFullSnapshotLeaseName(),
+		DeltaSnapLeaseName:              etcd.GetDeltaSnapshotLeaseName(),
+		FullSnapshotLeaseUpdateInterval: etcd.Spec.Backup.FullSnapshotLeaseUpdateInterval,
 
 		StorageCapacity: etcd.Spec.StorageCapacity,
 		StorageClass:    etcd.Spec.StorageClass,
@@ -219,8 +219,8 @@ func getBackupRestoreCommandArgs(val Values) ([]string, error) {
 		command = append(command, "--enable-snapshot-lease-renewal=true")
 		command = append(command, "--delta-snapshot-lease-name="+val.DeltaSnapLeaseName)
 		command = append(command, "--full-snapshot-lease-name="+val.FullSnapLeaseName)
-		if val.FullsnapLeaseUpdateRetryInterval != nil {
-			command = append(command, "--fullsnap-lease-update-retry-interval="+val.FullsnapLeaseUpdateRetryInterval.String())
+		if val.FullSnapshotLeaseUpdateInterval != nil {
+			command = append(command, "--full-snapshot-lease-update-interval="+val.FullSnapshotLeaseUpdateInterval.Duration.String())
 		}
 	}