rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-07 01:40:11 +00:00
Code Issues Releases Wiki Activity

Change ingress type to ingress provider

Browse Source
This commit is contained in:
galal-hussein
2018-02-07 02:30:25 +02:00
parent f32d352500
commit dcacd86b32
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons.go
View File

@@ -124,8 +124,8 @@ func (c *Cluster) ApplySystemAddonExcuteJob(addonJob string) error {
} }
func (c *Cluster) deployIngress(ctx context.Context) error { func (c *Cluster) deployIngress(ctx context.Context) error {
log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Type) log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Provider)
if c.Ingress.Type == "none" { if c.Ingress.Provider == "none" {
log.Infof(ctx, "[ingress] ingress controller is not defined") log.Infof(ctx, "[ingress] ingress controller is not defined")
return nil return nil
} }
@@ -142,6 +142,6 @@ func (c *Cluster) deployIngress(ctx context.Context) error {
if err := c.doAddonDeploy(ctx, ingressYaml, IngressAddonResourceName); err != nil { if err := c.doAddonDeploy(ctx, ingressYaml, IngressAddonResourceName); err != nil {
return err return err
} }
log.Infof(ctx, "[ingress] ingress controller %s is successfully deployed", c.Ingress.Type) log.Infof(ctx, "[ingress] ingress controller %s is successfully deployed", c.Ingress.Provider)
return nil return nil
} }

4
cluster/defaults.go
View File

@@ -91,8 +91,8 @@ func (c *Cluster) setClusterDefaults(ctx context.Context) {
log.Warnf(ctx, "PodSecurityPolicy can't be enabled with RBAC support disabled") log.Warnf(ctx, "PodSecurityPolicy can't be enabled with RBAC support disabled")
c.Services.KubeAPI.PodSecurityPolicy = false c.Services.KubeAPI.PodSecurityPolicy = false
} }
if len(c.Ingress.Type) == 0 { if len(c.Ingress.Provider) == 0 {
c.Ingress.Type = DefaultIngressController c.Ingress.Provider = DefaultIngressController
} }
c.setClusterImageDefaults() c.setClusterImageDefaults()

4
cluster/validation.go
View File

@@ -99,8 +99,8 @@ func validateServicesOptions(c *Cluster) error {
func validateIngressOptions(c *Cluster) error { func validateIngressOptions(c *Cluster) error {
// Should be changed when adding more ingress types // Should be changed when adding more ingress types
if c.Ingress.Type != DefaultIngressController && c.Ingress.Type != "none" { if c.Ingress.Provider != DefaultIngressController && c.Ingress.Provider != "none" {
return fmt.Errorf("Ingress controller %s is incorrect", c.Ingress.Type) return fmt.Errorf("Ingress controller %s is incorrect", c.Ingress.Provider)
} }
return nil return nil
} }