rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-04-28 03:31:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2299 from superseb/ingressdefaults

Browse Source 
set default ingress network mode for both rancher and rke
This commit is contained in:
Sebastiaan van Steenis 2020-10-24 21:40:20 +02:00 committed by GitHub
commit 90cd26ec0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/cluster.go
View File

@ -514,9 +514,6 @@ func parseIngressConfig(clusterFile string, rkeConfig *v3.RancherKubernetesEngin
if err := parseIngressExtraVolumeMounts(ingressMap, rkeConfig); err != nil {
return err
}
if err := parseIngressDefaults(ingressMap, rkeConfig); err != nil {
return err
}
return nil
}
@ -601,21 +598,6 @@ func parseIngressExtraVolumeMounts(ingressMap map[string]interface{}, rkeConfig
return nil
}
func parseIngressDefaults(ingressMap map[string]interface{}, rkeConfig *v3.RancherKubernetesEngineConfig) error {
// Setting up default behaviour so as to not catch out
// existing users who use new version of RKE
if _, ok := ingressMap["network_mode"]; !ok {
rkeConfig.Ingress.NetworkMode = DefaultNetworkMode
}
if _, ok := ingressMap["http_port"]; !ok {
rkeConfig.Ingress.HTTPPort = DefaultHTTPPort
}
if _, ok := ingressMap["https_port"]; !ok {
rkeConfig.Ingress.HTTPSPort = DefaultHTTPSPort
}
return nil
}
func parseNodeDrainInput(clusterFile string, rkeConfig *v3.RancherKubernetesEngineConfig) error {
// setting some defaults here because for these fields there's no way of differentiating between user provided null value vs golang setting it to null during unmarshal
if rkeConfig.UpgradeStrategy == nil || rkeConfig.UpgradeStrategy.DrainInput == nil {

13
cluster/defaults.go
View File

@ -633,6 +633,19 @@ func (c *Cluster) setAddonsDefaults() {
if c.Monitoring.Replicas == nil {
c.Monitoring.Replicas = &DefaultMonitoringAddonReplicas
}
if c.Ingress.NetworkMode == "" {
c.Ingress.NetworkMode = DefaultNetworkMode
}
if c.Ingress.HTTPPort == 0 {
c.Ingress.HTTPPort = DefaultHTTPPort
}
if c.Ingress.HTTPSPort == 0 {
c.Ingress.HTTPSPort = DefaultHTTPSPort
}
}
func setDaemonsetAddonDefaults(updateStrategy *v3.DaemonSetUpdateStrategy) *v3.DaemonSetUpdateStrategy {