Skip to content

Commit 2cd2beb

Browse files
joelanfordtmshort
authored andcommitted
UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator
Signed-off-by: Joe Lanford <[email protected]>
1 parent 1faa60c commit 2cd2beb

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

openshift/kustomize/overlays/openshift/kustomization.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ patches:
2222
kind: Deployment
2323
name: controller-manager
2424
path: patches/manager_deployment_mount_etc_containers.yaml
25+
- target:
26+
kind: Deployment
27+
name: controller-manager
28+
path: patches/manager_deployment_log_verbosity.yaml
2529
- path: patches/manager_namespace_privileged.yaml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- op: add
2+
path: /spec/template/spec/containers/0/args/-
3+
value: "--v=${LOG_VERBOSITY}"
4+
- op: add
5+
path: /spec/template/spec/containers/1/args/-
6+
value: "--v=${LOG_VERBOSITY}"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ spec:
4444
- --metrics-bind-address=127.0.0.1:8080
4545
- --leader-elect
4646
- --ca-certs-dir=/var/certs
47+
- --v=${LOG_VERBOSITY}
4748
command:
4849
- /manager
4950
image: ${OPERATOR_CONTROLLER_IMAGE}
@@ -86,6 +87,7 @@ spec:
8687
- --http2-disable
8788
- --upstream=http://127.0.0.1:8080/
8889
- --logtostderr=true
90+
- --v=${LOG_VERBOSITY}
8991
image: ${KUBE_RBAC_PROXY_IMAGE}
9092
name: kube-rbac-proxy
9193
ports:

0 commit comments

Comments
 (0)