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

Merge pull request #3120 from jiaqiluo/release/v1.4.2

Browse Source
This commit is contained in:
Jiaqi Luo
2022-12-06 10:36:10 -07:00
committed by GitHub
parent bcba085f4e 682f7a1fb5
commit 1cf2964ccc
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/defaults.go
View File

@@ -112,6 +112,8 @@ const (
DefaultAciNodePodIfEnable = "false" DefaultAciNodePodIfEnable = "false"
DefaultAciSriovEnable = "false" DefaultAciSriovEnable = "false"
DefaultAciMultusDisable = "true" DefaultAciMultusDisable = "true"
DefaultAciNoWaitForServiceEpReadiness = "false"
DefaultAciAddExternalSubnetsToRdconfig = "false"
KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file" KubeAPIArgAdmissionControlConfigFile = "admission-control-config-file"
DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml" DefaultKubeAPIArgAdmissionControlConfigFileValue = "/etc/kubernetes/admission.yaml"
@@ -668,6 +670,8 @@ func (c *Cluster) setClusterNetworkDefaults() {
AciNodePodIfEnable: DefaultAciNodePodIfEnable, AciNodePodIfEnable: DefaultAciNodePodIfEnable,
AciSriovEnable: DefaultAciSriovEnable, AciSriovEnable: DefaultAciSriovEnable,
AciMultusDisable: DefaultAciMultusDisable, AciMultusDisable: DefaultAciMultusDisable,
AciNoWaitForServiceEpReadiness: DefaultAciNoWaitForServiceEpReadiness,
AciAddExternalSubnetsToRdconfig: DefaultAciAddExternalSubnetsToRdconfig,
} }
} }
if c.Network.CalicoNetworkProvider != nil { if c.Network.CalicoNetworkProvider != nil {
@@ -724,6 +728,8 @@ func (c *Cluster) setClusterNetworkDefaults() {
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DurationWaitForNetwork, DefaultAciDurationWaitForNetwork) setDefaultIfEmpty(&c.Network.AciNetworkProvider.DurationWaitForNetwork, DefaultAciDurationWaitForNetwork)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableWaitForNetwork, DefaultAciDisableWaitForNetwork) setDefaultIfEmpty(&c.Network.AciNetworkProvider.DisableWaitForNetwork, DefaultAciDisableWaitForNetwork)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseClusterRole, DefaultAciUseClusterRole) setDefaultIfEmpty(&c.Network.AciNetworkProvider.UseClusterRole, DefaultAciUseClusterRole)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.NoWaitForServiceEpReadiness, DefaultAciNoWaitForServiceEpReadiness)
setDefaultIfEmpty(&c.Network.AciNetworkProvider.AddExternalSubnetsToRdconfig, DefaultAciAddExternalSubnetsToRdconfig)
networkPluginConfigDefaultsMap[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit networkPluginConfigDefaultsMap[AciOVSMemoryLimit] = c.Network.AciNetworkProvider.OVSMemoryLimit
networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy networkPluginConfigDefaultsMap[AciImagePullPolicy] = c.Network.AciNetworkProvider.ImagePullPolicy
networkPluginConfigDefaultsMap[AciPBRTrackingNonSnat] = c.Network.AciNetworkProvider.PBRTrackingNonSnat networkPluginConfigDefaultsMap[AciPBRTrackingNonSnat] = c.Network.AciNetworkProvider.PBRTrackingNonSnat
@@ -763,6 +769,8 @@ func (c *Cluster) setClusterNetworkDefaults() {
networkPluginConfigDefaultsMap[AciNodePodIfEnable] = c.Network.AciNetworkProvider.NodePodIfEnable networkPluginConfigDefaultsMap[AciNodePodIfEnable] = c.Network.AciNetworkProvider.NodePodIfEnable
networkPluginConfigDefaultsMap[AciSriovEnable] = c.Network.AciNetworkProvider.SriovEnable networkPluginConfigDefaultsMap[AciSriovEnable] = c.Network.AciNetworkProvider.SriovEnable
networkPluginConfigDefaultsMap[AciMultusDisable] = c.Network.AciNetworkProvider.MultusDisable networkPluginConfigDefaultsMap[AciMultusDisable] = c.Network.AciNetworkProvider.MultusDisable
networkPluginConfigDefaultsMap[AciNoWaitForServiceEpReadiness] = c.Network.AciNetworkProvider.NoWaitForServiceEpReadiness
networkPluginConfigDefaultsMap[AciAddExternalSubnetsToRdconfig] = c.Network.AciNetworkProvider.AddExternalSubnetsToRdconfig
networkPluginConfigDefaultsMap[AciSystemIdentifier] = c.Network.AciNetworkProvider.SystemIdentifier networkPluginConfigDefaultsMap[AciSystemIdentifier] = c.Network.AciNetworkProvider.SystemIdentifier
networkPluginConfigDefaultsMap[AciToken] = c.Network.AciNetworkProvider.Token networkPluginConfigDefaultsMap[AciToken] = c.Network.AciNetworkProvider.Token
networkPluginConfigDefaultsMap[AciApicUserName] = c.Network.AciNetworkProvider.ApicUserName networkPluginConfigDefaultsMap[AciApicUserName] = c.Network.AciNetworkProvider.ApicUserName

6
cluster/network.go
View File

@@ -147,6 +147,8 @@ const (
AciNodePodIfEnable = "aci_node_pod_if_enable" AciNodePodIfEnable = "aci_node_pod_if_enable"
AciSriovEnable = "aci_sriov_enable" AciSriovEnable = "aci_sriov_enable"
AciMultusDisable = "aci_multus_disable" AciMultusDisable = "aci_multus_disable"
AciNoWaitForServiceEpReadiness = "aci_no_wait_for_service_ep_readiness"
AciAddExternalSubnetsToRdconfig = "aci_add_external_subnets_to_rdconfig"
// List of map keys to be used with network templates // List of map keys to be used with network templates
// EtcdEndpoints is the server address for Etcd, used by calico // EtcdEndpoints is the server address for Etcd, used by calico
@@ -283,6 +285,8 @@ const (
NodePodIfEnable = "NodePodIfEnable" NodePodIfEnable = "NodePodIfEnable"
SriovEnable = "SriovEnable" SriovEnable = "SriovEnable"
MultusDisable = "MultusDisable" MultusDisable = "MultusDisable"
NoWaitForServiceEpReadiness = "NoWaitForServiceEpReadiness"
AddExternalSubnetsToRdconfig = "AddExternalSubnetsToRdconfig"
OVSMemoryLimit = "OVSMemoryLimit" OVSMemoryLimit = "OVSMemoryLimit"
NodeSubnet = "NodeSubnet" NodeSubnet = "NodeSubnet"
NodeSelector = "NodeSelector" NodeSelector = "NodeSelector"
@@ -579,6 +583,8 @@ func (c *Cluster) doAciDeploy(ctx context.Context, data map[string]interface{})
NodePodIfEnable: c.Network.Options[AciNodePodIfEnable], NodePodIfEnable: c.Network.Options[AciNodePodIfEnable],
SriovEnable: c.Network.Options[AciSriovEnable], SriovEnable: c.Network.Options[AciSriovEnable],
MultusDisable: c.Network.Options[AciMultusDisable], MultusDisable: c.Network.Options[AciMultusDisable],
NoWaitForServiceEpReadiness: c.Network.Options[AciNoWaitForServiceEpReadiness],
AddExternalSubnetsToRdconfig: c.Network.Options[AciAddExternalSubnetsToRdconfig],
AciCniDeployContainer: c.SystemImages.AciCniDeployContainer, AciCniDeployContainer: c.SystemImages.AciCniDeployContainer,
AciHostContainer: c.SystemImages.AciHostContainer, AciHostContainer: c.SystemImages.AciHostContainer,
AciOpflexContainer: c.SystemImages.AciOpflexContainer, AciOpflexContainer: c.SystemImages.AciOpflexContainer,

2
data/bindata.go
View File

File diff suppressed because one or more lines are too long

24
data/data.json
View File

@@ -10294,10 +10294,10 @@
}, },
"v1.22.16-rancher1-1": { "v1.22.16-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3", "etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"alpine": "rancher/rke-tools:v0.1.87", "alpine": "rancher/rke-tools:v0.1.88",
"nginxProxy": "rancher/rke-tools:v0.1.87", "nginxProxy": "rancher/rke-tools:v0.1.88",
"certDownloader": "rancher/rke-tools:v0.1.87", "certDownloader": "rancher/rke-tools:v0.1.88",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87", "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.88",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.17.4", "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.17.4",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.17.4", "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.17.4",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.17.4", "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.17.4",
@@ -10724,10 +10724,10 @@
}, },
"v1.23.14-rancher1-1": { "v1.23.14-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.3", "etcd": "rancher/mirrored-coreos-etcd:v3.5.3",
"alpine": "rancher/rke-tools:v0.1.87", "alpine": "rancher/rke-tools:v0.1.88",
"nginxProxy": "rancher/rke-tools:v0.1.87", "nginxProxy": "rancher/rke-tools:v0.1.88",
"certDownloader": "rancher/rke-tools:v0.1.87", "certDownloader": "rancher/rke-tools:v0.1.88",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87", "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.88",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.21.1", "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.21.1",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1", "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.21.1", "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.21.1",
@@ -11111,10 +11111,10 @@
}, },
"v1.24.8-rancher1-1": { "v1.24.8-rancher1-1": {
"etcd": "rancher/mirrored-coreos-etcd:v3.5.4", "etcd": "rancher/mirrored-coreos-etcd:v3.5.4",
"alpine": "rancher/rke-tools:v0.1.87", "alpine": "rancher/rke-tools:v0.1.88",
"nginxProxy": "rancher/rke-tools:v0.1.87", "nginxProxy": "rancher/rke-tools:v0.1.88",
"certDownloader": "rancher/rke-tools:v0.1.87", "certDownloader": "rancher/rke-tools:v0.1.88",
"kubernetesServicesSidecar": "rancher/rke-tools:v0.1.87", "kubernetesServicesSidecar": "rancher/rke-tools:v0.1.88",
"kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.21.1", "kubedns": "rancher/mirrored-k8s-dns-kube-dns:1.21.1",
"dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1", "dnsmasq": "rancher/mirrored-k8s-dns-dnsmasq-nanny:1.21.1",
"kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.21.1", "kubednsSidecar": "rancher/mirrored-k8s-dns-sidecar:1.21.1",

2
types/rke_types.go
View File

@@ -661,6 +661,8 @@ type AciNetworkProvider struct {
SriovEnable string `yaml:"sriov_enable,omitempty" json:"sriovEnable,omitempty"` SriovEnable string `yaml:"sriov_enable,omitempty" json:"sriovEnable,omitempty"`
MultusDisable string `yaml:"multus_disable,omitempty" json:"multusDisable,omitempty"` MultusDisable string `yaml:"multus_disable,omitempty" json:"multusDisable,omitempty"`
UseClusterRole string `yaml:"use_cluster_role,omitempty" json:"useClusterRole,omitempty"` UseClusterRole string `yaml:"use_cluster_role,omitempty" json:"useClusterRole,omitempty"`
NoWaitForServiceEpReadiness string `yaml:"no_wait_for_service_ep_readiness,omitempty" json:"noWaitForServiceEpReadiness,omitempty"`
AddExternalSubnetsToRdconfig string `yaml:"add_external_subnets_to_rdconfig,omitempty" json:"addExternalSubnetsToRdconfig,omitempty"`
} }
type KubernetesServicesOptions struct { type KubernetesServicesOptions struct {