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

disable lua for arch s390x and ppc64le #2333

Merged
merged 1 commit into from
Apr 12, 2018

Conversation

oilbeater
Copy link
Contributor

What this PR does / why we need it:
LuaJIT is not available for s390x and ppc64le, disable the lua part in nginx.tmpl on these platform.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #2295

Special notes for your reviewer:

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 11, 2018
@codecov-io
Copy link

codecov-io commented Apr 11, 2018

Codecov Report

Merging #2333 into master will increase coverage by <.01%.
The diff coverage is 25%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2333      +/-   ##
==========================================
+ Coverage    37.8%   37.81%   +<.01%     
==========================================
  Files          72       72              
  Lines        5140     5144       +4     
==========================================
+ Hits         1943     1945       +2     
- Misses       2900     2902       +2     
  Partials      297      297
Impacted Files Coverage Δ
internal/ingress/controller/controller.go 0% <ø> (ø) ⬆️
internal/ingress/controller/config/config.go 98.18% <ø> (ø) ⬆️
internal/file/bindata.go 55.78% <ø> (ø) ⬆️
internal/ingress/controller/nginx.go 5.09% <0%> (-0.02%) ⬇️
cmd/nginx/flags.go 81.25% <28.57%> (-0.32%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 17f6996...1be1f65. Read the comment docs.

@oilbeater
Copy link
Contributor Author

/assign @aledbf @ElvinEfendi

@k8s-ci-robot
Copy link
Contributor

@oilbeater: GitHub didn't allow me to assign the following users: ElvinEfendi.

Note that only kubernetes members and repo collaborators can be assigned.

In response to this:

/assign @aledbf @ElvinEfendi

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.

@@ -201,6 +201,16 @@ func parseFlags() (bool, *controller.Configuration, error) {
glog.Warningf("Disabling dynamic configuration feature (LuaJIT is not available in s390x and ppc64le)")
}

// LuaJIT is not available on arch s390x and ppc64le
Copy link
Member

Choose a reason for hiding this comment

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

this makes the logic above obsolete now, right? can you delete it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh right, i will remove it

LuaJIT is not available for s390x and ppc64le, disable the lua part in nginx.tmpl on these platform.
@aledbf
Copy link
Member

aledbf commented Apr 12, 2018

/approve

@aledbf
Copy link
Member

aledbf commented Apr 12, 2018

@oilbeater thanks!

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 12, 2018
@aledbf
Copy link
Member

aledbf commented Apr 12, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 12, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aledbf, oilbeater

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 merged commit 353c631 into kubernetes:master Apr 12, 2018
@gyliu513
Copy link
Contributor

@aledbf @oilbeater can you please help merge this to 0.12.0 as well?

@aledbf
Copy link
Member

aledbf commented Apr 12, 2018

can you please help merge this to 0.12.0 as well?

We cannot do that. Tomorrow we are going to release 0.13 where the fix will be included.

@oilbeater oilbeater deleted the fix/disable-lua branch April 17, 2018 14:44
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. 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.12.0 image not working on s390x
6 participants