diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml index b19b3f0..d9759ce 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml @@ -8,10 +8,10 @@ metadata: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml index 64dc66b..c311a87 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml @@ -3,15 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ingress-nginx-admission + name: ingress-nginx-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml index 4bf78ef..e710ffb 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook @@ -21,17 +21,17 @@ spec: metadata: name: ingress-nginx-admission-create labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook spec: containers: - name: create - image: "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20220916-gd32f8c343@sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f" + image: "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230407@sha256:543c40fd093964bc9ab509d3e791f9989963021f1e9e4c9c7b6700b02bfb227b" imagePullPolicy: IfNotPresent args: - create diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml index d26444b..0723236 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook @@ -21,17 +21,17 @@ spec: metadata: name: ingress-nginx-admission-patch labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook spec: containers: - name: patch - image: "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20220916-gd32f8c343@sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f" + image: "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v20230407@sha256:543c40fd093964bc9ab509d3e791f9989963021f1e9e4c9c7b6700b02bfb227b" imagePullPolicy: IfNotPresent args: - patch diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml index c73b90f..4d14b2c 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml @@ -3,16 +3,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ingress-nginx-admission + name: ingress-nginx-admission namespace: default annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml index d57d365..e06f2ff 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml index 1f9abfa..00d3ca3 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml @@ -9,10 +9,10 @@ metadata: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml index d7017c9..13003fd 100644 --- a/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml @@ -5,11 +5,12 @@ apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: + annotations: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: admission-webhook diff --git a/deploy/base/inflated/ingress-nginx/templates/clusterrole.yaml b/deploy/base/inflated/ingress-nginx/templates/clusterrole.yaml index 2dbf71f..de4c23b 100644 --- a/deploy/base/inflated/ingress-nginx/templates/clusterrole.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/clusterrole.yaml @@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm name: ingress-nginx diff --git a/deploy/base/inflated/ingress-nginx/templates/clusterrolebinding.yaml b/deploy/base/inflated/ingress-nginx/templates/clusterrolebinding.yaml index 37b9946..30fae28 100644 --- a/deploy/base/inflated/ingress-nginx/templates/clusterrolebinding.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/clusterrolebinding.yaml @@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm name: ingress-nginx diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-configmap.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-configmap.yaml index 46674ff..aeb9d1f 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-configmap.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-configmap.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ConfigMap metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-deployment.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-deployment.yaml index a77946f..c02c754 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-deployment.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-deployment.yaml @@ -4,10 +4,10 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -25,14 +25,18 @@ spec: template: metadata: labels: + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx + app.kubernetes.io/version: "1.8.1" + app.kubernetes.io/part-of: ingress-nginx + app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller spec: dnsPolicy: ClusterFirst containers: - name: controller - image: "registry.k8s.io/ingress-nginx/controller:v1.5.1@sha256:4ba73c697770664c1e00e9f968de14e08f606ff961c76e5d7033a4a9c593c629" + image: "registry.k8s.io/ingress-nginx/controller:v1.8.1@sha256:e5c4824e7375fcf2a393e1c03c293b69759af37a9ca6abdb91b13d78a93da8bd" imagePullPolicy: IfNotPresent lifecycle: preStop: diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-ingressclass.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-ingressclass.yaml index 47d1fdb..0cf9b2c 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-ingressclass.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-ingressclass.yaml @@ -6,10 +6,10 @@ apiVersion: networking.k8s.io/v1 kind: IngressClass metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-role.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-role.yaml index f0165fb..bef6975 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-role.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-role.yaml @@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller @@ -61,26 +61,6 @@ rules: - get - list - watch - # TODO(Jintao Zhang) - # Once we release a new version of the controller, - # we will be able to remove the configmap related permissions - # We have used the Lease API for selection - # ref: https://github.com/kubernetes/ingress-nginx/pull/8921 - - apiGroups: - - "" - resources: - - configmaps - resourceNames: - - ingress-nginx-leader - verbs: - - get - - update - - apiGroups: - - "" - resources: - - configmaps - verbs: - - create - apiGroups: - coordination.k8s.io resources: diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-rolebinding.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-rolebinding.yaml index 49363d5..1845079 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-rolebinding.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-rolebinding.yaml @@ -4,10 +4,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-service-metrics.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-service-metrics.yaml index fe24463..f7384a3 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-service-metrics.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-service-metrics.yaml @@ -7,10 +7,10 @@ metadata: prometheus.io/port: "10254" prometheus.io/scrape: "true" labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-service-webhook.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-service-webhook.yaml index b7b0965..7ab70e8 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-service-webhook.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-service-webhook.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: Service metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-service.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-service.yaml index f3aabba..6fdc79c 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-service.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-service.yaml @@ -5,10 +5,10 @@ kind: Service metadata: annotations: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller diff --git a/deploy/base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml b/deploy/base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml index 2c4a159..cf6b24e 100644 --- a/deploy/base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml +++ b/deploy/base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml @@ -4,10 +4,10 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: ingress-nginx-4.4.0 + helm.sh/chart: ingress-nginx-4.7.1 app.kubernetes.io/name: ingress-nginx app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.8.1" app.kubernetes.io/part-of: ingress-nginx app.kubernetes.io/managed-by: Helm app.kubernetes.io/component: controller