Merge pull request #328 from galal-hussein/fix_ingress

Fix ingress

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
 }

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()

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
 }

vendor.conf

@@ -24,4 +24,4 @@ github.com/coreos/go-semver              e214231b295a8ea9479f11b70b35d5acf3556d9
 github.com/ugorji/go/codec               ccfe18359b55b97855cee1d3f74e5efbda4869dc
 
 github.com/rancher/norman                151aa66e3e99de7e0d195e2d5ca96b1f95544555
-github.com/rancher/types                 af7045b760563e7d9609d72dd7db4545881ef9c4
+github.com/rancher/types                 e54bf40bd62aea0be72a11ecce8951ee5cf86df9