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

Replace the hostname in the fluentd config file even if the file exists #85827

Merged

Conversation

@barney-s
Copy link
Contributor

barney-s commented Dec 3, 2019

Startup script did not replace the hostname when the image come preinstalled with stackdriver agent (config file exists). This caused the wrong hostname (hostname at buildtime) to show up in the stackdriver logs.

What type of PR is this?
/kind bug

What this PR does / why we need it:
This PR fixes stackdriver config to have the correct hostname.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:
No

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 3, 2019

@barney-s: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 3, 2019

Hi @barney-s. 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.

@barney-s

This comment has been minimized.

Copy link
Contributor Author

barney-s commented Dec 3, 2019

/assign @pjh

@RA489

This comment has been minimized.

Copy link
Contributor

RA489 commented Dec 3, 2019

/release-note-none

@RA489

This comment has been minimized.

Copy link
Contributor

RA489 commented Dec 3, 2019

/ok-to-test

@@ -1528,13 +1528,12 @@ function Configure-LoggingAgent {
if (-not (ShouldWrite-File $fluentd_config_file)) {

This comment has been minimized.

Copy link
@pjh

pjh Dec 3, 2019

Contributor

Instead of adding the else block, can you just remove this if (ShouldWrite-File ...) block entirely? Then I'm guessing that all the code below can stay the same and the file will be written / overwritten every time.

Addressing review comment. Removing conditional check for fluentd config file path.
@k8s-ci-robot k8s-ci-robot added size/XS and removed size/S labels Dec 5, 2019
@pjh

This comment has been minimized.

Copy link
Contributor

pjh commented Dec 5, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm label Dec 5, 2019
@pjh

This comment has been minimized.

Copy link
Contributor

pjh commented Dec 5, 2019

/priority important-soon

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 5, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: barney-s, pjh

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

@yliaog

This comment has been minimized.

Copy link
Contributor

yliaog commented Dec 5, 2019

/retest

1 similar comment
@yliaog

This comment has been minimized.

Copy link
Contributor

yliaog commented Dec 5, 2019

/retest

@k8s-ci-robot k8s-ci-robot merged commit a6f41a4 into kubernetes:master Dec 6, 2019
15 checks passed
15 checks passed
cla/linuxfoundation barney-s authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-kind Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
tide In merge pool.
Details
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Dec 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.