Add new HAProxy 2.8 image reference

Add minimum implementation linking the new HAProxy 2.8 image into
image-references.

https://redhat.atlassian.net/browse/NE-2218

Author: jcmoraisjr

cmd/ingress-operator/start.go

@@ -51,6 +51,8 @@ type StartOptions struct {
 	// IngressControllerImage is the pullspec of the ingress controller image to
 	// be managed.
 	IngressControllerImage string
+	// ImageHAProxyPrevious is the pullspec of the previous HAProxy image to be managed.
+	ImageHAProxyPrevious string
 	// CanaryImage is the pullspec of the ingress operator image
 	CanaryImage string
 	// ReleaseVersion is the cluster version which the operator will converge to.
@@ -82,6 +84,7 @@ func NewStartCommand() *cobra.Command {
 
 	cmd.Flags().StringVarP(&options.OperatorNamespace, "namespace", "n", operatorcontroller.DefaultOperatorNamespace, "namespace the operator is deployed to (required)")
 	cmd.Flags().StringVarP(&options.IngressControllerImage, "image", "i", "", "image of the ingress controller the operator will manage (required)")
+	cmd.Flags().StringVarP(&options.ImageHAProxyPrevious, "image-haproxy-previous", "", "", "image of the previous HAProxy version the operator will manage (required)")
 	cmd.Flags().StringVarP(&options.CanaryImage, "canary-image", "c", "", "image of the canary container that the operator will manage (optional)")
 	cmd.Flags().StringVarP(&options.ReleaseVersion, "release-version", "", statuscontroller.UnknownVersionValue, "the release version the operator should converge to (required)")
 	cmd.Flags().StringVarP(&options.MetricsListenAddr, "metrics-listen-addr", "", "127.0.0.1:60000", "metrics endpoint listen address (required)")
@@ -97,6 +100,9 @@ func NewStartCommand() *cobra.Command {
 	if err := cmd.MarkFlagRequired("image"); err != nil {
 		panic(err)
 	}
+	if err := cmd.MarkFlagRequired("image-haproxy-previous"); err != nil {
+		panic(err)
+	}
 
 	return cmd
 }
@@ -137,6 +143,7 @@ func start(opts *StartOptions) error {
 		OperatorReleaseVersion:    opts.ReleaseVersion,
 		Namespace:                 opts.OperatorNamespace,
 		IngressControllerImage:    opts.IngressControllerImage,
+		HAProxyImage:              opts.ImageHAProxyPrevious,
 		CanaryImage:               opts.CanaryImage,
 		GatewayAPIOperatorCatalog: opts.GatewayAPIOperatorCatalog,
 		GatewayAPIOperatorChannel: opts.GatewayAPIOperatorChannel,

manifests/02-deployment-ibm-cloud-managed.yaml

@@ -31,6 +31,8 @@ spec:
         - $(WATCH_NAMESPACE)
         - --image
         - $(IMAGE)
+        - --image-haproxy-previous
+        - $(IMAGE_HAPROXY_PREVIOUS)
         - --canary-image
         - $(CANARY_IMAGE)
         - --release-version
@@ -52,6 +54,8 @@ spec:
               fieldPath: metadata.namespace
         - name: IMAGE
           value: openshift/origin-haproxy-router:v4.0
+        - name: IMAGE_HAPROXY_PREVIOUS
+          value: openshift/origin-haproxy:v2.8
         - name: CANARY_IMAGE
           value: openshift/origin-cluster-ingress-operator:latest
         - name: GATEWAY_API_OPERATOR_CATALOG

manifests/02-deployment.yaml

@@ -60,6 +60,8 @@ spec:
           - "$(WATCH_NAMESPACE)"
           - --image
           - "$(IMAGE)"
+          - --image-haproxy-previous
+          - "$(IMAGE_HAPROXY_PREVIOUS)"
           - --canary-image
           - "$(CANARY_IMAGE)"
           - --release-version
@@ -81,6 +83,8 @@ spec:
                   fieldPath: metadata.namespace
             - name: IMAGE
               value: openshift/origin-haproxy-router:v4.0
+            - name: IMAGE_HAPROXY_PREVIOUS
+              value: openshift/origin-haproxy:v2.8
             - name: CANARY_IMAGE
               value: openshift/origin-cluster-ingress-operator:latest
             - name: GATEWAY_API_OPERATOR_CATALOG

manifests/image-references

@@ -10,6 +10,10 @@ spec:
     from:
       kind: "DockerImage"
       name: "openshift/origin-haproxy-router:v4.0"
+  - name: haproxy-router-haproxy28
+    from:
+      kind: "DockerImage"
+      name: "openshift/origin-haproxy:v2.8"
   - name: kube-rbac-proxy
     from:
       kind: DockerImage

pkg/operator/config/config.go

@@ -12,6 +12,9 @@ type Config struct {
 	// IngressControllerImage is the ingress controller image to manage.
 	IngressControllerImage string
 
+	// HAProxyImage is the HAProxy image to be managed.
+	HAProxyImage string
+
 	// CanaryImage is the ingress operator image, which runs a canary command.
 	CanaryImage string
 

pkg/operator/controller/ingress/controller.go

@@ -243,6 +243,7 @@ func hasName(name string) func(o client.Object) bool {
 type Config struct {
 	Namespace                   string
 	IngressControllerImage      string
+	HAProxyImage                string
 	IngressControllerDCMEnabled bool
 }
 

pkg/operator/controller/ingress/deployment.go

@@ -830,10 +830,9 @@ func desiredRouterDeployment(ci *operatorv1.IngressController, config *Config, i
 	// router image.
 	deployment.Spec.Template.Spec.Containers[0].Image = config.IngressControllerImage
 
-	// haproxy image: using router's image for now, but it needs its own image.
-	// HAProxy images: https://redhat.atlassian.net/browse/NE-2218
-	// API field: https://redhat.atlassian.net/browse/NE-2217
-	deployment.Spec.Template.Spec.InitContainers[1].Image = config.IngressControllerImage
+	// haproxy image.
+	// Missing API field: https://redhat.atlassian.net/browse/NE-2217
+	deployment.Spec.Template.Spec.InitContainers[1].Image = config.HAProxyImage
 
 	deployment.Spec.Template.Spec.DNSPolicy = corev1.DNSClusterFirst
 

pkg/operator/operator.go

@@ -183,6 +183,7 @@ func New(config operatorconfig.Config, kubeConfig *rest.Config) (*Operator, erro
 	if _, err := ingresscontroller.New(mgr, ingresscontroller.Config{
 		Namespace:                   config.Namespace,
 		IngressControllerImage:      config.IngressControllerImage,
+		HAProxyImage:                config.HAProxyImage,
 		IngressControllerDCMEnabled: ingressControllerDCMEnabled,
 	}); err != nil {
 		return nil, fmt.Errorf("failed to create ingress controller: %v", err)