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

[v1.25] Pick of Update windows fluentd bash.exe path #1998

Merged
merged 1 commit into from
Jun 9, 2022

Conversation

lmm
Copy link
Contributor

@lmm lmm commented Jun 3, 2022

Description

Pick of #1993

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

We've bumped the base fluentd version which uses ruby 2.7, meaning the
base path for the ruby install is c:\ruby27

In the fluentd build we will now add a symlink to c:\ruby27 from c:\ruby
This commit updates the path of bash.exe to point to that symlinked
path.
Copy link
Member

@rene-dekker rene-dekker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@lmm lmm merged commit 3e05268 into tigera:release-v1.25 Jun 9, 2022
@lmm lmm deleted the lmm-pick-1.25 branch June 9, 2022 23:24
@lmm lmm removed the hold merge Do not merge label Jun 9, 2022
@rene-dekker rene-dekker modified the milestones: v1.25.9, v1.25.10 Jun 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants