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

Bump ip-masq-agent version to v2.3.0 #77834

Merged
merged 1 commit into from
Jun 21, 2019

Conversation

anfernee
Copy link
Member

@anfernee anfernee commented May 13, 2019

Fixed vulnerabilities:
CVE-2018-15688 CVE-2017-15670 CVE-2017-18269 CVE-2017-16997 CVE-2017-15804 CVE-2018-18311 CVE-2018-18312 CVE-2018-18314 CVE-2017-1000408

Bump ip-masq-agent version to v2.3.0 to fix vulnerabilities

@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 13, 2019
@k8s-ci-robot k8s-ci-robot requested review from bowei and dnardo May 13, 2019 19:11
@bowei
Copy link
Member

bowei commented May 14, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 14, 2019
@tpepper
Copy link
Member

tpepper commented May 15, 2019

/kind feature

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels May 15, 2019
@tpepper
Copy link
Member

tpepper commented May 15, 2019

So we're basically reopening #77458 and calling it a security fix now?

@anfernee
Copy link
Member Author

@tpepper #77458 is more than a version bump. This simply bumps the image.

@tpepper
Copy link
Member

tpepper commented Jun 18, 2019

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 18, 2019
@bowei
Copy link
Member

bowei commented Jun 18, 2019

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anfernee, bowei

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 18, 2019
@tpepper tpepper removed the kind/feature Categorizes issue or PR as related to a new feature. label Jun 19, 2019
@tpepper
Copy link
Member

tpepper commented Jun 19, 2019

To update this set of cherry pick PRs (#77834, #77833, and #77832 against 1.12, 1.13, and 1.14 respectively):

As a member of the @kubernetes/patch-release-team, I had previously objected to similar cherry picking (#77572) as it was coupled to a vendor specific feature and did not meet the criteria for cherry pick. ip-masq-agent was bumped for the purpose of enabling a feature and that was rejected.

So in the meantime the submitters seem to have realized there are critical CVEs which should be fixed and that does the bulk of what they'd need coincidentally to add their feature (though that specific feature portion would exist on some branch they control not in the upstream project 1.12/1.13/1.14 release streams). I feel like the system may be being gamed here, I worry about the precedent that would set, and I wonder whether we should reject this set of PRs and ask for just the bug fixes on a 2.0.Z or 2.1.Z release stream.

Despite the poor optics and since the current set of PRs has been decoupled from the feature with the sub-portion of the prior PR attempt now presented as just a bug fix incrementing the minor version of a dependency to bring in CVE fixes that are given lgtm/approve by the appropriate OWNERS that we can approve the cherry pick. It's just unfortunate for this to play out this way and it is something that should be avoided in the future.

@aleksandra-malinowska
Copy link
Contributor

So in the meantime the submitters seem to have realized there are critical CVEs which should be fixed and that does the bulk of what they'd need coincidentally to add their feature (though that specific feature portion would exist on some branch they control not in the upstream project 1.12/1.13/1.14 release streams). I feel like the system may be being gamed here, I worry about the precedent that would set, and I wonder whether we should reject this set of PRs and ask for just the bug fixes on a 2.0.Z or 2.1.Z release stream.

Note that if a manifest can be changed to add extra flags, it can also be changed to use a newer image ;)

The version used here is exactly the same one as in the original rejected CP. Since this change doesn't contain extra flag which was required before, it can't enable the feature. It only provides this newer version as default to OSS users (and e2e tests).

If this is about sticking to semantic versioning and maintaining 3 separate tracks for each component, is there a policy about it? Personally, I think it may be an overkill in case of some smaller components (i.e. using most recent minor version everywhere keeps things simple), but if you don't like it, it sounds only fair to have this discussion in context of all components and not just this one.

@anfernee
Copy link
Member Author

To update this set of cherry pick PRs (#77834, #77833, and #77832 against 1.12, 1.13, and 1.14 respectively):

As a member of the @kubernetes/patch-release-team, I had previously objected to similar cherry picking (#77572) as it was coupled to a vendor specific feature and did not meet the criteria for cherry pick. ip-masq-agent was bumped for the purpose of enabling a feature and that was rejected.

So in the meantime the submitters seem to have realized there are critical CVEs which should be fixed and that does the bulk of what they'd need coincidentally to add their feature (though that specific feature portion would exist on some branch they control not in the upstream project 1.12/1.13/1.14 release streams). I feel like the system may be being gamed here, I worry about the precedent that would set, and I wonder whether we should reject this set of PRs and ask for just the bug fixes on a 2.0.Z or 2.1.Z release stream.

Despite the poor optics and since the current set of PRs has been decoupled from the feature with the sub-portion of the prior PR attempt now presented as just a bug fix incrementing the minor version of a dependency to bring in CVE fixes that are given lgtm/approve by the appropriate OWNERS that we can approve the cherry pick. It's just unfortunate for this to play out this way and it is something that should be avoided in the future.

Thanks a lot @tpepper
To be clear, nobody is trying to game the system. This has nothing to do with the rejected #77458. This PR is simply bump the OS to include the CVE fixes. The agent behaves exactly the same.

@feiskyer feiskyer added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 21, 2019
@k8s-ci-robot k8s-ci-robot merged commit db1a871 into kubernetes:release-1.12 Jun 21, 2019
mboersma added a commit to mboersma/aks-engine that referenced this pull request Jul 9, 2019
mboersma added a commit to mboersma/aks-engine that referenced this pull request Jul 9, 2019
mboersma added a commit to mboersma/aks-engine that referenced this pull request Jul 9, 2019
acs-bot pushed a commit to Azure/aks-engine that referenced this pull request Jul 9, 2019
* feat: add support for Kubernetes 1.13.8

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md#changelog-since-v1137

* chore: update addon-manager to v8.9.1

See kubernetes/kubernetes#77623

* chore: update ip-masq-agent version to v2.3.0

See kubernetes/kubernetes#77834

* chore: re-enable k8s 1.13.5 for Azure Stack support
acs-bot pushed a commit to Azure/aks-engine that referenced this pull request Jul 9, 2019
* feat: add support for Kubernetes 1.14.4

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#changelog-since-v1143

* chore: update ip-masq-agent version to v2.3.0

See kubernetes/kubernetes#77834

* chore: re-enable k8s 1.14.1 for Azure Stack support
mboersma added a commit to mboersma/aks-engine that referenced this pull request Jul 24, 2019
* feat: add support for Kubernetes 1.13.8

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.13.md#changelog-since-v1137

* chore: update addon-manager to v8.9.1

See kubernetes/kubernetes#77623

* chore: update ip-masq-agent version to v2.3.0

See kubernetes/kubernetes#77834

* chore: re-enable k8s 1.13.5 for Azure Stack support
mboersma added a commit to mboersma/aks-engine that referenced this pull request Jul 24, 2019
* feat: add support for Kubernetes 1.14.4

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#changelog-since-v1143

* chore: update ip-masq-agent version to v2.3.0

See kubernetes/kubernetes#77834

* chore: re-enable k8s 1.14.1 for Azure Stack support
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. 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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants