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

Merge pull request #2536 from kinarashah/defaultbackend

Browse Source 
set ingress default backend to false for k8s 1.21+
This commit is contained in:
Kinara Shah
2021-05-21 09:57:17 -07:00
committed by GitHub
parent daa50515e9 b2a9ebee75
commit bb0d38e303
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cluster/defaults.go
View File

@@ -142,7 +142,6 @@ var (
}
DefaultClusterProportionalAutoscalerLinearParams = v3.LinearAutoscalerParams{CoresPerReplica: 128, NodesPerReplica: 4, Min: 1, PreventSinglePointFailure: true}
DefaultMonitoringAddonReplicas = int32(1)
DefaultDefaultBackend = true
)
type ExternalFlags struct {
@@ -818,7 +817,23 @@ func (c *Cluster) setAddonsDefaults() {
}
if c.Ingress.DefaultBackend == nil {
c.Ingress.DefaultBackend = &DefaultDefaultBackend
defaultBackend := true
k8sVersion := c.RancherKubernetesEngineConfig.Version
toMatch, err := semver.Make(k8sVersion[1:])
if err != nil {
logrus.Warnf("Cluster version [%s] can not be parsed as semver", k8sVersion)
}
logrus.Debugf("Checking ingress default backend for cluster version [%s]", k8sVersion)
// default backend will be false for k8s 1.21 and up
disableIngressDefaultBackendRange, err := semver.ParseRange(">=1.21.0-rancher0")
if err != nil {
logrus.Warnf("Failed to parse semver range for checking ingress default backend")
}
if disableIngressDefaultBackendRange(toMatch) {
logrus.Debugf("Cluster version [%s] needs to have ingress default backend disabled", k8sVersion)
defaultBackend = false
}
c.Ingress.DefaultBackend = &defaultBackend
}
}