Skip to content

Commit 74a2477

Browse files
tmshortopenshift-merge-bot[bot]
authored andcommitted
UPSTREAM: <carry>: Add /etc/docker to the operator-controller deployments
This allows for use of the any image.config.openshift.io trusted CAs Signed-off-by: Todd Short <[email protected]> (cherry picked from commit 45ec92b)
1 parent 25ac3d9 commit 74a2477

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_mount_etc_containers.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@
44
- op: add
55
path: /spec/template/spec/containers/0/volumeMounts/-
66
value: {"name":"etc-containers", "readOnly": true, "mountPath":"/etc/containers"}
7+
- op: add
8+
path: /spec/template/spec/volumes/-
9+
value: {"name":"etc-docker", "hostPath":{"path":"/etc/docker", "type": "Directory"}}
10+
- op: add
11+
path: /spec/template/spec/containers/0/volumeMounts/-
12+
value: {"name":"etc-docker", "readOnly": true, "mountPath":"/etc/docker"}

openshift/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ spec:
8484
- mountPath: /etc/containers
8585
name: etc-containers
8686
readOnly: true
87+
- mountPath: /etc/docker
88+
name: etc-docker
89+
readOnly: true
8790
- args:
8891
- --secure-listen-address=0.0.0.0:8443
8992
- --http2-disable
@@ -149,4 +152,8 @@ spec:
149152
path: /etc/containers
150153
type: Directory
151154
name: etc-containers
155+
- hostPath:
156+
path: /etc/docker
157+
type: Directory
158+
name: etc-docker
152159
priorityClassName: system-cluster-critical

0 commit comments

Comments
 (0)