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

Add support for s390x #5614

Merged
merged 2 commits into from
May 30, 2020
Merged

Add support for s390x #5614

merged 2 commits into from
May 30, 2020

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented May 28, 2020 •
edited
Loading

What this PR does / why we need it:

  • multi-arch image
  • Support for s390x (experimental)
  • removal of luarocks
  • removal of lua modules lrexlib and iputils.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 28, 2020
@aledbf
Copy link
Member Author

aledbf commented May 28, 2020

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf

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 May 28, 2020
ElvinEfendi
ElvinEfendi reviewed May 28, 2020
View reviewed changes
images/nginx/rootfs/build.sh Outdated
@@ -364,8 +368,9 @@ make install

# build modsecurity library
cd "$BUILD_PATH"
git clone https://github.com/SpiderLabs/ModSecurity
git clone --depth=100 https://github.com/SpiderLabs/ModSecurity
Copy link
Member

Choose a reason for hiding this comment

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

why depth 100?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because we are not using a tag, the commit we have now is ~67 behind master and we cannot use the last commit because of a refactor the module is having.
The reason of the depth is to speed up the build for arm,arm64, and s390x.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 29, 2020
@aledbf
Copy link
Member Author

aledbf commented May 29, 2020

The build is passing. Image
quay.io/kubernetes-ingress-controller/nginx:6060e8afd00dc5aac7c51e3c53de26fe9a1497d0

Before merging I will open a PR to use this new image and wait to pass e2e tests

@aledbf
Copy link
Member Author

aledbf commented May 30, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 30, 2020
@aledbf aledbf merged commit 6c633ee into kubernetes:master May 30, 2020
@aledbf aledbf deleted the s390x branch May 30, 2020 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ElvinEfendi ElvinEfendi ElvinEfendi left review comments

@cmluciano cmluciano Awaiting requested review from cmluciano

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@aledbf @k8s-ci-robot @ElvinEfendi