Images: Remove NGINX v1.21.

[Gacko]

What this PR does / why we need it:

This PR removes the old NGINX v1.21 image. Controller versions using this image are already no longer supported. I therefore renamed the images/nginx-1.25 directory to images/nginx. A change in the kubernetes/test-infra repo is required before merging this PR.

/triage accepted
/kind cleanup
/priority backlog
/cc @strongjz @rikatz @cpanato @tao12345666333
/hold

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

Checklist:

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

[netlify]

✅ Deploy Preview for kubernetes-ingress-nginx canceled.

Name	Link
🔨 Latest commit	f33c14a
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/66fba36ca9076d000822c57f

[Gacko]

/cherry-pick release-1.10

[k8s-infra-cherrypick-robot]

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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.

[Gacko]

/cherry-pick release-1.11

[k8s-infra-cherrypick-robot]

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11

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.

[cpanato]

/lgtm

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, Gacko

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 [Gacko,cpanato]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[Gacko]

/unhold

[k8s-infra-cherrypick-robot]

@Gacko: #12031 failed to apply on top of branch "release-1.10":

Applying: Images: Remove NGINX v1.21.
.git/rebase-apply/patch:1136: trailing whitespace.
    
.git/rebase-apply/patch:1140: trailing whitespace.
    
.git/rebase-apply/patch:1144: trailing whitespace.
   
.git/rebase-apply/patch:1151: trailing whitespace.
    
.git/rebase-apply/patch:1152: trailing whitespace.
    [Overview of SSL libraries(HAProxy Documentation)](https://github.com/haproxy/wiki/wiki/SSL-Libraries-Support-Status#tldr)  
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yaml
M	.github/workflows/images.yaml
M	images/nginx-1.25/rootfs/build.sh
M	images/nginx/rootfs/build.sh
Falling back to patching base and 3-way merge...
Removing images/nginx/rootfs/patches/nginx-1.21.4-upstream_timeout_fields.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-upstream_pipelining.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-stream_ssl_preread_no_skip.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-stream_proxy_get_next_upstream_tries.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-ssl_sess_cb_yield.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-ssl_cert_cb_yield.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-socket_cloexec.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-single_process_graceful_exit.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-reuseport_close_unused_fds.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-resolver_conf_parsing.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-proxy_host_port_vars.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-no_Werror.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-larger_max_error_str.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-init_cycle_pool_release.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-http2.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-hash_overflow.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-delayed_posted_events.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-cache_manager_exit.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-balancer_status_code.patch
Removing images/nginx/rootfs/patches/drop-alias-root.patch
Auto-merging images/nginx/rootfs/build.sh
CONFLICT (content): Merge conflict in images/nginx/rootfs/build.sh
CONFLICT (modify/delete): images/nginx-1.25/rootfs/build.sh deleted in Images: Remove NGINX v1.21. and modified in HEAD. Version HEAD of images/nginx-1.25/rootfs/build.sh left in tree.
Removing images/nginx-1.25/rootfs/Dockerfile
Removing images/nginx-1.25/cloudbuild.yaml
Removing images/nginx-1.25/TAG
Removing images/nginx-1.25/README.md
Removing images/nginx-1.25/Makefile
Auto-merging .github/workflows/images.yaml
CONFLICT (content): Merge conflict in .github/workflows/images.yaml
Auto-merging .github/workflows/ci.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Images: Remove NGINX v1.21.
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.10

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-infra-cherrypick-robot]

@Gacko: #12031 failed to apply on top of branch "release-1.11":

Applying: Images: Remove NGINX v1.21.
.git/rebase-apply/patch:1136: trailing whitespace.
    
.git/rebase-apply/patch:1140: trailing whitespace.
    
.git/rebase-apply/patch:1144: trailing whitespace.
   
.git/rebase-apply/patch:1151: trailing whitespace.
    
.git/rebase-apply/patch:1152: trailing whitespace.
    [Overview of SSL libraries(HAProxy Documentation)](https://github.com/haproxy/wiki/wiki/SSL-Libraries-Support-Status#tldr)  
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yaml
M	.github/workflows/images.yaml
M	images/nginx-1.25/rootfs/build.sh
M	images/nginx/rootfs/build.sh
Falling back to patching base and 3-way merge...
Removing images/nginx/rootfs/patches/nginx-1.21.4-upstream_timeout_fields.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-upstream_pipelining.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-stream_ssl_preread_no_skip.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-stream_proxy_get_next_upstream_tries.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-ssl_sess_cb_yield.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-ssl_cert_cb_yield.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-socket_cloexec.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-single_process_graceful_exit.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-reuseport_close_unused_fds.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-resolver_conf_parsing.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-proxy_host_port_vars.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-no_Werror.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-larger_max_error_str.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-init_cycle_pool_release.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-http2.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-hash_overflow.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-delayed_posted_events.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-cache_manager_exit.patch
Removing images/nginx/rootfs/patches/nginx-1.21.4-balancer_status_code.patch
Removing images/nginx/rootfs/patches/drop-alias-root.patch
Auto-merging images/nginx/rootfs/build.sh
CONFLICT (content): Merge conflict in images/nginx/rootfs/build.sh
CONFLICT (modify/delete): images/nginx-1.25/rootfs/build.sh deleted in Images: Remove NGINX v1.21. and modified in HEAD. Version HEAD of images/nginx-1.25/rootfs/build.sh left in tree.
Removing images/nginx-1.25/rootfs/Dockerfile
Removing images/nginx-1.25/cloudbuild.yaml
Removing images/nginx-1.25/TAG
Removing images/nginx-1.25/README.md
Removing images/nginx-1.25/Makefile
Auto-merging .github/workflows/images.yaml
CONFLICT (content): Merge conflict in .github/workflows/images.yaml
Auto-merging .github/workflows/ci.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Images: Remove NGINX v1.21.
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.11

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.

[rikatz]

Why cherry pick? This should be part of next release, and not the current one

[Gacko]

There's only one job in kubernetes/test-infra to trigger builds and we are building and pushing the NGINX base image from main anyway. So in the end jobs would fail on either main if we do not remove the nginx-1.25 one or not build on release-1.xx because NGINX v1.25 would still be nginx-1.25 there.

In the end it's mostly to have the diff small and the branches comparable. I really just moved nginx-1.25 to nginx and made CI use the new directory. So image-wise there is no change.