Skip to content

Commit

Permalink
Update to ingress-nginx v1.8.1 (#89)
Browse files Browse the repository at this point in the history 
* Move to latest nginx version

* updated nginx permissions to include endpoint slices

* fixture updates

* add new nginx role/binding

* remove unneeded comments

* add get/pod permission in app-routing-system namespace

* add additional role permisson needed during upgrade of nginx

* pr feedback

---------

Co-authored-by: Oliver King <[email protected]>
  • Loading branch information
@gambtho @OliverMKing
gambtho and OliverMKing authored Aug 31, 2023
1 parent b4375a4 commit 4ef34bd
Show file tree
Hide file tree
Showing 7 changed files with 1,271 additions and 97 deletions.
257 changes: 240 additions & 17 deletions pkg/manifests/fixtures/nginx/full.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,55 @@
"rules": [
{
"verbs": [
"get",
"watch",
"list"
"list",
"watch"
],
"apiGroups": [
""
],
"resources": [
"configmaps",
"endpoints",
"nodes",
"pods",
"services",
"secrets",
"configmaps"
"namespaces"
]
},
{
"verbs": [
"list",
"watch"
],
"apiGroups": [
"coordination.k8s.io"
],
"resources": [
"leases"
]
},
{
"verbs": [
"*"
"get"
],
"apiGroups": [
""
],
"resources": [
"configmaps",
"events"
"nodes"
]
},
{
"verbs": [
"get",
"list",
"watch"
],
"apiGroups": [
""
],
"resources": [
"services"
]
},
{
Expand All @@ -108,7 +132,19 @@
},
{
"verbs": [
"*"
"create",
"patch"
],
"apiGroups": [
""
],
"resources": [
"events"
]
},
{
"verbs": [
"update"
],
"apiGroups": [
"networking.k8s.io"
Expand All @@ -119,9 +155,9 @@
},
{
"verbs": [
"get",
"list",
"watch",
"get"
"watch"
],
"apiGroups": [
"networking.k8s.io"
Expand All @@ -132,34 +168,221 @@
},
{
"verbs": [
"list",
"watch",
"list"
"get"
],
"apiGroups": [
"discovery.k8s.io"
],
"resources": [
"endpointslices"
]
}
]
},
{
"kind": "ClusterRoleBinding",
"apiVersion": "rbac.authorization.k8s.io/v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"app.kubernetes.io/component": "ingress-controller",
"app.kubernetes.io/managed-by": "aks-app-routing-operator",
"app.kubernetes.io/name": "nginx"
},
"ownerReferences": [
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"name": "test-operator-deploy",
"uid": "test-operator-deploy-uid"
}
]
},
"subjects": [
{
"kind": "ServiceAccount",
"name": "nginx",
"namespace": "test-namespace"
}
],
"roleRef": {
"apiGroup": "rbac.authorization.k8s.io",
"kind": "ClusterRole",
"name": "nginx"
}
},
{
"kind": "Role",
"apiVersion": "rbac.authorization.k8s.io/v1",
"metadata": {
"name": "nginx",
"namespace": "test-namespace",
"creationTimestamp": null,
"labels": {
"app.kubernetes.io/component": "ingress-controller",
"app.kubernetes.io/managed-by": "aks-app-routing-operator",
"app.kubernetes.io/name": "nginx"
},
"ownerReferences": [
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"name": "test-operator-deploy",
"uid": "test-operator-deploy-uid"
}
]
},
"rules": [
{
"verbs": [
"get"
],
"apiGroups": [
""
],
"resources": [
"nodes"
"namespaces"
]
},
{
"verbs": [
"update"
],
"apiGroups": [
""
],
"resources": [
"configmaps"
]
},
{
"verbs": [
"*"
"get",
"list",
"watch"
],
"apiGroups": [
""
],
"resources": [
"configmaps",
"pods",
"secrets",
"endpoints"
]
},
{
"verbs": [
"get",
"list",
"watch"
],
"apiGroups": [
""
],
"resources": [
"services"
]
},
{
"verbs": [
"get",
"list",
"watch"
],
"apiGroups": [
"networking.k8s.io"
],
"resources": [
"ingresses"
]
},
{
"verbs": [
"update"
],
"apiGroups": [
"networking.k8s.io"
],
"resources": [
"ingresses/status"
]
},
{
"verbs": [
"get",
"list",
"watch"
],
"apiGroups": [
"networking.k8s.io"
],
"resources": [
"ingressclasses"
]
},
{
"verbs": [
"get",
"update"
],
"apiGroups": [
"coordination.k8s.io"
],
"resources": [
"leases"
],
"resourceNames": [
"nginx"
]
},
{
"verbs": [
"create"
],
"apiGroups": [
"coordination.k8s.io"
],
"resources": [
"leases"
]
},
{
"verbs": [
"create",
"patch"
],
"apiGroups": [
""
],
"resources": [
"events"
]
},
{
"verbs": [
"list",
"watch",
"get"
],
"apiGroups": [
"discovery.k8s.io"
],
"resources": [
"endpointslices"
]
}
]
},
{
"kind": "ClusterRoleBinding",
"kind": "RoleBinding",
"apiVersion": "rbac.authorization.k8s.io/v1",
"metadata": {
"name": "nginx",
"namespace": "test-namespace",
"creationTimestamp": null,
"labels": {
"app.kubernetes.io/component": "ingress-controller",
Expand All @@ -184,7 +407,7 @@
],
"roleRef": {
"apiGroup": "rbac.authorization.k8s.io",
"kind": "ClusterRole",
"kind": "Role",
"name": "nginx"
}
},
Expand Down Expand Up @@ -286,7 +509,7 @@
"containers": [
{
"name": "controller",
"image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.3.0",
"image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.8.1",
"args": [
"/nginx-ingress-controller",
"--ingress-class=webapprouting.kubernetes.azure.com",
Expand Down
Loading

0 comments on commit 4ef34bd

Please sign in to comment.