rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-17 15:29:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1192 from superseb/v24_add_tolerations

Browse Source 
[release/v2.4] Add tolerations option to addons
This commit is contained in:
Sebastiaan van Steenis
2021-01-13 20:17:51 +01:00
committed by GitHub
parent 0d90dc3a07 76c78fdb64
commit adad487bf2
7 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apis/management.cattle.io/v3/rke_types.go
View File

@@ -394,6 +394,8 @@ type NetworkConfig struct {
NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
// Network plugin daemonset upgrade strategy
UpdateStrategy *DaemonSetUpdateStrategy `yaml:"update_strategy" json:"updateStrategy,omitempty"`
// Tolerations for Deployments
Tolerations []v1.Toleration `yaml:"tolerations" json:"tolerations,omitempty"`
}
type AuthWebhookConfig struct {
@@ -444,6 +446,8 @@ type IngressConfig struct {
HTTPSPort int `yaml:"https_port" json:"httpsPort,omitempty"`
// NetworkMode selector for ingress controller pods. Default is HostNetwork
NetworkMode string `yaml:"network_mode" json:"networkMode,omitempty"`
// Tolerations for Deployments
Tolerations []v1.Toleration `yaml:"tolerations" json:"tolerations,omitempty"`
}
type ExtraEnv struct {
@@ -834,6 +838,8 @@ type MonitoringConfig struct {
UpdateStrategy *DeploymentStrategy `yaml:"update_strategy" json:"updateStrategy,omitempty"`
// Number of monitoring addon pods
Replicas *int32 `yaml:"replicas" json:"replicas,omitempty" norman:"default=1"`
// Tolerations for Deployments
Tolerations []v1.Toleration `yaml:"tolerations" json:"tolerations,omitempty"`
}
type RestoreConfig struct {
@@ -864,6 +870,8 @@ type DNSConfig struct {
UpdateStrategy *DeploymentStrategy `yaml:"update_strategy" json:"updateStrategy,omitempty"`
// Autoscaler fields to determine number of dns replicas
LinearAutoscalerParams *LinearAutoscalerParams `yaml:"linear_autoscaler_params" json:"linearAutoscalerParams,omitempty"`
// Tolerations for Deployments
Tolerations []v1.Toleration `yaml:"tolerations" json:"tolerations,omitempty"`
}
type Nodelocal struct {

28
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@@ -3005,6 +3005,13 @@ func (in *DNSConfig) DeepCopyInto(out *DNSConfig) {
*out = new(LinearAutoscalerParams)
**out = **in
}
if in.Tolerations != nil {
in, out := &in.Tolerations, &out.Tolerations
*out = make([]corev1.Toleration, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
@@ -4612,6 +4619,13 @@ func (in *IngressConfig) DeepCopyInto(out *IngressConfig) {
*out = new(DaemonSetUpdateStrategy)
(*in).DeepCopyInto(*out)
}
if in.Tolerations != nil {
in, out := &in.Tolerations, &out.Tolerations
*out = make([]corev1.Toleration, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
@@ -5569,6 +5583,13 @@ func (in *MonitoringConfig) DeepCopyInto(out *MonitoringConfig) {
*out = new(int32)
**out = **in
}
if in.Tolerations != nil {
in, out := &in.Tolerations, &out.Tolerations
*out = make([]corev1.Toleration, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
@@ -5913,6 +5934,13 @@ func (in *NetworkConfig) DeepCopyInto(out *NetworkConfig) {
*out = new(DaemonSetUpdateStrategy)
(*in).DeepCopyInto(*out)
}
if in.Tolerations != nil {
in, out := &in.Tolerations, &out.Tolerations
*out = make([]corev1.Toleration, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}

2
client/management/v3/zz_generated_dns_config.go
View File

@@ -8,6 +8,7 @@ const (
DNSConfigFieldProvider = "provider"
DNSConfigFieldReverseCIDRs = "reversecidrs"
DNSConfigFieldStubDomains = "stubdomains"
DNSConfigFieldTolerations = "tolerations"
DNSConfigFieldUpdateStrategy = "updateStrategy"
DNSConfigFieldUpstreamNameservers = "upstreamnameservers"
)
@@ -19,6 +20,7 @@ type DNSConfig struct {
Provider string `json:"provider,omitempty" yaml:"provider,omitempty"`
ReverseCIDRs []string `json:"reversecidrs,omitempty" yaml:"reversecidrs,omitempty"`
StubDomains map[string][]string `json:"stubdomains,omitempty" yaml:"stubdomains,omitempty"`
Tolerations []Toleration `json:"tolerations,omitempty" yaml:"tolerations,omitempty"`
UpdateStrategy *DeploymentStrategy `json:"updateStrategy,omitempty" yaml:"updateStrategy,omitempty"`
UpstreamNameservers []string `json:"upstreamnameservers,omitempty" yaml:"upstreamnameservers,omitempty"`
}

2
client/management/v3/zz_generated_ingress_config.go
View File

@@ -13,6 +13,7 @@ const (
IngressConfigFieldNodeSelector = "nodeSelector"
IngressConfigFieldOptions = "options"
IngressConfigFieldProvider = "provider"
IngressConfigFieldTolerations = "tolerations"
IngressConfigFieldUpdateStrategy = "updateStrategy"
)
@@ -28,5 +29,6 @@ type IngressConfig struct {
NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
Options map[string]string `json:"options,omitempty" yaml:"options,omitempty"`
Provider string `json:"provider,omitempty" yaml:"provider,omitempty"`
Tolerations []Toleration `json:"tolerations,omitempty" yaml:"tolerations,omitempty"`
UpdateStrategy *DaemonSetUpdateStrategy `json:"updateStrategy,omitempty" yaml:"updateStrategy,omitempty"`
}

2
client/management/v3/zz_generated_monitoring_config.go
View File

@@ -6,6 +6,7 @@ const (
MonitoringConfigFieldOptions = "options"
MonitoringConfigFieldProvider = "provider"
MonitoringConfigFieldReplicas = "replicas"
MonitoringConfigFieldTolerations = "tolerations"
MonitoringConfigFieldUpdateStrategy = "updateStrategy"
)
@@ -14,5 +15,6 @@ type MonitoringConfig struct {
Options map[string]string `json:"options,omitempty" yaml:"options,omitempty"`
Provider string `json:"provider,omitempty" yaml:"provider,omitempty"`
Replicas *int64 `json:"replicas,omitempty" yaml:"replicas,omitempty"`
Tolerations []Toleration `json:"tolerations,omitempty" yaml:"tolerations,omitempty"`
UpdateStrategy *DeploymentStrategy `json:"updateStrategy,omitempty" yaml:"updateStrategy,omitempty"`
}

2
client/management/v3/zz_generated_network_config.go
View File

@@ -9,6 +9,7 @@ const (
NetworkConfigFieldNodeSelector = "nodeSelector"
NetworkConfigFieldOptions = "options"
NetworkConfigFieldPlugin = "plugin"
NetworkConfigFieldTolerations = "tolerations"
NetworkConfigFieldUpdateStrategy = "updateStrategy"
NetworkConfigFieldWeaveNetworkProvider = "weaveNetworkProvider"
)
@@ -21,6 +22,7 @@ type NetworkConfig struct {
NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
Options map[string]string `json:"options,omitempty" yaml:"options,omitempty"`
Plugin string `json:"plugin,omitempty" yaml:"plugin,omitempty"`
Tolerations []Toleration `json:"tolerations,omitempty" yaml:"tolerations,omitempty"`
UpdateStrategy *DaemonSetUpdateStrategy `json:"updateStrategy,omitempty" yaml:"updateStrategy,omitempty"`
WeaveNetworkProvider *WeaveNetworkProvider `json:"weaveNetworkProvider,omitempty" yaml:"weaveNetworkProvider,omitempty"`
}

18
client/management/v3/zz_generated_toleration.go Normal file
View File

@@ -0,0 +1,18 @@
package client
const (
TolerationType = "toleration"
TolerationFieldEffect = "effect"
TolerationFieldKey = "key"
TolerationFieldOperator = "operator"
TolerationFieldTolerationSeconds = "tolerationSeconds"
TolerationFieldValue = "value"
)
type Toleration struct {
Effect string `json:"effect,omitempty" yaml:"effect,omitempty"`
Key string `json:"key,omitempty" yaml:"key,omitempty"`
Operator string `json:"operator,omitempty" yaml:"operator,omitempty"`
TolerationSeconds *int64 `json:"tolerationSeconds,omitempty" yaml:"tolerationSeconds,omitempty"`
Value string `json:"value,omitempty" yaml:"value,omitempty"`
}