diff --git a/cluster/addons.go b/cluster/addons.go index 55d92114..5a1a3c03 100644 --- a/cluster/addons.go +++ b/cluster/addons.go @@ -124,8 +124,8 @@ func (c *Cluster) ApplySystemAddonExcuteJob(addonJob string) error { } func (c *Cluster) deployIngress(ctx context.Context) error { - log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Type) - if c.Ingress.Type == "none" { + log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Provider) + if c.Ingress.Provider == "none" { log.Infof(ctx, "[ingress] ingress controller is not defined") return nil } @@ -142,6 +142,6 @@ func (c *Cluster) deployIngress(ctx context.Context) error { if err := c.doAddonDeploy(ctx, ingressYaml, IngressAddonResourceName); err != nil { 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 } diff --git a/cluster/defaults.go b/cluster/defaults.go index 2cc29845..a63498dd 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -91,8 +91,8 @@ func (c *Cluster) setClusterDefaults(ctx context.Context) { log.Warnf(ctx, "PodSecurityPolicy can't be enabled with RBAC support disabled") c.Services.KubeAPI.PodSecurityPolicy = false } - if len(c.Ingress.Type) == 0 { - c.Ingress.Type = DefaultIngressController + if len(c.Ingress.Provider) == 0 { + c.Ingress.Provider = DefaultIngressController } c.setClusterImageDefaults() diff --git a/cluster/validation.go b/cluster/validation.go index 4b01cdf2..717b12c1 100644 --- a/cluster/validation.go +++ b/cluster/validation.go @@ -99,8 +99,8 @@ func validateServicesOptions(c *Cluster) error { func validateIngressOptions(c *Cluster) error { // Should be changed when adding more ingress types - if c.Ingress.Type != DefaultIngressController && c.Ingress.Type != "none" { - return fmt.Errorf("Ingress controller %s is incorrect", c.Ingress.Type) + if c.Ingress.Provider != DefaultIngressController && c.Ingress.Provider != "none" { + return fmt.Errorf("Ingress controller %s is incorrect", c.Ingress.Provider) } return nil }