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

Update nginx image to use openresty master #4780

Merged
merged 1 commit into from
Nov 27, 2019

Conversation

aledbf
Copy link
Member

@aledbf aledbf commented Nov 26, 2019

What this PR does / why we need it:

Updates openresty to 1.17.4 (current master) and nginx-opentracing modules

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

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 26, 2019
Copy link
Contributor

@cmluciano cmluciano left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@9f72cb3). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #4780   +/-   ##
=========================================
  Coverage          ?   58.54%           
=========================================
  Files             ?       88           
  Lines             ?     6702           
  Branches          ?        0           
=========================================
  Hits              ?     3924           
  Misses            ?     2352           
  Partials          ?      426

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 9f72cb3...d8ac82d. Read the comment docs.

@k8s-ci-robot k8s-ci-robot merged commit d523b4a into kubernetes:master Nov 27, 2019
@@ -441,6 +442,10 @@ WITH_MODULES="--add-module=$BUILD_PATH/nginx-http-auth-digest-$NGINX_DIGEST_AUTH
--add-module=$BUILD_PATH/nginx_ajp_module-${NGINX_AJP_VERSION} \
--add-module=$BUILD_PATH/ngx_brotli"

make

cd openresty-1.17.4.1rc0
Copy link
Member

@ElvinEfendi ElvinEfendi Dec 3, 2019

Choose a reason for hiding this comment

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

you could do cd "$BUILD_PATH/openresty-$OPENRESTY_VERSION", except you changed version to sha. Should we maybe introduce another variable for version?

@@ -441,6 +442,10 @@ WITH_MODULES="--add-module=$BUILD_PATH/nginx-http-auth-digest-$NGINX_DIGEST_AUTH
--add-module=$BUILD_PATH/nginx_ajp_module-${NGINX_AJP_VERSION} \
--add-module=$BUILD_PATH/ngx_brotli"

make
Copy link
Member

Choose a reason for hiding this comment

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

Why do you need this make now?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is temporal. It will be removed after the next release of openresty

@ElvinEfendi
Copy link
Member

This probably broke https://github.com/kubernetes/ingress-nginx/pull/4780/files#diff-4a5113d28634e29f2ab0bca34da7a3e5R383.

--

Also why are we using latest master and not waiting for stable release?

@aledbf
Copy link
Member Author

aledbf commented Dec 3, 2019

Also why are we using latest master and not waiting for stable release?

Because it's being more than three months since the last release. Just in case I am not planning in releasing a new version without a stable release from openresty

@aledbf aledbf deleted the openresty-master branch December 9, 2019 23:59
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants