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(*): #19883

Closed
wants to merge 1 commit into from
Closed

bump(*): #19883

wants to merge 1 commit into from

Conversation

adambkaplan
Copy link
Contributor

  • Pin s2i to release-3.10 to exclude --as-dockerfile feature
  • Merge in fix to check assemble-user against allowed UIDS

Bug 1582976
Addresses CVE-2018-10843

* Pin s2i to release-3.10 to exclude `--as-dockerfile` feature
* Merge in fix to check assemble-user against allowed UIDS

Bug 1582976
Addresses CVE-2018-10843
@openshift-ci-robot openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label May 30, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: adambkaplan
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: eparis

Assign the PR to them by writing /assign @eparis in a comment when ready.

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

@adambkaplan
Copy link
Contributor Author

/assign @deads2k
/cc @bparees @liggitt

@@ -47,6 +47,8 @@ import:
version: master
- package: github.com/openshift/service-serving-cert-signer
version: release-3.10
- package: github.com/openshift/source-to-image
version: release-3.10
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Pin here is to exclude the --as-dockerfile feature @bparees recently added. This is still experimental and we don't want this in Origin until 3.11

if cpuQuotaPerSecUSec%10000 != 0 {
cpuQuotaPerSecUSec = ((cpuQuotaPerSecUSec / 10000) + 1) * 10000
}
cpuQuotaPerSecUSec := uint64(c.Resources.CpuQuota*1000000) / c.Resources.CpuPeriod
Copy link
Contributor

Choose a reason for hiding this comment

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

This appears to be another unregistered fork.

@deads2k
Copy link
Contributor

deads2k commented May 30, 2018

/hold

We can't merge this until we fix the runc fork introduced by #19826

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 30, 2018
@openshift-ci-robot
Copy link

@adambkaplan: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/gcp 153a8ff link /test gcp
ci/openshift-jenkins/extended_builds 153a8ff link /test extended_builds
ci/openshift-jenkins/extended_image_ecosystem 153a8ff link /test extended_image_ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@adambkaplan
Copy link
Contributor Author

Duplicates #19888

@adambkaplan adambkaplan deleted the bugfix/s2i-pin branch May 31, 2018 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants