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.

Sign up for GitHub

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

Jump to bottom

Update fluentd-gcp addon to 1.25.2 #41863

Merged
merged 1 commit into from
Feb 22, 2017
Merged

Update fluentd-gcp addon to 1.25.2 #41863

merged 1 commit into from
Feb 22, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Feb 22, 2017 •
edited by jessfraz
Loading

What this PR does / why we need it: creates a new version of the fluentd-gcp image based on the 1.25 version, with newer upstream dependencies pulled in. Same basic idea as #39705.

The definition for 1.21.2 comes from #41862. I'm not sure why release-1.4 uses two different versions of fluentd-gcp.

cc @timstclair

Release note:

Update fluentd-gcp addon to 1.25.2

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 22, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: ixdy

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @zmerlynn
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Feb 22, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@ixdy
Copy link
Member Author

ixdy commented Feb 22, 2017

cc @piosz @mwielgus @crassirostris

timstclair
timstclair reviewed Feb 22, 2017
View reviewed changes
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile Outdated
@@ -20,7 +20,7 @@
# scope and that the Logging API has been enabled for the project
# in the Google Developer Console.

FROM gcr.io/google_containers/ubuntu-slim:0.4
FROM gcr.io/google_containers/ubuntu-slim:0.4.1
Copy link

Choose a reason for hiding this comment

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

How does ubuntu-slim:0.4.1 differ from ubuntu-slim:0.6 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

0.4.1 is based off https://github.com/kubernetes/contrib/blob/cd4501bdeef07db42f4856987b02f953c32885f3/images/ubuntu-slim/Dockerfile.build.
0.6 is based off https://github.com/kubernetes/ingress/blob/d002ca2f5ed08e8cf8756acae7329aa2ba536cc5/images/ubuntu-slim/Dockerfile.build

It looks like the main difference is that 0.6 doesn't delete bash. So we could probably switch to 0.6 fairly safely.
0.7 removes even more stuff, which makes it a bit riskier IMO.

@crassirostris
Copy link

crassirostris commented Feb 22, 2017 •
edited
Loading

@ixdy

I'm not sure why release-1.4 uses two different versions of fluentd-gcp.

That's a mistake, you can leave only 1.25.2

@ixdy ixdy force-pushed the fluentd-gcp-1.25.2 branch from e38821a to 3d306c4 Compare February 22, 2017 18:35
@ixdy ixdy changed the title Update fluentd-gcp addon to 1.21.2/1.25.2 Update fluentd-gcp addon to 1.25.2 Feb 22, 2017
@ixdy
Copy link
Member Author

ixdy commented Feb 22, 2017

OK, I've updated the fluentd-gcp:1.25.2 image to be based off of ubuntu-slim:0.6, and I've also updated the configs to use 1.25.2 in both places.

@crassirostris
Copy link

Thanks! LGTM

@timstclair
Copy link

/lgtm

@k8s-ci-robot
Copy link
Contributor

@timstclair: you can't LGTM a PR unless you are an assignee.

In response to this comment:

/lgtm

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.

@timstclair timstclair added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Feb 22, 2017
@jessfraz jessfraz added this to the v1.4 milestone Feb 22, 2017
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 22, 2017
@jessfraz
Copy link
Contributor

merging since all green

@jessfraz jessfraz merged commit dabacc8 into kubernetes:release-1.4 Feb 22, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@ixdy ixdy mentioned this pull request Mar 31, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Apr 5, 2017
Merge pull request #43927 from ixdy/fluentd-gcp-1.25.3
ff51c44 
Automatic merge from submit-queue

Update to fluentd-gcp:1.25.3, rebased on ubuntu-slim:0.8

**What this PR does / why we need it**: another rehash of #41863 and #39705 - rebasing the fluentd-gcp image to fix CVEs in upstream dependencies.

Fixes the following CVEs:
* CVE-2016-5417 (MEDIUM)
* CVE-2016-6323 (MEDIUM)
* CVE-2016-1234 (MEDIUM)
* CVE-2016-4429 (HIGH)
* CVE-2016-3706 (MEDIUM)
* CVE-2017-6507 (MEDIUM)

**Special notes for your reviewer**:
fliuentd-gcp:1.25.3 is **not yet pushed**.

**Release note**:

```release-note
```

/assign @crassirostris 
/cc @timstclair
@ixdy ixdy deleted the fluentd-gcp-1.25.2 branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timstclair timstclair timstclair left review comments

Assignees

@jessfraz jessfraz

@crassirostris crassirostris

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@ixdy @k8s-github-robot @k8s-reviewable @crassirostris @timstclair @k8s-ci-robot @jessfraz @k8s-cherrypick-bot