Merge pull request #2599 from superseb/ingress_webhook

Validate Ingress Webhook and pass to template

cluster/addons.go

@@ -71,6 +71,7 @@ type ingressOptions struct {
 	AlpineImage                             string
 	IngressImage                            string
 	IngressBackend                          string
+	IngressWebhook                          string
 	HTTPPort                                int
 	HTTPSPort                               int
 	NetworkMode                             string
@@ -588,6 +589,7 @@ func (c *Cluster) deployIngress(ctx context.Context, data map[string]interface{}
 		DNSPolicy:         c.Ingress.DNSPolicy,
 		IngressImage:      c.SystemImages.Ingress,
 		IngressBackend:    c.SystemImages.IngressBackend,
+		IngressWebhook:    c.SystemImages.IngressWebhook,
 		ExtraEnvs:         c.Ingress.ExtraEnvs,
 		ExtraVolumes:      c.Ingress.ExtraVolumes,
 		ExtraVolumeMounts: c.Ingress.ExtraVolumeMounts,

cluster/defaults.go

@@ -509,6 +509,7 @@ func (c *Cluster) setClusterImageDefaults() error {
 		&c.SystemImages.WeaveCNI:                  d(imageDefaults.WeaveCNI, privRegURL),
 		&c.SystemImages.Ingress:                   d(imageDefaults.Ingress, privRegURL),
 		&c.SystemImages.IngressBackend:            d(imageDefaults.IngressBackend, privRegURL),
+		&c.SystemImages.IngressWebhook:            d(imageDefaults.IngressWebhook, privRegURL),
 		&c.SystemImages.MetricsServer:             d(imageDefaults.MetricsServer, privRegURL),
 		&c.SystemImages.Nodelocal:                 d(imageDefaults.Nodelocal, privRegURL),
 		&c.SystemImages.AciCniDeployContainer:     d(imageDefaults.AciCniDeployContainer, privRegURL),

cluster/validation.go

@@ -610,6 +610,25 @@ func validateIngressImages(c *Cluster) error {
 		if len(c.SystemImages.IngressBackend) == 0 {
 			return errors.New("ingress backend image is not populated")
 		}
+		// Ingress Webhook image is used starting with k8s 1.21
+		k8sVersion := c.RancherKubernetesEngineConfig.Version
+		toMatch, err := semver.Make(k8sVersion[1:])
+		if err != nil {
+			return fmt.Errorf("%s is not valid semver", k8sVersion)
+		}
+		logrus.Debugf("Checking if ingress webhook image is required for cluster version [%s]", k8sVersion)
+
+		IngressWebhookImageRequiredRange, err := semver.ParseRange(">=1.21.0-rancher0")
+		if err != nil {
+			logrus.Warnf("Failed to parse semver range for checking required ingress webhook image")
+		}
+		if IngressWebhookImageRequiredRange(toMatch) {
+			logrus.Debugf("Cluster version [%s] uses ingress webhook image, checking if image is populated", k8sVersion)
+			if len(c.SystemImages.IngressWebhook) == 0 {
+				return errors.New("ingress webhook image is not populated")
+			}
+
+		}
 	}
 	return nil
 }

types/rke_types.go

@@ -175,6 +175,8 @@ type RKESystemImages struct {
 	Ingress string `yaml:"ingress" json:"ingress,omitempty"`
 	// Ingress Controller Backend image
 	IngressBackend string `yaml:"ingress_backend" json:"ingressBackend,omitempty"`
+	// Ingress Webhook image
+	IngressWebhook string `yaml:"ingress_webhook" json:"ingressWebhook,omitempty"`
 	// Metrics Server image
 	MetricsServer string `yaml:"metrics_server" json:"metricsServer,omitempty"`
 	// Pod infra container image for Windows