From 6d4e86aed46178f0ca7db7852ebda687cac2fd1e Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 9 May 2018 21:27:37 +0200 Subject: [PATCH 1/2] Addon job timeout --- apis/management.cattle.io/v3/rke_types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 597f0bff..a3da2aee 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -35,8 +35,8 @@ type RancherKubernetesEngineConfig struct { CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"` // kubernetes directory path PrefixPath string `yaml:"prefix_path" json:"prefixPath,omitempty"` - // Number of status check retries for addon deployment jobs - AddonJobRetries int `yaml:"addon_job_retries" json:"addonJobRetries,omitempty" norman:"default=5"` + // Timeout in seconds for status check on addon deployment jobs + AddonJobTimeout int `yaml:"addon_job_timeout" json:"addonJobTimeout,omitempty" norman:"default=30"` // Bastion/Jump Host configuration BastionHost BastionHost `yaml:"bastion_host" json:"bastionHost,omitempty"` } From b8b455d9667c0ac34afcbce2feb806d461d69186 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 9 May 2018 23:36:04 +0200 Subject: [PATCH 2/2] generated code --- .../v3/zz_generated_rancher_kubernetes_engine_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index f77dd9b9..b640ba8b 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -2,7 +2,7 @@ package client const ( RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" - RancherKubernetesEngineConfigFieldAddonJobRetries = "addonJobRetries" + RancherKubernetesEngineConfigFieldAddonJobTimeout = "addonJobTimeout" RancherKubernetesEngineConfigFieldAddons = "addons" RancherKubernetesEngineConfigFieldAddonsInclude = "addonsInclude" RancherKubernetesEngineConfigFieldAuthentication = "authentication" @@ -23,7 +23,7 @@ const ( ) type RancherKubernetesEngineConfig struct { - AddonJobRetries int64 `json:"addonJobRetries,omitempty" yaml:"addonJobRetries,omitempty"` + AddonJobTimeout int64 `json:"addonJobTimeout,omitempty" yaml:"addonJobTimeout,omitempty"` Addons string `json:"addons,omitempty" yaml:"addons,omitempty"` AddonsInclude []string `json:"addonsInclude,omitempty" yaml:"addonsInclude,omitempty"` Authentication *AuthnConfig `json:"authentication,omitempty" yaml:"authentication,omitempty"`