LOG-2843, take two. Added client key passphrase

[syedriko]

Description

A fix for the fix for LOG-2843, added support for client key passphrase missed in the original fix.

/cc @vimalk78
/assign @jcantrill

Links

• JIRA: https://issues.redhat.com/browse/LOG-2843

[jcantrill]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, syedriko

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [jcantrill]

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

[syedriko]

/test e2e

[syedriko]

/test e2e

[jcantrill]

/retest

[syedriko]

/test e2e

[jcantrill]

/lgtm

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD d97f8c8 and 2 for PR HEAD 8e8d259 in total

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD 23458f5 and 1 for PR HEAD 8e8d259 in total

[syedriko]

/test unit

[openshift-ci]

@syedriko: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[syedriko]

/cherrypick release-5.5

[openshift-cherrypick-robot]

@syedriko: #1669 failed to apply on top of branch "release-5.5":

Applying: LOG-2843, take two. Added client key passphrase
Using index info to reconstruct a base tree...
M	internal/generator/fluentd/output/syslog/syslog.go
Falling back to patching base and 3-way merge...
Auto-merging internal/generator/fluentd/output/syslog/syslog.go
CONFLICT (content): Merge conflict in internal/generator/fluentd/output/syslog/syslog.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-2843, take two. Added client key passphrase
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-5.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.