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

Deprecate and remove AJP support #10158

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Conversation

rikatz
Copy link
Contributor

@rikatz rikatz commented Jun 30, 2023

What this PR does / why we need it:

Deprecate AJP as a valid backend protocol

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

fixes: #10098

@rikatz rikatz added the kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. label Jun 30, 2023
@netlify
Copy link

netlify bot commented Jun 30, 2023

Deploy Preview for kubernetes-ingress-nginx ready!

Name Link
🔨 Latest commit 93458ec
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/649f30d1dfc4e10008c5ecf9
😎 Deploy Preview https://deploy-preview-10158--kubernetes-ingress-nginx.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 30, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 30, 2023
@k8s-ci-robot k8s-ci-robot added area/docs approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 30, 2023
@rikatz
Copy link
Contributor Author

rikatz commented Jun 30, 2023

/hold
We are in the middle of a release, let's not merge this

@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 Jun 30, 2023
@rikatz
Copy link
Contributor Author

rikatz commented Jun 30, 2023

/hold cancel

@rikatz rikatz closed this Jun 30, 2023
@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 Jun 30, 2023
@rikatz rikatz reopened this Jun 30, 2023
Copy link
Member

@tao12345666333 tao12345666333 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 Jul 2, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, tao12345666333

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:
  • OWNERS [rikatz,tao12345666333]

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 ebb6314 into kubernetes:main Jul 2, 2023
60 checks passed
@strongjz
Copy link
Member

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot
Copy link
Contributor

@strongjz: #10158 failed to apply on top of branch "release-1.9":

Applying: Deprecate and remove AJP support
Using index info to reconstruct a base tree...
M	docs/e2e-tests.md
M	docs/user-guide/nginx-configuration/annotations.md
M	images/nginx/rootfs/build.sh
M	internal/ingress/annotations/backendprotocol/main.go
M	internal/ingress/controller/template/template.go
M	internal/ingress/controller/template/template_test.go
M	rootfs/etc/nginx/template/nginx.tmpl
M	test/e2e/annotations/backendprotocol.go
Falling back to patching base and 3-way merge...
Auto-merging rootfs/etc/nginx/template/nginx.tmpl
Auto-merging internal/ingress/controller/template/template_test.go
Auto-merging internal/ingress/controller/template/template.go
Auto-merging docs/e2e-tests.md
CONFLICT (content): Merge conflict in docs/e2e-tests.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate and remove AJP support
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.9

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.

rawlingsj added a commit to wolfi-dev/os that referenced this pull request Sep 21, 2023
…racing-cpp, aeger-client-cpp and nginx_ajp_module

The following projects have been deprecated so removing from wolfi and from being used in ingress-nginx-controller.

https://github.com/opentracing/opentracing-cpp
https://github.com/jaegertracing/jaeger-client-cpp

AJP support has been deprecated from the upstream ingress controller project kubernetes/ingress-nginx#10158

Signed-off-by: James Rawlings <[email protected]>
rawlingsj added a commit to wolfi-dev/os that referenced this pull request Sep 21, 2023
…racing-cpp, aeger-client-cpp and nginx_ajp_module

The following projects have been deprecated so removing from wolfi and from being used in ingress-nginx-controller.

https://github.com/opentracing/opentracing-cpp
https://github.com/jaegertracing/jaeger-client-cpp

AJP support has been deprecated from the upstream ingress controller project kubernetes/ingress-nginx#10158

Signed-off-by: James Rawlings <[email protected]>
bromine0x23 added a commit to bromine0x23/ingress-nginx that referenced this pull request Dec 10, 2023
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. area/docs cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. 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.

Proposal - Deprecate AJP support
5 participants