From 40640f369793b1cc1ec86dec85439b696ecdb63f Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Mon, 8 Jul 2019 22:04:50 -0700 Subject: [PATCH] Upgrade nginx-ingress from v0.24.1 to v0.25.0 * Support networking.k8s.io/v1beta1 apiVersion * Update RBAC cluster-role for networking.k8s.io/v1beta1 * https://github.com/kubernetes/ingress-nginx/releases/tag/nginx-0.25.0 --- CHANGES.md | 2 ++ addons/nginx-ingress/aws/deployment.yaml | 2 +- .../nginx-ingress/aws/rbac/cluster-role.yaml | 28 ++++++++++++++----- addons/nginx-ingress/azure/deployment.yaml | 2 +- .../azure/rbac/cluster-role.yaml | 28 ++++++++++++++----- .../nginx-ingress/bare-metal/deployment.yaml | 2 +- .../bare-metal/rbac/cluster-role.yaml | 28 ++++++++++++++----- .../digital-ocean/daemonset.yaml | 2 +- .../digital-ocean/rbac/cluster-role.yaml | 28 ++++++++++++++----- .../google-cloud/deployment.yaml | 2 +- .../google-cloud/rbac/cluster-role.yaml | 28 ++++++++++++++----- 11 files changed, 112 insertions(+), 40 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 03ee8021..2b6eb0c1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,8 @@ Notable changes between versions. * Update Prometheus from v2.10.0 to v2.11.0-rc.0 * Update Grafana from v6.2.4 to v6.2.5 +* Update nginx-ingress from v0.24.1 to v0.25.0 + * Support `networking.k8s.io/v1beta1` apiVersion ## v1.15.0 diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index e283c76d..fdb9cc31 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -24,7 +24,7 @@ spec: node-role.kubernetes.io/node: "" containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.24.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.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 9fee9fde..bf680e19 100644 --- a/addons/nginx-ingress/aws/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/aws/rbac/cluster-role.yaml @@ -28,6 +28,13 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch - apiGroups: - "extensions" resources: @@ -36,16 +43,23 @@ rules: - get - list - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - apiGroups: - "extensions" resources: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses/status + verbs: + - update diff --git a/addons/nginx-ingress/azure/deployment.yaml b/addons/nginx-ingress/azure/deployment.yaml index e283c76d..fdb9cc31 100644 --- a/addons/nginx-ingress/azure/deployment.yaml +++ b/addons/nginx-ingress/azure/deployment.yaml @@ -24,7 +24,7 @@ spec: node-role.kubernetes.io/node: "" containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.24.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.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 9fee9fde..bf680e19 100644 --- a/addons/nginx-ingress/azure/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/azure/rbac/cluster-role.yaml @@ -28,6 +28,13 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch - apiGroups: - "extensions" resources: @@ -36,16 +43,23 @@ rules: - get - list - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - apiGroups: - "extensions" resources: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses/status + verbs: + - update diff --git a/addons/nginx-ingress/bare-metal/deployment.yaml b/addons/nginx-ingress/bare-metal/deployment.yaml index 2048180c..d45bbc26 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.24.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.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 9fee9fde..bf680e19 100644 --- a/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/bare-metal/rbac/cluster-role.yaml @@ -28,6 +28,13 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch - apiGroups: - "extensions" resources: @@ -36,16 +43,23 @@ rules: - get - list - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - apiGroups: - "extensions" resources: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses/status + verbs: + - update diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 11990ad8..ab43187e 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -24,7 +24,7 @@ spec: node-role.kubernetes.io/node: "" containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.24.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.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 9fee9fde..bf680e19 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml @@ -28,6 +28,13 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch - apiGroups: - "extensions" resources: @@ -36,16 +43,23 @@ rules: - get - list - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - apiGroups: - "extensions" resources: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses/status + verbs: + - update diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index e283c76d..fdb9cc31 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -24,7 +24,7 @@ spec: node-role.kubernetes.io/node: "" containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.24.1 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.25.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 9fee9fde..bf680e19 100644 --- a/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml @@ -28,6 +28,13 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch - apiGroups: - "extensions" resources: @@ -36,16 +43,23 @@ rules: - get - list - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - apiGroups: - "extensions" resources: - ingresses/status verbs: - update + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses + verbs: + - get + - list + - watch + - apiGroups: + - "networking.k8s.io" + resources: + - ingresses/status + verbs: + - update