Skip to content

AGENT-1526: disable htpasswd auth on IRI registry, keep read-only #6109

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 2 commits into from
Jun 3, 2026
+10 −60
Merged

AGENT-1526: disable htpasswd auth on IRI registry, keep read-only #6109

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d374adc
disable htpasswd auth on IRI registry, keep read-only
andfasano Jun 1, 2026
5da9577
fix e2e tests
andfasano Jun 1, 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
4 changes: 2 additions & 2 deletions pkg/controller/internalreleaseimage/internalreleaseimage_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func verifyInternalReleaseMasterMachineConfig(t *testing.T, mc *mcfgv1.MachineCo

assert.Len(t, ignCfg.Systemd.Units, 1)
assert.Contains(t, *ignCfg.Systemd.Units[0].Contents, "docker-registry-image-pullspec")
assert.Contains(t, *ignCfg.Systemd.Units[0].Contents, "REGISTRY_AUTH_HTPASSWD_REALM")
assert.Contains(t, *ignCfg.Systemd.Units[0].Contents, "REGISTRY_AUTH_HTPASSWD_PATH")
assert.NotContains(t, *ignCfg.Systemd.Units[0].Contents, "REGISTRY_AUTH_HTPASSWD_REALM")
assert.NotContains(t, *ignCfg.Systemd.Units[0].Contents, "REGISTRY_AUTH_HTPASSWD_PATH")

assert.Len(t, ignCfg.Storage.Files, 5, "Found an unexpected file")
verifyIgnitionFile(t, &ignCfg, "/etc/pki/ca-trust/source/anchors/iri-root-ca.crt", "iri-root-ca-data")
Expand Down
2 changes: 0 additions & 2 deletions pkg/controller/internalreleaseimage/templates/master/units/iri-registry.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ contents: |
-e REGISTRY_HTTP_ADDR=0.0.0.0:22625 \
-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/tls.crt -e REGISTRY_HTTP_TLS_KEY=/certs/tls.key \
-e 'REGISTRY_STORAGE_MAINTENANCE_READONLY={"enabled":true}' \
{{- /* REGISTRY_AUTH_HTPASSWD_REALM is required by the distribution registry but can be any value. It is sent in WWW-Authenticate headers to identify the protected area to clients. */}}
-e REGISTRY_AUTH_HTPASSWD_REALM=iri-registry -e REGISTRY_AUTH_HTPASSWD_PATH=/etc/registry/auth/htpasswd \
-u 0 --entrypoint=/usr/bin/distribution {{ .DockerRegistryImage }} serve /etc/registry/config.yaml
ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
Expand Down