From 46b09afedf6df47905f3a99005304ad4cf14fd91 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 21 Apr 2025 09:18:25 -0400 Subject: [PATCH] UPSTREAM: 316: Add catalogd-cas-dir option to op-con Fixes OCPBUGS-55172 Signed-off-by: Todd Short --- .../openshift/olmv1-ns/patches/manager_deployment_certs.yaml | 3 +++ ...rator-controller-operator-controller-controller-manager.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml b/openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml index 9166ed2d2..f027c698c 100644 --- a/openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml +++ b/openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml @@ -4,6 +4,9 @@ - op: add path: /spec/template/spec/containers/0/volumeMounts/- value: {"name":"ca-certs", "mountPath":"/var/ca-certs", "readOnly": true} +- op: add + path: /spec/template/spec/containers/0/args/- + value: "--catalogd-cas-dir=/var/ca-certs" - op: add path: /spec/template/spec/containers/0/env value: [{"name":"SSL_CERT_DIR", "value":"/var/ca-certs"}] diff --git a/openshift/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml b/openshift/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml index 05a0a896d..2b240af18 100644 --- a/openshift/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml +++ b/openshift/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml @@ -43,6 +43,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 - --leader-elect + - --catalogd-cas-dir=/var/ca-certs - --v=${LOG_VERBOSITY} - --global-pull-secret=openshift-config/pull-secret command: