From a737c50c78701401d9bd77e398a904e9cd765b6c Mon Sep 17 00:00:00 2001 From: "openshift-merge-bot[bot]" <148852131+openshift-merge-bot[bot]@users.noreply.github.com> Date: Thu, 30 Jul 2026 06:35:39 +0000 Subject: [PATCH] UPSTREAM: : Fix cache path to avoid /var/cache/dnf conflict OCPBUGS-89330: Change catalogd and operator-controller cache directories to use dedicated paths instead of conflicting with system paths like /var/cache/dnf which cause permission errors on startup. - catalogd: /var/cache/ -> /var/cache/catalogd - operator-controller: /var/cache -> /var/cache/operator-controller --- cmd/catalogd/main.go | 2 +- cmd/operator-controller/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/catalogd/main.go b/cmd/catalogd/main.go index c60de16077..1cdd0a4a5e 100644 --- a/cmd/catalogd/main.go +++ b/cmd/catalogd/main.go @@ -129,7 +129,7 @@ func init() { flags.StringVar(&cfg.systemNamespace, "system-namespace", "", "The namespace catalogd uses for internal state") flags.StringVar(&cfg.catalogServerAddr, "catalogs-server-addr", ":8443", "The address where catalogs' content will be accessible") flags.StringVar(&cfg.externalAddr, "external-address", "catalogd-service.olmv1-system.svc", "External address for http(s) server") - flags.StringVar(&cfg.cacheDir, "cache-dir", "/var/cache/", "Directory for file based caching") + flags.StringVar(&cfg.cacheDir, "cache-dir", "/var/cache/catalogd", "Directory for file based caching") flags.DurationVar(&cfg.gcInterval, "gc-interval", 12*time.Hour, "Garbage collection interval") flags.StringVar(&cfg.certFile, "tls-cert", "", "Certificate file for TLS") flags.StringVar(&cfg.keyFile, "tls-key", "", "Key file for TLS") diff --git a/cmd/operator-controller/main.go b/cmd/operator-controller/main.go index c72ba60f23..0b59cb30ad 100644 --- a/cmd/operator-controller/main.go +++ b/cmd/operator-controller/main.go @@ -183,7 +183,7 @@ func init() { flags.BoolVar(&cfg.enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - flags.StringVar(&cfg.cachePath, "cache-path", "/var/cache", "The local directory path used for filesystem based caching") + flags.StringVar(&cfg.cachePath, "cache-path", "/var/cache/operator-controller", "The local directory path used for filesystem based caching") flags.StringVar(&cfg.systemNamespace, "system-namespace", "", "Configures the namespace that gets used to deploy system resources.") flags.StringVar(&cfg.globalPullSecret, "global-pull-secret", "", "The / of the global pull secret that is going to be used to pull bundle images.")