Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add http-access-log-path and stream-access-log-path options in configMap #5656

Merged
merged 1 commit into from
Jun 8, 2020

Conversation

agile6v
Copy link
Contributor

@agile6v agile6v commented Jun 4, 2020

What this PR does / why we need it:

Please see issue #5647

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

fixes #5647

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 4, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @agile6v. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 4, 2020
@k8s-ci-robot k8s-ci-robot requested review from aledbf and cmluciano June 4, 2020 13:09
@ElvinEfendi
Copy link
Member

Can you create e2e test file test/e2e/settings/access_log.go and assert that logic works as expected? You can use f.UpdateNginxConfigMapData helper function to set the setting value, and then use following for assertion:

    f.WaitForNginxConfiguration(func(conf string) bool {
      return strings.Contains(conf, "access_log or something")
    })

@agile6v
Copy link
Contributor Author

agile6v commented Jun 4, 2020

Can you create e2e test file test/e2e/settings/access_log.go and assert that logic works as expected? You can use f.UpdateNginxConfigMapData helper function to set the setting value, and then use following for assertion:

    f.WaitForNginxConfiguration(func(conf string) bool {
      return strings.Contains(conf, "access_log or something")
    })

Thanks for your patient guidance.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 4, 2020
@ElvinEfendi
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 4, 2020
@aledbf
Copy link
Member

aledbf commented Jun 4, 2020

I understand the reason for this feature but I prefer to remove the access-log setting and use the current value, /var/log/access.log, in the new two fields. Not doing this will trigger questions about the order or priority.

@agile6v
Copy link
Contributor Author

agile6v commented Jun 5, 2020

I understand the reason for this feature but I prefer to remove the access-log setting and use the current value, /var/log/access.log, in the new two fields. Not doing this will trigger questions about the order or priority.

Yes. I also prefer to remove the access-log-path option. But if considering backward compatibility, it's better to deprecate it in the further release. Thanks.

@agile6v
Copy link
Contributor Author

agile6v commented Jun 5, 2020

/retest

@codecov-commenter
Copy link

codecov-commenter commented Jun 5, 2020

Codecov Report

Merging #5656 into master will increase coverage by 0.24%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5656      +/-   ##
==========================================
+ Coverage   58.48%   58.72%   +0.24%     
==========================================
  Files          88       88              
  Lines        6975     6946      -29     
==========================================
  Hits         4079     4079              
+ Misses       2446     2417      -29     
  Partials      450      450              
Impacted Files Coverage Δ
internal/ingress/controller/nginx.go 30.00% <0.00%> (+0.27%) ⬆️
internal/ingress/controller/process/nginx.go 100.00% <ø> (+67.64%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8419bb6...fc1c043. Read the comment docs.

@agile6v
Copy link
Contributor Author

agile6v commented Jun 8, 2020

ping @aledbf @ElvinEfendi

@ElvinEfendi
Copy link
Member

I like the idea of removing access-log-path in subsequent releases after deprecating it in the next release.

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 8, 2020
@ElvinEfendi
Copy link
Member

/approve cancel

@aledbf I'll let you approve

@k8s-ci-robot k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 8, 2020
@aledbf
Copy link
Member

aledbf commented Jun 8, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agile6v, aledbf

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 8, 2020
@aledbf
Copy link
Member

aledbf commented Jun 8, 2020

/retest

@k8s-ci-robot k8s-ci-robot merged commit 99aad29 into kubernetes:master Jun 8, 2020
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

access-log-path doesn't work in the Nginx stream block
5 participants