kubeadm: make the configured APICall timeout accessible from anywhere

Currently the APICall timeout is only accessible as a constant.
Instead, any time a config is loaded or defaulted store the timeout
value and make it accessible from constants.GetAPICallTimeout().

cmd/kubeadm/app/apis/kubeadm/v1beta4/defaults.go

@@ -232,7 +232,7 @@ func SetDefaults_Timeouts(obj *Timeouts) {
 	}
 	if obj.APICall == nil {
 		obj.APICall = &metav1.Duration{
-			Duration: constants.APICallTimeout,
+			Duration: constants.DefaultAPICallTimeout,
 		}
 	}
 	if obj.TLSBootstrap == nil {

cmd/kubeadm/app/constants/constants.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/pkg/errors"
@@ -217,8 +218,6 @@ const (
 	TLSBootstrapTimeout = 5 * time.Minute
 	// TLSBootstrapRetryInterval specifies how long kubeadm should wait before retrying the TLS Bootstrap check
 	TLSBootstrapRetryInterval = 1 * time.Second
-	// APICallTimeout specifies how long kubeadm should wait for API calls
-	APICallTimeout = 1 * time.Minute
 
 	// PullImageRetry specifies how many times ContainerRuntime retries when pulling image failed
 	PullImageRetry = 5
@@ -229,6 +228,8 @@ const (
 	DefaultControlPlaneTimeout = 4 * time.Minute
 	// DefaultKubeletTimeout specifies the default kubelet timeout
 	DefaultKubeletTimeout = 4 * time.Minute
+	// DefaultAPICallTimeout specifies how long kubeadm should wait for API calls
+	DefaultAPICallTimeout = 1 * time.Minute
 
 	// MinimumAddressesInServiceSubnet defines minimum amount of nodes the Service subnet should allow.
 	// We need at least ten, because the DNS service is always at the tenth cluster clusterIP
@@ -490,6 +491,12 @@ var (
 	// defaultKubernetesPlaceholderVersion is a placeholder version in case the component-base
 	// version was not populated during build.
 	defaultKubernetesPlaceholderVersion = version.MustParseSemantic("v1.0.0-placeholder-version")
+
+	// apiCallTimeout is the local variable that holds the kubeadm API timeout value.
+	apiCallTimeout = DefaultAPICallTimeout
+
+	// timeoutMutex is a mutex that can be used to sync R/W operations on local timeout variables.
+	timeoutMutex = &sync.RWMutex{}
 )
 
 // getSkewedKubernetesVersion returns the current MAJOR.(MINOR+n).0 Kubernetes version with a skew of 'n'
@@ -673,3 +680,17 @@ func GetAPIServerVirtualIP(svcSubnetList string) (net.IP, error) {
 	}
 	return internalAPIServerVirtualIP, nil
 }
+
+// GetAPICallTimeout returns the API call timeout to use for this runtime of the kubeadm process
+func GetAPICallTimeout() time.Duration {
+	timeoutMutex.RLock()
+	defer timeoutMutex.RUnlock()
+	return apiCallTimeout
+}
+
+// SetAPICallTimeout sets the API call timeout to use for this runtime of the kubeadm process
+func SetAPICallTimeout(timeout time.Duration) {
+	timeoutMutex.Lock()
+	apiCallTimeout = timeout
+	timeoutMutex.Unlock()
+}

cmd/kubeadm/app/phases/bootstraptoken/node/token.go

@@ -53,7 +53,7 @@ func UpdateOrCreateTokens(client clientset.Interface, failIfExists bool, tokens
 		err = wait.PollUntilContextTimeout(
 			context.Background(),
 			kubeadmconstants.APICallRetryInterval,
-			kubeadmconstants.APICallTimeout,
+			kubeadmconstants.GetAPICallTimeout(),
 			true, func(_ context.Context) (bool, error) {
 				if err := apiclient.CreateOrUpdateSecret(client, updatedOrNewSecret); err != nil {
 					lastError = errors.Wrapf(err, "failed to create or update bootstrap token with name %s", secretName)

cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go

@@ -593,7 +593,7 @@ func EnsureAdminClusterRoleBinding(outDir string, ensureRBACFunc EnsureRBACFunc)
 
 	ctx := context.Background()
 	return ensureRBACFunc(
-		ctx, adminClient, superAdminClient, kubeadmconstants.APICallRetryInterval, kubeadmconstants.APICallTimeout)
+		ctx, adminClient, superAdminClient, kubeadmconstants.APICallRetryInterval, kubeadmconstants.GetAPICallTimeout())
 }
 
 // EnsureAdminClusterRoleBindingImpl first attempts to see if the ClusterRoleBinding

cmd/kubeadm/app/util/apiclient/idempotency.go

@@ -61,7 +61,7 @@ func CreateOrUpdateConfigMap(client clientset.Interface, cm *v1.ConfigMap) error
 // taking place)
 func CreateOrMutateConfigMap(client clientset.Interface, cm *v1.ConfigMap, mutator ConfigMapMutator) error {
 	var lastError error
-	err := wait.PollImmediate(constants.APICallRetryInterval, constants.APICallTimeout, func() (bool, error) {
+	err := wait.PollImmediate(constants.APICallRetryInterval, constants.GetAPICallTimeout(), func() (bool, error) {
 		if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm, metav1.CreateOptions{}); err != nil {
 			lastError = err
 			if apierrors.IsAlreadyExists(err) {
@@ -84,7 +84,7 @@ func CreateOrMutateConfigMap(client clientset.Interface, cm *v1.ConfigMap, mutat
 // taking place).
 func MutateConfigMap(client clientset.Interface, meta metav1.ObjectMeta, mutator ConfigMapMutator) error {
 	var lastError error
-	err := wait.PollImmediate(constants.APICallRetryInterval, constants.APICallTimeout, func() (bool, error) {
+	err := wait.PollImmediate(constants.APICallRetryInterval, constants.GetAPICallTimeout(), func() (bool, error) {
 		configMap, err := client.CoreV1().ConfigMaps(meta.Namespace).Get(context.TODO(), meta.Name, metav1.GetOptions{})
 		if err != nil {
 			lastError = err
@@ -190,7 +190,7 @@ func CreateOrUpdateDaemonSet(client clientset.Interface, ds *apps.DaemonSet) err
 // CreateOrUpdateRole creates a Role if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
 func CreateOrUpdateRole(client clientset.Interface, role *rbac.Role) error {
 	var lastError error
-	err := wait.PollImmediate(constants.APICallRetryInterval, constants.APICallTimeout, func() (bool, error) {
+	err := wait.PollImmediate(constants.APICallRetryInterval, constants.GetAPICallTimeout(), func() (bool, error) {
 		if _, err := client.RbacV1().Roles(role.ObjectMeta.Namespace).Create(context.TODO(), role, metav1.CreateOptions{}); err != nil {
 			if !apierrors.IsAlreadyExists(err) {
 				lastError = errors.Wrap(err, "unable to create RBAC role")
@@ -213,7 +213,7 @@ func CreateOrUpdateRole(client clientset.Interface, role *rbac.Role) error {
 // CreateOrUpdateRoleBinding creates a RoleBinding if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
 func CreateOrUpdateRoleBinding(client clientset.Interface, roleBinding *rbac.RoleBinding) error {
 	var lastError error
-	err := wait.PollImmediate(constants.APICallRetryInterval, constants.APICallTimeout, func() (bool, error) {
+	err := wait.PollImmediate(constants.APICallRetryInterval, constants.GetAPICallTimeout(), func() (bool, error) {
 		if _, err := client.RbacV1().RoleBindings(roleBinding.ObjectMeta.Namespace).Create(context.TODO(), roleBinding, metav1.CreateOptions{}); err != nil {
 			if !apierrors.IsAlreadyExists(err) {
 				lastError = errors.Wrap(err, "unable to create RBAC rolebinding")
@@ -320,7 +320,7 @@ func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Nod
 	// wait.Poll will rerun the condition function every interval function if
 	// the function returns false. If the condition function returns an error
 	// then the retries end and the error is returned.
-	err := wait.Poll(constants.APICallRetryInterval, constants.APICallTimeout, PatchNodeOnce(client, nodeName, patchFn, &lastError))
+	err := wait.Poll(constants.APICallRetryInterval, constants.GetAPICallTimeout(), PatchNodeOnce(client, nodeName, patchFn, &lastError))
 	if err == nil {
 		return nil
 	}

cmd/kubeadm/app/util/config/common.go

@@ -370,3 +370,16 @@ func isKubeadmPrereleaseVersion(versionInfo *apimachineryversion.Info, k8sVersio
 	}
 	return false
 }
+
+// prepareStaticVariables takes a given config and stores values from it in variables
+// that can be used from multiple packages.
+func prepareStaticVariables(config interface{}) {
+	switch config.(type) {
+	case *kubeadmapi.InitConfiguration:
+		c := config.(*kubeadmapi.InitConfiguration)
+		constants.SetAPICallTimeout(c.Timeouts.APICall.Duration)
+	case *kubeadmapi.JoinConfiguration:
+		c := config.(*kubeadmapi.JoinConfiguration)
+		constants.SetAPICallTimeout(c.Timeouts.APICall.Duration)
+	}
+}

cmd/kubeadm/app/util/config/initconfiguration.go

@@ -229,7 +229,7 @@ func DefaultedStaticInitConfiguration() (*kubeadmapi.InitConfiguration, error) {
 }
 
 // DefaultedInitConfiguration takes a versioned init config (often populated by flags), defaults it and converts it into internal InitConfiguration
-func DefaultedInitConfiguration(versionedInitCfg *kubeadmapiv1.InitConfiguration, versionedClusterCfg *kubeadmapiv1.ClusterConfiguration, skipCRIDetect bool) (*kubeadmapi.InitConfiguration, error) {
+func DefaultedInitConfiguration(versionedInitCfg *kubeadmapiv1.InitConfiguration, versionedClusterCfg *kubeadmapiv1.ClusterConfiguration, opts LoadOrDefaultConfigurationOptions) (*kubeadmapi.InitConfiguration, error) {
 	internalcfg := &kubeadmapi.InitConfiguration{}
 
 	// Takes passed flags into account; the defaulting is executed once again enforcing assignment of
@@ -245,7 +245,7 @@ func DefaultedInitConfiguration(versionedInitCfg *kubeadmapiv1.InitConfiguration
 	}
 
 	// Applies dynamic defaults to settings not provided with flags
-	if err := SetInitDynamicDefaults(internalcfg, skipCRIDetect); err != nil {
+	if err := SetInitDynamicDefaults(internalcfg, opts.SkipCRIDetect); err != nil {
 		return nil, err
 	}
 	// Validates cfg (flags/configs + defaults + dynamic defaults)
@@ -273,13 +273,20 @@ func LoadInitConfigurationFromFile(cfgPath string, opts LoadOrDefaultConfigurati
 // Right thereafter, the configuration is defaulted again with dynamic values (like IP addresses of a machine, etc)
 // Lastly, the internal config is validated and returned.
 func LoadOrDefaultInitConfiguration(cfgPath string, versionedInitCfg *kubeadmapiv1.InitConfiguration, versionedClusterCfg *kubeadmapiv1.ClusterConfiguration, opts LoadOrDefaultConfigurationOptions) (*kubeadmapi.InitConfiguration, error) {
+	var (
+		config *kubeadmapi.InitConfiguration
+		err    error
+	)
 	if cfgPath != "" {
 		// Loads configuration from config file, if provided
-		// Nb. --config overrides command line flags
-		return LoadInitConfigurationFromFile(cfgPath, opts)
+		config, err = LoadInitConfigurationFromFile(cfgPath, opts)
+	} else {
+		config, err = DefaultedInitConfiguration(versionedInitCfg, versionedClusterCfg, opts)
 	}
-
-	return DefaultedInitConfiguration(versionedInitCfg, versionedClusterCfg, opts.SkipCRIDetect)
+	if err == nil {
+		prepareStaticVariables(config)
+	}
+	return config, err
 }
 
 // BytesToInitConfiguration converts a byte slice to an internal, defaulted and validated InitConfiguration object.

cmd/kubeadm/app/util/config/joinconfiguration.go

@@ -62,13 +62,20 @@ func SetJoinControlPlaneDefaults(cfg *kubeadmapi.JoinControlPlane) error {
 // Right thereafter, the configuration is defaulted again with dynamic values (like IP addresses of a machine, etc)
 // Lastly, the internal config is validated and returned.
 func LoadOrDefaultJoinConfiguration(cfgPath string, defaultversionedcfg *kubeadmapiv1.JoinConfiguration, opts LoadOrDefaultConfigurationOptions) (*kubeadmapi.JoinConfiguration, error) {
+	var (
+		config *kubeadmapi.JoinConfiguration
+		err    error
+	)
 	if cfgPath != "" {
 		// Loads configuration from config file, if provided
-		// Nb. --config overrides command line flags, TODO: fix this
-		return LoadJoinConfigurationFromFile(cfgPath, opts)
+		config, err = LoadJoinConfigurationFromFile(cfgPath, opts)
+	} else {
+		config, err = DefaultedJoinConfiguration(defaultversionedcfg, opts)
 	}
-
-	return DefaultedJoinConfiguration(defaultversionedcfg, opts)
+	if err == nil {
+		prepareStaticVariables(config)
+	}
+	return config, err
 }
 
 // LoadJoinConfigurationFromFile loads versioned JoinConfiguration from file, converts it to internal, defaults and validates it

cmd/kubeadm/app/util/config/resetconfiguration.go

@@ -66,12 +66,20 @@ func SetResetDynamicDefaults(cfg *kubeadmapi.ResetConfiguration, skipCRIDetect b
 // Right thereafter, the configuration is defaulted again with dynamic values
 // Lastly, the internal config is validated and returned.
 func LoadOrDefaultResetConfiguration(cfgPath string, defaultversionedcfg *kubeadmapiv1.ResetConfiguration, opts LoadOrDefaultConfigurationOptions) (*kubeadmapi.ResetConfiguration, error) {
+	var (
+		config *kubeadmapi.ResetConfiguration
+		err    error
+	)
 	if cfgPath != "" {
 		// Loads configuration from config file, if provided
-		return LoadResetConfigurationFromFile(cfgPath, opts)
+		config, err = LoadResetConfigurationFromFile(cfgPath, opts)
+	} else {
+		config, err = DefaultedResetConfiguration(defaultversionedcfg, opts)
 	}
-
-	return DefaultedResetConfiguration(defaultversionedcfg, opts)
+	if err == nil {
+		prepareStaticVariables(config)
+	}
+	return config, err
 }
 
 // LoadResetConfigurationFromFile loads versioned ResetConfiguration from file, converts it to internal, defaults and validates it