LOG-4852: Vector collector Pods no longer picks up the log collector SAs Secret as a fallback

[Clee2691]

Description

This PR addresses forwarding to an internal LokiStack where in the legacy case, if the pipelines.outputs is not default it will not apply the logcollector-token secret's token and ca.crt. For a CLF named instance it will add the logcollector service account token to be used.

/cc @cahartma @vparfonov
/assign @jcantrill

Links

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

[openshift-ci-robot]

@Clee2691: This pull request references LOG-4852 which is a valid jira issue.

In response to this:

Description

This PR addresses forwarding to an internal LokiStack where in the legacy case, if the pipelines.outputs is not default it will not apply the logcollector-token secret's token and ca.crt. For a CLF named instance it will add the logcollector service account token to be used.

/cc @cahartma @vparfonov
/assign @jcantrill

Links

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

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.

[Clee2691]

/cherry-pick master

[openshift-cherrypick-robot]

@Clee2691: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

In response to this:

/cherry-pick master

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.

[jcantrill]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

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

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

[Clee2691]

/retest

[jcantrill]

/hold

[jcantrill]

I think the logic is missing something here because it's not using any of the helper functions.

• What if my secret defines a CA to use?
• What if I define a secret ... but I don't get any TLS Profile options here

Following "GenerateTLSConf" leads me to think it still nees to utilize that function... and then check the CA afterwards and set it like this if not defined

[Clee2691]

The first if statement is looking for output.secret so if a user defines a secret for the output, it will be caught there. Your questions above pertain to that bit.

Line 221

if o.Secret != nil {
...
}

I'm not changing any of the original functionality as this is only using the logcollector secret as a fallback if a user does not define a secret for the output. The secret here isn't the one that is defined for the output. It is the secret automatically populated for the legacy case (constants.LogCollectorToken).

[jcantrill]

/hold cancel

[jcantrill]

/lgtm

[openshift-cherrypick-robot]

@Clee2691: #2284 failed to apply on top of branch "master":

Applying: LOG-4852: Vector collector Pods no longer picks up the log collector SAs Secret as a fallback
Using index info to reconstruct a base tree...
M	internal/generator/vector/output/loki/loki.go
Falling back to patching base and 3-way merge...
Auto-merging internal/generator/vector/output/loki/loki.go
CONFLICT (content): Merge conflict in internal/generator/vector/output/loki/loki.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-4852: Vector collector Pods no longer picks up the log collector SAs Secret as a fallback
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:

/cherry-pick master

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.