make issueRenewalTimeout an internal parameter

Signed-off-by: Jing Liu <[email protected]>

Author: 7ing

manager/manager.go

@@ -87,11 +87,6 @@ type Options struct {
 
 	// RenewalBackoffConfig configures the exponential backoff applied to certificate renewal failures.
 	RenewalBackoffConfig *wait.Backoff
-	// IssueRenewalTimeout defines timeout value for each issue() call in renewal process
-	IssueRenewalTimeout time.Duration
-	// IssuePollInterval defines an interval time for each subroutine call (check CSR status) within issue() function
-	// Note, the IssuePollInterval should be less than IssueRenewalTimeout
-	IssuePollInterval time.Duration
 }
 
 // NewManager constructs a new manager used to manage volumes containing
@@ -153,16 +148,6 @@ func NewManager(opts Options) (*Manager, error) {
 	if opts.MaxRequestsPerVolume < 0 {
 		return nil, errors.New("MaxRequestsPerVolume cannot be less than zero")
 	}
-	if opts.IssueRenewalTimeout == 0 {
-		opts.IssueRenewalTimeout = 10 * time.Second
-	}
-	if opts.IssuePollInterval == 0 {
-		opts.IssuePollInterval = time.Second
-	}
-	if opts.IssuePollInterval >= opts.IssueRenewalTimeout {
-		return nil, errors.New("IssuePollInterval should be less than IssueRenewalTimeout")
-	}
-	// Check IssuePollInterval is less than IssueRenewalTimeout
 	if len(opts.NodeID) == 0 {
 		return nil, errors.New("NodeID must be set")
 	}
@@ -204,8 +189,7 @@ func NewManager(opts Options) (*Manager, error) {
 		maxRequestsPerVolume: opts.MaxRequestsPerVolume,
 		nodeNameHash:         nodeNameHash,
 		backoffConfig:        *opts.RenewalBackoffConfig,
-		issueRenewalTimeout:  opts.IssueRenewalTimeout,
-		issuePollInterval:    opts.IssuePollInterval,
+		issueRenewalTimeout:  time.Second * 60, // issueRenewalTimeout set to align with NodePublishVolume timeout value
 		requestNameGenerator: func() string {
 			return string(uuid.NewUUID())
 		},
@@ -310,9 +294,6 @@ type Manager struct {
 
 	// issueRenewalTimeout defines timeout value for each issue() call in renewal process
 	issueRenewalTimeout time.Duration
-	// issuePollInterval defines an interval time for each subroutine call (check CSR status) within issue() function
-	// Note, the issuePollInterval should be less than issueRenewalTimeout
-	issuePollInterval time.Duration
 
 	// requestNameGenerator generates a new random name for a certificaterequest object
 	// Defaults to uuid.NewUUID() from k8s.io/apimachinery/pkg/util/uuid.
@@ -364,7 +345,7 @@ func (m *Manager) issue(ctx context.Context, volumeID string) error {
 
 	// Poll every 1s for the CertificateRequest to be ready
 	lastFailureReason := ""
-	if err := wait.PollUntilWithContext(ctx, m.issuePollInterval, func(ctx context.Context) (done bool, err error) {
+	if err := wait.PollUntilWithContext(ctx, time.Second, func(ctx context.Context) (done bool, err error) {
 		updatedReq, err := m.lister.CertificateRequests(req.Namespace).Get(req.Name)
 		if apierrors.IsNotFound(err) {
 			// A NotFound error implies something deleted the resource - fail

manager/manager_test.go

@@ -293,7 +293,6 @@ func TestManager_ManageVolume_exponentialBackOffRetryOnIssueErrors(t *testing.T)
 	expBackOffJitter := 0.0 // No jitter to the 'duration', so we could calculate number of retries easily
 	expBackOffSteps := 100  // The maximum number of backoff attempts
 	issueRenewalTimeout := expBackOffDuration
-	issuePollInterval := issueRenewalTimeout / 10
 
 	// Expected number of retries in each expBackOff cycle :=
 	// 				⌈log base expBackOffFactor of (expBackOffCap/expBackOffDuration)⌉
@@ -314,14 +313,13 @@ func TestManager_ManageVolume_exponentialBackOffRetryOnIssueErrors(t *testing.T)
 		Jitter:   expBackOffJitter,
 		Steps:    expBackOffSteps,
 	}
-	opts.IssueRenewalTimeout = issueRenewalTimeout
-	opts.IssuePollInterval = issuePollInterval
 	opts.ReadyToRequest = func(meta metadata.Metadata) (bool, string) {
 		// ReadyToRequest will be called by issue()
 		atomic.AddInt32(&numOfRetries, 1) // run in a goroutine, thus increment it atomically
 		return true, ""                   // AlwaysReadyToRequest
 	}
 	m, err := NewManager(opts)
+	m.issueRenewalTimeout = issueRenewalTimeout
 	if err != nil {
 		t.Fatal(err)
 	}

test/driver/driver_testing.go

@@ -22,7 +22,6 @@ import (
 	"math"
 	"net"
 	"testing"
-	"time"
 
 	cmclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
 	fakeclient "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned/fake"
@@ -117,8 +116,6 @@ func Run(t *testing.T, opts Options) (Options, csi.NodeClient, func()) {
 		WriteKeypair:         opts.WriteKeypair,
 		ReadyToRequest:       opts.ReadyToRequest,
 		RenewalBackoffConfig: &wait.Backoff{Steps: math.MaxInt32}, // don't actually wait (i.e. set all backoff times to 0)
-		IssueRenewalTimeout:  time.Second,                         // timeout issue renewal call in a second
-		IssuePollInterval:    100 * time.Millisecond,              // check CSR status every 0.1s during issue call
 	})
 
 	d := driver.NewWithListener(lis, *opts.Log, driver.Options{