From 6afc1643d97edb369efe819e6d7da8a08f89164a Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 3 May 2020 23:18:47 -0700 Subject: [PATCH] Update nginx-ingress from v0.30.0 to v0.32.0 * Add support for IngressClass and RBAC authorization * Since our nginx ingress controller example uses the flag `--ingress-class=public`, add an IngressClass to go along with it Rel: https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class --- CHANGES.md | 2 ++ addons/nginx-ingress/aws/class.yaml | 6 ++++++ addons/nginx-ingress/aws/deployment.yaml | 2 +- addons/nginx-ingress/aws/rbac/cluster-role.yaml | 9 +++++++++ addons/nginx-ingress/azure/class.yaml | 6 ++++++ addons/nginx-ingress/azure/deployment.yaml | 2 +- addons/nginx-ingress/azure/rbac/cluster-role.yaml | 9 +++++++++ addons/nginx-ingress/bare-metal/class.yaml | 6 ++++++ addons/nginx-ingress/bare-metal/deployment.yaml | 2 +- addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml | 9 +++++++++ addons/nginx-ingress/digital-ocean/class.yaml | 6 ++++++ addons/nginx-ingress/digital-ocean/daemonset.yaml | 2 +- .../nginx-ingress/digital-ocean/rbac/cluster-role.yaml | 9 +++++++++ addons/nginx-ingress/google-cloud/class.yaml | 6 ++++++ addons/nginx-ingress/google-cloud/deployment.yaml | 2 +- addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml | 9 +++++++++ 16 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 addons/nginx-ingress/aws/class.yaml create mode 100644 addons/nginx-ingress/azure/class.yaml create mode 100644 addons/nginx-ingress/bare-metal/class.yaml create mode 100644 addons/nginx-ingress/digital-ocean/class.yaml create mode 100644 addons/nginx-ingress/google-cloud/class.yaml diff --git a/CHANGES.md b/CHANGES.md index dd6f52d1..175a0fe5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,8 @@ Notable changes between versions. #### Addons +* Update nginx-ingress from v0.30.0 to [v0.32.0](https://github.com/kubernetes/ingress-nginx/releases/tag/nginx-0.32.0) + * Add support for [IngressClass](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class) * Update Prometheus from v2.17.1 to v2.18.0-rc.1 * Update Grafana from v6.7.2 to v7.0.0-beta1 diff --git a/addons/nginx-ingress/aws/class.yaml b/addons/nginx-ingress/aws/class.yaml new file mode 100644 index 00000000..bbc8015c --- /dev/null +++ b/addons/nginx-ingress/aws/class.yaml @@ -0,0 +1,6 @@ +apiVersion: networking.k8s.io/v1beta1 +kind: IngressClass +metadata: + name: public +spec: + controller: k8s.io/ingress-nginx diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index 56b74e88..3f3b2fe4 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 args: - /nginx-ingress-controller - --ingress-class=public diff --git a/addons/nginx-ingress/aws/rbac/cluster-role.yaml b/addons/nginx-ingress/aws/rbac/cluster-role.yaml index 5682d397..90edbeb1 100644 --- a/addons/nginx-ingress/aws/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/aws/rbac/cluster-role.yaml @@ -51,3 +51,12 @@ rules: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingressclasses + verbs: + - get + - list + - watch + diff --git a/addons/nginx-ingress/azure/class.yaml b/addons/nginx-ingress/azure/class.yaml new file mode 100644 index 00000000..bbc8015c --- /dev/null +++ b/addons/nginx-ingress/azure/class.yaml @@ -0,0 +1,6 @@ +apiVersion: networking.k8s.io/v1beta1 +kind: IngressClass +metadata: + name: public +spec: + controller: k8s.io/ingress-nginx diff --git a/addons/nginx-ingress/azure/deployment.yaml b/addons/nginx-ingress/azure/deployment.yaml index 56b74e88..3f3b2fe4 100644 --- a/addons/nginx-ingress/azure/deployment.yaml +++ b/addons/nginx-ingress/azure/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 args: - /nginx-ingress-controller - --ingress-class=public diff --git a/addons/nginx-ingress/azure/rbac/cluster-role.yaml b/addons/nginx-ingress/azure/rbac/cluster-role.yaml index 5682d397..90edbeb1 100644 --- a/addons/nginx-ingress/azure/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/azure/rbac/cluster-role.yaml @@ -51,3 +51,12 @@ rules: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingressclasses + verbs: + - get + - list + - watch + diff --git a/addons/nginx-ingress/bare-metal/class.yaml b/addons/nginx-ingress/bare-metal/class.yaml new file mode 100644 index 00000000..bbc8015c --- /dev/null +++ b/addons/nginx-ingress/bare-metal/class.yaml @@ -0,0 +1,6 @@ +apiVersion: networking.k8s.io/v1beta1 +kind: IngressClass +metadata: + name: public +spec: + controller: k8s.io/ingress-nginx diff --git a/addons/nginx-ingress/bare-metal/deployment.yaml b/addons/nginx-ingress/bare-metal/deployment.yaml index ac86bd5f..5cabf818 100644 --- a/addons/nginx-ingress/bare-metal/deployment.yaml +++ b/addons/nginx-ingress/bare-metal/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 args: - /nginx-ingress-controller - --ingress-class=public diff --git a/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml b/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml index 5682d397..90edbeb1 100644 --- a/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml @@ -51,3 +51,12 @@ rules: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingressclasses + verbs: + - get + - list + - watch + diff --git a/addons/nginx-ingress/digital-ocean/class.yaml b/addons/nginx-ingress/digital-ocean/class.yaml new file mode 100644 index 00000000..bbc8015c --- /dev/null +++ b/addons/nginx-ingress/digital-ocean/class.yaml @@ -0,0 +1,6 @@ +apiVersion: networking.k8s.io/v1beta1 +kind: IngressClass +metadata: + name: public +spec: + controller: k8s.io/ingress-nginx diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 1bf474d6..4edd51b0 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 args: - /nginx-ingress-controller - --ingress-class=public diff --git a/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml b/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml index 5682d397..90edbeb1 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml @@ -51,3 +51,12 @@ rules: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingressclasses + verbs: + - get + - list + - watch + diff --git a/addons/nginx-ingress/google-cloud/class.yaml b/addons/nginx-ingress/google-cloud/class.yaml new file mode 100644 index 00000000..bbc8015c --- /dev/null +++ b/addons/nginx-ingress/google-cloud/class.yaml @@ -0,0 +1,6 @@ +apiVersion: networking.k8s.io/v1beta1 +kind: IngressClass +metadata: + name: public +spec: + controller: k8s.io/ingress-nginx diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index 56b74e88..3f3b2fe4 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -22,7 +22,7 @@ spec: spec: containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 args: - /nginx-ingress-controller - --ingress-class=public diff --git a/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml b/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml index 5682d397..90edbeb1 100644 --- a/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml @@ -51,3 +51,12 @@ rules: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingressclasses + verbs: + - get + - list + - watch +