Skip to content

OPNET-801: Switch on-prem HAProxy pods to haproxy-router-haproxy32 image #6502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Sep 17, 2026
Merged

OPNET-801: Switch on-prem HAProxy pods to haproxy-router-haproxy32 image #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d34f8f
Switch on-prem HAProxy pods to haproxy-router-haproxy32 image
emy Sep 4, 2026
7bdcadb
Create /var/lib/haproxy/run and run haproxy as root for HAProxy 3.2
emy Sep 7, 2026
e575d21
Mount emptyDir at /var/lib/haproxy/run instead of running haproxy as …
emy Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func runBootstrapCmd(_ *cobra.Command, _ []string) {
bootstrapOpts.oauthProxyImage = findImageOrDie(imgstream, "oauth-proxy")
bootstrapOpts.kubeRbacProxyImage = findImageOrDie(imgstream, "kube-rbac-proxy")
bootstrapOpts.infraImage = findImageOrDie(imgstream, "pod")
bootstrapOpts.haproxyImage = findImageOrDie(imgstream, "haproxy-router")
bootstrapOpts.haproxyImage = findImageOrDie(imgstream, "haproxy-router-haproxy32")
bootstrapOpts.dockerRegistryImage = findImageOrDie(imgstream, "docker-registry")
bootstrapOpts.baseOSContainerImage, err = findImage(imgstream, baseOSContainerImageTag)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion install/0000_80_machine-config_02_images.configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
"infraImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:pod",
"keepalivedImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:keepalived-ipfailover",
"corednsImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:coredns",
"haproxyImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router",
"haproxyImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router-haproxy32",
"baremetalRuntimeCfgImage": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:baremetal-runtimecfg",
"oauthProxy": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:oauth-proxy",
"kubeRbacProxy": "placeholder.url.oc.will.replace.this.org/placeholdernamespace:kube-rbac-proxy",
Expand Down
4 changes: 2 additions & 2 deletions install/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ spec:
from:
kind: DockerImage
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:coredns
- name: haproxy-router
- name: haproxy-router-haproxy32
from:
kind: DockerImage
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router
name: placeholder.url.oc.will.replace.this.org/placeholdernamespace:haproxy-router-haproxy32
- name: baremetal-runtimecfg
from:
kind: DockerImage
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/template/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const (
// CorednsKey is the key that references the coredns image in the controller
CorednsKey string = "corednsImage"

// HaproxyKey is the key that references the haproxy-router image in the controller
// HaproxyKey is the key that references the haproxy-router-haproxy32 image in the controller
HaproxyKey string = "haproxyImage"

// BaremetalRuntimeCfgKey is the key that references the baremetal-runtimecfg image in the controller
Expand Down
4 changes: 4 additions & 0 deletions templates/master/00-master/on-prem/files/haproxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ contents:
path: "/var/lib/kubelet"
- name: run-dir
empty-dir: {}
- name: lib-run-dir
empty-dir: {}
- name: conf-dir
hostPath:
path: "/etc/haproxy"
Expand Down Expand Up @@ -121,6 +123,8 @@ contents:
mountPropagation: HostToContainer
- name: run-dir
mountPath: "/var/run/haproxy"
- name: lib-run-dir
mountPath: "/var/lib/haproxy/run"
livenessProbe:
initialDelaySeconds: 50
httpGet:
Expand Down