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

NGINX: Add nginx-go-crossplane rendering. #11975

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

NGINX: Add nginx-go-crossplane rendering. #11975

wants to merge 17 commits into from

Conversation

rikatz
Copy link
Contributor

@rikatz rikatz commented Sep 15, 2024

What this PR does / why we need it:

This is the Xnd part of moving to use nginx go crossplane. Now adding mirrors, custom error, initial server bootstrap, etc
Also stream and mod_security are removed from here.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 15, 2024
@rikatz rikatz requested a review from MrErlison September 15, 2024 22:23
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 15, 2024
@rikatz rikatz force-pushed the more-crossplane branch 5 times, most recently from 2479b96 to 8ec5d8f Compare September 29, 2024 22:54
@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. area/docs area/helm Issues or PRs related to helm charts needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 29, 2024
@rikatz rikatz changed the base branch from feature-go-crossplane to main September 29, 2024 22:58
@k8s-ci-robot k8s-ci-robot removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 29, 2024
@netlify Netlify
Copy link

netlify bot commented Sep 29, 2024 •
edited
Loading

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit f64c255
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/67842145f2c6b9000802c95a

@rikatz rikatz changed the title Bootstrap server configs and a bunch of other configs Use nginx-go-crossplane on template rendering Sep 29, 2024
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 1, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 3, 2024
MrErlison and others added 15 commits January 12, 2025 19:57
@MrErlison @rikatz
Fix move nested if statement (kubernetes#11688)
c8328ff
@MrErlison @rikatz
Add tests for tags with custom values (kubernetes#11686)
69a3a4d 
* Add tests for tags with custom values

* Fix typo in comments
@rikatz
Add brotli module parser (kubernetes#11690)
c39de84
@rikatz
Add upstream directives and some others (kubernetes#11681)
abb87ca
@MrErlison @rikatz
Add CustomHTTPErrors directive (kubernetes#11699)
1ef5295 
* Add CustomHTTPErrors directive

* Fix: Add missing '=' in error_page directive
@rikatz
Continue go crossplane (kubernetes#11964)
6c45750
@rikatz
Bootstrap server configs and a bunch of other configs
8bfe364
@rikatz
Remove temporary templates
b447997
@rikatz
Add crossplane flag and e2e test
f6a110a
@rikatz
Add setmisc 3rd party module
ad70bb1
@rikatz
Fix helm docs and fakeTemplate
d6cc3fd
@rikatz
Fix lint, extra module, test assertions
65c047c
@rikatz
Fix test assertion
bc232c3
@rikatz
Fix golang-lint findings
a2b5bea
@rikatz
Add missing directives
f64c255
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rikatz
Once this PR has been reviewed and has the lgtm label, please assign cpanato for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 12, 2025
@rikatz
Copy link
Contributor Author

rikatz commented Jan 13, 2025

@strongjz as we have discussed

/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 Jan 13, 2025
@Gacko
Copy link
Member

Gacko commented Jan 13, 2025

/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 Jan 13, 2025
@Gacko
Copy link
Member

Gacko commented Jan 13, 2025

There are still changes in this PR not related to its purpose. As we first want to get other PRs merged (adding NJS to the NGINX base image and migrating some Lua their) and probably a patch release out (for the reason you probably discussed with James about), I couldn't review this one in detail and remove the unrelated changes (go.work.sum, additional flag in Helm chart not require as there already is a generic way to add parameters, changes in the go.sum of kube-webhook-certgen and others), yet.

@rikatz
Copy link
Contributor Author

rikatz commented Jan 13, 2025

@Gacko instead of changing others PRs, please point what you want to change.

Also I've been waiting for some long time now, you keep saying about the unrelated changes without pointing, so go ahead and do a review with the changes you want me to do.

Thanks

strongjz
strongjz reviewed Jan 13, 2025
View reviewed changes
images/kube-webhook-certgen/rootfs/go.mod
@@ -14,7 +14,7 @@ require (

require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
Copy link
Member

@strongjz strongjz Jan 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

not needed.

strongjz
strongjz reviewed Jan 13, 2025
View reviewed changes
internal/ingress/annotations/annotations_test.go
@@ -133,7 +133,6 @@ func TestSSLPassthrough(t *testing.T) {
ec := NewAnnotationExtractor(mockCfg{})
ing := buildIngress()

Copy link
Member

Choose a reason for hiding this comment

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

I'm guessing tests were failing?

strongjz
strongjz reviewed Jan 13, 2025
View reviewed changes
test/e2e-image/e2e.sh
@@ -24,7 +24,7 @@ E2E_CHECK_LEAKS=${E2E_CHECK_LEAKS:-""}

reportFile="report-e2e-test-suite.xml"
ginkgo_args=(
"--fail-fast"
# "--fail-fast"
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 we not want fail fail?

@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@strongjz strongjz strongjz left review comments

@Gacko Gacko Gacko requested changes

@MrErlison MrErlison Awaiting requested review from MrErlison

@puerco puerco Awaiting requested review from puerco

Assignees
No one assigned
Labels
area/docs area/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. kind/feature Categorizes issue or PR as related to a new feature. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. priority/backlog Higher priority than priority/awaiting-more-evidence. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rikatz @Gacko @k8s-ci-robot @strongjz @MrErlison