Skip to content

Remove some unwanted logging. Fix an error message#437

Merged
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
danwinship:cleanup-333
Jan 7, 2020
Merged

Remove some unwanted logging. Fix an error message#437
openshift-merge-robot merged 2 commits intoopenshift:masterfrom
danwinship:cleanup-333

Conversation

@danwinship
Copy link
Contributor

#333 added logging of the ovn-kube TLS keys to the startup of all of the daemons. I assume @pecameron did this for debugging reasons at one point and then forgot to remove it? If the admin wants to see the key they can just look at the Secret directly... we should not be logging private keys to pod logs.

I'm assuming that for the other fix here (removing "PHIL" from an error message) we actually do want to keep that check.

@danwinship danwinship requested a review from pecameron January 6, 2020 17:13
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 6, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 6, 2020
@danwinship
Copy link
Contributor Author

/retest

@alexanderConstantinescu
Copy link
Contributor

alexanderConstantinescu commented Jan 7, 2020

@pecameron You seemed to have hard-coded the ovnkube-master/node log-level to 4, independently of what might be specified in any configfile/configmap. See L75 in pkg/network/ovn_kubernetes.go. Is it supposed to be like that?

data.Data["OvnkubeLogLevel"] = 4

@danwinship : could you change that in this PR? I am only asking as to have one atomic change taking care of all of those issues.

@danwinship
Copy link
Contributor Author

That's not really a change. Previously the daemonset specified

env:
- name: OVN_KUBE_LOG_LEVEL
  value: 4

now it specifies

env:
- name: OVN_KUBE_LOG_LEVEL
  value: "{{.OvnkubeLogLevel}}"

and templates in the 4. But either way you can override it via the env-overrides configmap.

so... I guess there's not really any reason to be templating the default value in...

The way to change this is via the env-overrides configmap, so we don't
need to make the value settable via the template.
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@alexanderConstantinescu
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexanderConstantinescu, danwinship

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 8a35944 into openshift:master Jan 7, 2020
@dcbw
Copy link
Contributor

dcbw commented Jan 8, 2020

@trozet #440

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants