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

(IAC-483) Conditionally Patch ingress-nginx Config #202

Merged
merged 2 commits into from
Apr 4, 2022
Merged

(IAC-483) Conditionally Patch ingress-nginx Config #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a057a
conditionally patch ingress config
jarpat Mar 25, 2022
877ac52
Apply suggestions from code review
jarpat Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions roles/baseline/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ INGRESS_NGINX_CONFIG:

config:
use-forwarded-headers: "true"
allow-snippet-annotations: "true"
large-client-header-buffers: "4 32k"
annotation-value-word-blocklist: "load_module,lua_package,_by_lua,location,root,proxy_pass,serviceaccount,{,},\\"
tcp: {}
udp: {}
lifecycle:
Expand All @@ -65,6 +62,15 @@ INGRESS_NGINX_CONFIG:
command: ["/bin/sh", "-c", "sleep 5; /usr/local/nginx/sbin/nginx -c /etc/nginx/nginx.conf -s quit; while pgrep -x nginx; do sleep 1; done"]
terminationGracePeriodSeconds: 600

# Ingress-nginx - CVE-2021-25742 Mitigation
INGRESS_NGINX_CVE_2021_25742_PATCH:
controller:
config:
allow-snippet-annotations: "true"
large-client-header-buffers: "4 32k"
use-forwarded-headers: "true"
annotation-value-word-blocklist: "load_module,lua_package,_by_lua,location,root,proxy_pass,serviceaccount,{,},\\"

## Nfs-subdir-external-provisioner
NFS_CLIENT_NAME: nfs-subdir-external-provisioner
NFS_CLIENT_NAMESPACE: nfs-client
Expand Down
17 changes: 17 additions & 0 deletions roles/baseline/tasks/ingress-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,23 @@
- install
- update

- name: Apply Mitigation for CVE-2021-25742
block:
- name: Retreive K8s cluster information
community.kubernetes.k8s_cluster_info:
kubeconfig: "{{ KUBECONFIG }}"
register: cluster_info
- name: Update INGRESS_NGINX_CONFIG
set_fact:
INGRESS_NGINX_CONFIG: "{{ INGRESS_NGINX_CONFIG|combine(INGRESS_NGINX_CVE_2021_25742_PATCH, recursive=True)}}"
when:
- cluster_info.version.server.kubernetes.minor is version(ingressVersions.k8sMinorVersionFloor.value, 'ge')
- INGRESS_NGINX_CHART_VERSION is version('4.0.10', ">=") or
(INGRESS_NGINX_CHART_VERSION is version('3.40.0', ">=") and INGRESS_NGINX_CHART_VERSION is version('4.0.0', "<"))
tags:
- install
- update

- name: Deploy ingress-nginx
community.kubernetes.helm:
name: "{{ INGRESS_NGINX_NAME }}"
Expand Down