Skip to content

Commit

Permalink
Merge branch 'master' into new_flannel
Browse files Browse the repository at this point in the history
  • Loading branch information
micafer committed Feb 27, 2024
2 parents cb30ada + 1513904 commit 69969fe
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion files/ingress-nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,8 @@ metadata:
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
annotations:
ingressclass.kubernetes.io/is-default-class: "true"
spec:
controller: k8s.io/ingress-nginx
---
Expand Down Expand Up @@ -568,4 +570,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: ingress-nginx-admission
namespace: ingress-nginx
namespace: ingress-nginx

0 comments on commit 69969fe

Please sign in to comment.