Skip to content

Conversation

jcantrill
Copy link
Contributor

@jcantrill jcantrill commented Apr 27, 2023

Description

This PR:

  • removes the TLSProfile from the CLF.spec

Links

cc @IshwarKanse

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 27, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2023

@jcantrill: This pull request references LOG-4017 which is a valid jira issue.

In response to this:

Description

This PR:

  • removes the TLSProfile from the CLF.spec

Links

  • LOG-4017: remove TLSProfile from CLF.spec

cc @IshwarKanse

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.

1 similar comment
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2023

@jcantrill: This pull request references LOG-4017 which is a valid jira issue.

In response to this:

Description

This PR:

  • removes the TLSProfile from the CLF.spec

Links

  • LOG-4017: remove TLSProfile from CLF.spec

cc @IshwarKanse

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.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2023

@jcantrill: This pull request references LOG-4017 which is a valid jira issue.

In response to this:

Description

This PR:

  • removes the TLSProfile from the CLF.spec

Links

cc @IshwarKanse

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2023
@jcantrill
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 27, 2023
@jcantrill
Copy link
Contributor Author

/cherrypick master

@openshift-cherrypick-robot

@jcantrill: 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:

/cherrypick 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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 27, 2023

@jcantrill: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-ocp-target-minus-one 4f4390e link false /test e2e-ocp-target-minus-one
ci/prow/functional-target 4f4390e link false /test functional-target

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.

@jcantrill
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 27, 2023
@vparfonov
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2023
@openshift-merge-robot openshift-merge-robot merged commit 902566b into openshift:release-5.7 Apr 28, 2023
@jcantrill jcantrill deleted the log4017 branch April 28, 2023 20:55
@openshift-cherrypick-robot

@jcantrill: #1972 failed to apply on top of branch "master":

Applying: LOG-4012: use TSL profile for fluent to loki
Applying: LOG-4017: remove TLSProfile from CLF.spec
error: patch failed: docs/reference/operator/api.adoc:41
error: docs/reference/operator/api.adoc: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
M	apis/logging/v1/zz_generated.deepcopy.go
M	internal/generator/vector/outputs.go
Patch failed at 0002 LOG-4017: remove TLSProfile from CLF.spec
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 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
Copy link
Contributor Author

/cherrypick master

@openshift-cherrypick-robot

@jcantrill: #1972 failed to apply on top of branch "master":

Applying: LOG-4012: use TSL profile for fluent to loki
.git/rebase-apply/patch:204: trailing whitespace.
  
.git/rebase-apply/patch:215: trailing whitespace.
  
.git/rebase-apply/patch:337: trailing whitespace.
      
.git/rebase-apply/patch:348: trailing whitespace.
      
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	internal/generator/fluentd/output/loki/loki.go
M	internal/generator/fluentd/output/loki/loki_conf_test.go
M	internal/generator/fluentd/outputs.go
M	internal/generator/fluentd/sources.go
M	internal/generator/tls.go
M	internal/generator/tls_test.go
M	internal/generator/vector/outputs.go
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: LOG-4017: remove TLSProfile from CLF.spec
error: patch failed: docs/reference/operator/api.adoc:41
error: docs/reference/operator/api.adoc: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Using index info to reconstruct a base tree...
M	apis/logging/v1/zz_generated.deepcopy.go
Patch failed at 0002 LOG-4017: remove TLSProfile from CLF.spec
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 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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. release/5.7

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants