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 to fluentd-gcp:1.28.3, rebased on ubuntu-slim:0.8 #43928

Merged
merged 1 commit into from
Apr 7, 2017
Merged

Update to fluentd-gcp:1.28.3, rebased on ubuntu-slim:0.8 #43928

merged 1 commit into from
Apr 7, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Mar 31, 2017

What this PR does / why we need it: similar to previous fixes here - rebasing the fluentd-gcp image to fix CVEs in upstream dependencies. #43927 is a parallel change for release-1.4.

Fixes the following CVEs:

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

Release note:

/assign @mwielgus @crassirostris
/cc @timstclair

@ixdy
Update to fluentd-gcp:1.28.3, rebased on ubuntu-slim:0.8
d1bb325 
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)
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 31, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Mar 31, 2017
@ixdy ixdy added this to the v1.5 milestone Mar 31, 2017
@ixdy ixdy 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 Mar 31, 2017
@ixdy ixdy mentioned this pull request Mar 31, 2017
Closed
@ixdy
Copy link
Member Author

ixdy commented Apr 3, 2017

It looks like there's already a 1.28.3 tag for fluentd-gcp, though I have no idea where it came from. :\

bdd3233f4460  1.28.3         2017-02-16T10:46:14

Looks like it was built by @crassirostris.

@crassirostris
Copy link

@ixdy Mmmm. It's not used anywhere, so please push over it. I can't remember how it got there, but I'm sure my mistake. Sorry for that!

@ixdy
Copy link
Member Author

ixdy commented Apr 3, 2017

OK, new gcr.io/google-containers/fluentd-gcp:1.28.3 pushed.
@k8s-bot test this

@ixdy
Copy link
Member Author

ixdy commented Apr 5, 2017

ping?

@crassirostris
Copy link

@ixdy Sorry for the late reply. You changed google_containers to google-containers in Makefile, but not in spec. Will it work?

@ixdy
Copy link
Member Author

ixdy commented Apr 5, 2017

As far as the registry is concerned, google-containers and google_containers are equivalent. In old versions of docker, dashes were not supported, which is why we have used google_containers, but now some tools (like gcloud container images) don't recognize google_containers, only google-containers.

Modern versions of docker handle google-containers fine, so I've been slowly updating references to use it for consistency. I'm hesitant to update it in the specs for release branches, though, since I'm not entirely sure which version of docker runs in these clusters. (Though 1.5 would probably be safe to update.)

@crassirostris
Copy link

Awesome, thanks for the explanation!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 5, 2017
@ixdy
Copy link
Member Author

ixdy commented Apr 5, 2017

I just checked and docker 1.9.1 supports both google-containers and google_containers, so we'd probably be safe to switch all recent releases.

@mwielgus mwielgus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Apr 6, 2017
@mwielgus
Copy link
Contributor

mwielgus commented Apr 7, 2017

@ixdy This PR is missing an approval.

@ixdy
Copy link
Member Author

ixdy commented Apr 7, 2017

indeed it is. @eparis @mikedanese @roberthbailey @zmerlynn can one of you help me out?

@eparis
Copy link
Contributor

eparis commented Apr 7, 2017

/approve

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 7, 2017
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@roberthbailey
Copy link
Contributor

/lgtm
/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crassirostris, eparis, ixdy, roberthbailey

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

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
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 3bff0f2 into kubernetes:release-1.5 Apr 7, 2017
@k8s-cherrypick-bot
Copy link

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

@Quentin-M Quentin-M mentioned this pull request Apr 27, 2017
Closed
@ixdy ixdy deleted the fluentd-gcp-1.28.3 branch May 15, 2018 23:36
This was referenced Sep 11, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@crassirostris crassirostris

@roberthbailey roberthbailey

@mwielgus mwielgus

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
9 participants
@ixdy @k8s-reviewable @crassirostris @mwielgus @eparis @k8s-github-robot @roberthbailey @k8s-cherrypick-bot @k8s-ci-robot