diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 9ed2838f..622d1ae4 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -852,7 +852,12 @@ type DNSConfig struct { } type Nodelocal struct { + // link-local IP for nodelocal DNS IPAddress string `yaml:"ipaddress" json:"ipAddress,omitempy"` + // Nodelocal DNS daemonset upgrade strategy + UpdateStrategy *appsv1.DaemonSetUpdateStrategy `yaml:"update_strategy" json:"updateStrategy,omitempty"` + // NodeSelector key pair + NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"` } // LinearAutoscalerParams contains fields expected by the cluster-proportional-autoscaler https://github.com/kubernetes-incubator/cluster-proportional-autoscaler/blob/0c61e63fc81449abdd52315aa27179a17e5d1580/pkg/autoscaler/controller/linearcontroller/linear_controller.go#L50 diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index bd408e49..1af80fb9 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -2962,7 +2962,7 @@ func (in *DNSConfig) DeepCopyInto(out *DNSConfig) { if in.Nodelocal != nil { in, out := &in.Nodelocal, &out.Nodelocal *out = new(Nodelocal) - **out = **in + (*in).DeepCopyInto(*out) } if in.UpdateStrategy != nil { in, out := &in.UpdateStrategy, &out.UpdateStrategy @@ -6468,6 +6468,18 @@ func (in *NodeUpgradeStrategy) DeepCopy() *NodeUpgradeStrategy { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Nodelocal) DeepCopyInto(out *Nodelocal) { *out = *in + if in.UpdateStrategy != nil { + in, out := &in.UpdateStrategy, &out.UpdateStrategy + *out = new(appsv1.DaemonSetUpdateStrategy) + (*in).DeepCopyInto(*out) + } + if in.NodeSelector != nil { + in, out := &in.NodeSelector, &out.NodeSelector + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } diff --git a/client/management/v3/zz_generated_nodelocal.go b/client/management/v3/zz_generated_nodelocal.go index 25dff71e..629356f8 100644 --- a/client/management/v3/zz_generated_nodelocal.go +++ b/client/management/v3/zz_generated_nodelocal.go @@ -1,10 +1,14 @@ package client const ( - NodelocalType = "nodelocal" - NodelocalFieldIPAddress = "ipAddress" + NodelocalType = "nodelocal" + NodelocalFieldIPAddress = "ipAddress" + NodelocalFieldNodeSelector = "nodeSelector" + NodelocalFieldUpdateStrategy = "updateStrategy" ) type Nodelocal struct { - IPAddress string `json:"ipAddress,omitempty" yaml:"ipAddress,omitempty"` + IPAddress string `json:"ipAddress,omitempty" yaml:"ipAddress,omitempty"` + NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"` + UpdateStrategy *DaemonSetUpdateStrategy `json:"updateStrategy,omitempty" yaml:"updateStrategy,omitempty"` }