rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-31 04:49:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1111 from superseb/nodelocal_addonoptions

Browse Source 
Extend nodelocal with common addon options
This commit is contained in:
Sebastiaan van Steenis 2020-03-02 19:26:52 +01:00 committed by GitHub
commit b2b94dc65a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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
}

10
client/management/v3/zz_generated_nodelocal.go
View File

@ -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"`
}