From 5a0b25ced712bc14b579a81db1a4447739d23392 Mon Sep 17 00:00:00 2001 From: James Strong Date: Thu, 31 Mar 2022 18:26:14 -0400 Subject: [PATCH] release 1.1.3 details fix the readme with right sha and version remove helm label fix issue 8329 fix the 1.20 service after the fix for ipv6 udpate readme and change for patches --- .gitignore | 1 + Changelog.md | 38 +++++++ README.md | 32 +++--- charts/ingress-nginx/Chart.yaml | 11 +- charts/ingress-nginx/README.md | 8 +- .../templates/controller-service.yaml | 4 +- charts/ingress-nginx/values.yaml | 4 +- deploy/static/provider/aws/1.19/deploy.yaml | 103 ++++------------- .../provider/aws/1.19/kustomization.yaml | 2 +- deploy/static/provider/aws/1.20/deploy.yaml | 106 ++++------------- .../provider/aws/1.20/kustomization.yaml | 2 +- deploy/static/provider/aws/1.21/deploy.yaml | 103 ++++------------- .../provider/aws/1.21/kustomization.yaml | 2 +- deploy/static/provider/aws/1.22/deploy.yaml | 103 ++++------------- .../provider/aws/1.22/kustomization.yaml | 2 +- deploy/static/provider/aws/1.23/deploy.yaml | 103 ++++------------- .../provider/aws/1.23/kustomization.yaml | 2 +- deploy/static/provider/aws/deploy.yaml | 107 ++++-------------- deploy/static/provider/aws/kustomization.yaml | 2 +- .../nlb-with-tls-termination/1.19/deploy.yaml | 103 ++++------------- .../1.19/kustomization.yaml | 2 +- .../nlb-with-tls-termination/1.20/deploy.yaml | 106 ++++------------- .../1.20/kustomization.yaml | 2 +- .../nlb-with-tls-termination/1.21/deploy.yaml | 103 ++++------------- .../1.21/kustomization.yaml | 2 +- .../nlb-with-tls-termination/1.22/deploy.yaml | 103 ++++------------- .../1.22/kustomization.yaml | 2 +- .../nlb-with-tls-termination/1.23/deploy.yaml | 103 ++++------------- .../1.23/kustomization.yaml | 2 +- .../aws/nlb-with-tls-termination/deploy.yaml | 107 ++++-------------- .../kustomization.yaml | 2 +- .../provider/baremetal/1.19/deploy.yaml | 103 ++++------------- .../baremetal/1.19/kustomization.yaml | 2 +- .../provider/baremetal/1.20/deploy.yaml | 106 ++++------------- .../baremetal/1.20/kustomization.yaml | 2 +- .../provider/baremetal/1.21/deploy.yaml | 103 ++++------------- .../baremetal/1.21/kustomization.yaml | 2 +- .../provider/baremetal/1.22/deploy.yaml | 103 ++++------------- .../baremetal/1.22/kustomization.yaml | 2 +- .../provider/baremetal/1.23/deploy.yaml | 103 ++++------------- .../baremetal/1.23/kustomization.yaml | 2 +- deploy/static/provider/baremetal/deploy.yaml | 107 ++++-------------- .../provider/baremetal/kustomization.yaml | 2 +- deploy/static/provider/cloud/1.19/deploy.yaml | 103 ++++------------- .../provider/cloud/1.19/kustomization.yaml | 2 +- deploy/static/provider/cloud/1.20/deploy.yaml | 106 ++++------------- .../provider/cloud/1.20/kustomization.yaml | 2 +- deploy/static/provider/cloud/1.21/deploy.yaml | 103 ++++------------- .../provider/cloud/1.21/kustomization.yaml | 2 +- deploy/static/provider/cloud/1.22/deploy.yaml | 103 ++++------------- .../provider/cloud/1.22/kustomization.yaml | 2 +- deploy/static/provider/cloud/1.23/deploy.yaml | 103 ++++------------- .../provider/cloud/1.23/kustomization.yaml | 2 +- deploy/static/provider/cloud/deploy.yaml | 107 ++++-------------- .../static/provider/cloud/kustomization.yaml | 2 +- deploy/static/provider/do/1.19/deploy.yaml | 103 ++++------------- .../provider/do/1.19/kustomization.yaml | 2 +- deploy/static/provider/do/1.20/deploy.yaml | 106 ++++------------- .../provider/do/1.20/kustomization.yaml | 2 +- deploy/static/provider/do/1.21/deploy.yaml | 103 ++++------------- .../provider/do/1.21/kustomization.yaml | 2 +- deploy/static/provider/do/1.22/deploy.yaml | 103 ++++------------- .../provider/do/1.22/kustomization.yaml | 2 +- deploy/static/provider/do/1.23/deploy.yaml | 103 ++++------------- .../provider/do/1.23/kustomization.yaml | 2 +- deploy/static/provider/do/deploy.yaml | 107 ++++-------------- deploy/static/provider/do/kustomization.yaml | 2 +- .../static/provider/exoscale/1.19/deploy.yaml | 103 ++++------------- .../provider/exoscale/1.19/kustomization.yaml | 2 +- .../static/provider/exoscale/1.20/deploy.yaml | 106 ++++------------- .../provider/exoscale/1.20/kustomization.yaml | 2 +- .../static/provider/exoscale/1.21/deploy.yaml | 103 ++++------------- .../provider/exoscale/1.21/kustomization.yaml | 2 +- .../static/provider/exoscale/1.22/deploy.yaml | 103 ++++------------- .../provider/exoscale/1.22/kustomization.yaml | 2 +- .../static/provider/exoscale/1.23/deploy.yaml | 103 ++++------------- .../provider/exoscale/1.23/kustomization.yaml | 2 +- deploy/static/provider/exoscale/deploy.yaml | 107 ++++-------------- .../provider/exoscale/kustomization.yaml | 2 +- deploy/static/provider/kind/1.19/deploy.yaml | 103 ++++------------- .../provider/kind/1.19/kustomization.yaml | 2 +- deploy/static/provider/kind/1.20/deploy.yaml | 106 ++++------------- .../provider/kind/1.20/kustomization.yaml | 2 +- deploy/static/provider/kind/1.21/deploy.yaml | 103 ++++------------- .../provider/kind/1.21/kustomization.yaml | 2 +- deploy/static/provider/kind/1.22/deploy.yaml | 103 ++++------------- .../provider/kind/1.22/kustomization.yaml | 2 +- deploy/static/provider/kind/1.23/deploy.yaml | 103 ++++------------- .../provider/kind/1.23/kustomization.yaml | 2 +- deploy/static/provider/kind/deploy.yaml | 107 ++++-------------- .../static/provider/kind/kustomization.yaml | 2 +- deploy/static/provider/scw/1.19/deploy.yaml | 103 ++++------------- .../provider/scw/1.19/kustomization.yaml | 2 +- deploy/static/provider/scw/1.20/deploy.yaml | 106 ++++------------- .../provider/scw/1.20/kustomization.yaml | 2 +- deploy/static/provider/scw/1.21/deploy.yaml | 103 ++++------------- .../provider/scw/1.21/kustomization.yaml | 2 +- deploy/static/provider/scw/1.22/deploy.yaml | 103 ++++------------- .../provider/scw/1.22/kustomization.yaml | 2 +- deploy/static/provider/scw/1.23/deploy.yaml | 103 ++++------------- .../provider/scw/1.23/kustomization.yaml | 2 +- deploy/static/provider/scw/deploy.yaml | 107 ++++-------------- deploy/static/provider/scw/kustomization.yaml | 2 +- docs/deploy/index.md | 18 +-- hack/generate-deploy-scripts.sh | 8 +- .../static-kustomization-template.yaml | 2 +- stable.txt | 2 +- 107 files changed, 1140 insertions(+), 4084 deletions(-) diff --git a/.gitignore b/.gitignore index 921ba6aec3..0943c3b1af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +helm-docs # OSX ._* .DS_Store diff --git a/Changelog.md b/Changelog.md index 40a4aaaf94..0f3656b22c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,43 @@ # Changelog +### 1.1.3 + +**Image:** +- k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 + +This release upgrades Alpine to 3.14.4 and nginx to 1.19.10 + +Patches [OpenSSL CVE-2022-0778](https://github.com/kubernetes/ingress-nginx/issues/8339) + +Patches [Libxml2 CVE-2022-23308](https://github.com/kubernetes/ingress-nginx/issues/8321) + +_Changes:_ + +[8415](https://github.com/kubernetes/ingress-nginx/pull/8415) base img update for e2e-test-runner & opentelemetry +[8403](https://github.com/kubernetes/ingress-nginx/pull/8403) Add execute permissions to nginx image entrypoint.sh +[8392](https://github.com/kubernetes/ingress-nginx/pull/8392) fix document for monitoring +[8386](https://github.com/kubernetes/ingress-nginx/pull/8386) downgrade to 3.14.4 and fix tag +[8379](https://github.com/kubernetes/ingress-nginx/pull/8379) bump luarocks to 3.8.0 +[8368](https://github.com/kubernetes/ingress-nginx/pull/8368) Updated semver in install docs URLs +[8360](https://github.com/kubernetes/ingress-nginx/pull/8360) Bump github.com/stretchr/testify from 1.7.0 to 1.7.1 +[8334](https://github.com/kubernetes/ingress-nginx/pull/8334) Pinned GitHub workflows by SHA +[8324](https://github.com/kubernetes/ingress-nginx/pull/8324) Added missing "repo" option on "helm upgrade" command +[8315](https://github.com/kubernetes/ingress-nginx/pull/8315) Fix 50% split between canary and mainline tests +[8311](https://github.com/kubernetes/ingress-nginx/pull/8311) leaving it the git tag +[8307](https://github.com/kubernetes/ingress-nginx/pull/8307) Nginx v1.19.10 +[8302](https://github.com/kubernetes/ingress-nginx/pull/8302) docs: fix changelog formatting for 1.1.2 +[8300](https://github.com/kubernetes/ingress-nginx/pull/8300) Names cannot contain _ (underscore)! So I changed it to -. +[8288](https://github.com/kubernetes/ingress-nginx/pull/8288) [docs] Missing annotations +[8287](https://github.com/kubernetes/ingress-nginx/pull/8287) Add the shareProcessNamespace as a configurable setting in the helm chart +[8286](https://github.com/kubernetes/ingress-nginx/pull/8286) Fix OpenTelemetry sidecar image build +[8281](https://github.com/kubernetes/ingress-nginx/pull/8281) force prow job by changing something in images/ot dir +[8273](https://github.com/kubernetes/ingress-nginx/pull/8273) Issue#8241 +[8267](https://github.com/kubernetes/ingress-nginx/pull/8267) Add fsGroup value to admission-webhooks/job-patch charts +[8262](https://github.com/kubernetes/ingress-nginx/pull/8262) Updated confusing error +[8258](https://github.com/kubernetes/ingress-nginx/pull/8258) remove 0.46.0 from supported versions table +[8256](https://github.com/kubernetes/ingress-nginx/pull/8256) fix: deny locations with invalid auth-url annotation +[8253](https://github.com/kubernetes/ingress-nginx/pull/8253) Add a certificate info metric + ### 1.1.2 **Image:** diff --git a/README.md b/README.md index 96268a8f9c..c653e4c705 100644 --- a/README.md +++ b/README.md @@ -31,22 +31,22 @@ For detailed changes on the `ingress-nginx` helm chart, please check the followi | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | |-----------------------|------------------------------|----------------|---------------| -| v1.1.2 | 1.23, 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.1.1 | 1.23, 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.1.0 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.5 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.4 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.3 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.2 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.1 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v1.0.0 | 1.22, 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | -| v0.50.0 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v0.49.3 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v0.49.2 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v0.49.1 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | -| v0.49.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | -| v0.48.1 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | -| v0.47.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | +| v1.1.3 | 1.23, 1.22, 1.21, 1.20, 1.19 | 3.14.4 | 1.19.10† | +| v1.1.2 | 1.23, 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.1.1 | 1.23, 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.1.0 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.5 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.4 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.3 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.2 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.1 | 1.22, 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v1.0.0 | 1.22, 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | +| v0.50.0 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v0.49.3 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v0.49.2 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v0.49.1 | 1.21, 1.20, 1.19 | 3.14.2 | 1.19.9† | +| v0.49.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | +| v0.48.1 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | † _This build is [patched against CVE-2021-23017](https://github.com/openresty/openresty/commit/4b5ec7edd78616f544abc194308e0cf4b788725b#diff-42ef841dc27fe0b5aa2d06bd31308bb63a59cdcddcbcddd917248349d22020a3)._ diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml index 69db0be318..f8203e33eb 100644 --- a/charts/ingress-nginx/Chart.yaml +++ b/charts/ingress-nginx/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: ingress-nginx # When the version is modified, make sure the artifacthub.io/changes list is updated # Also update CHANGELOG.md -version: 4.0.18 -appVersion: 1.1.2 +version: 4.0.19 +appVersion: 1.1.3 home: https://github.com/kubernetes/ingress-nginx description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png @@ -24,8 +24,5 @@ annotations: # List of changes for the release in artifacthub.io # https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog artifacthub.io/changes: | - - "#8253 Add a certificate info metric" - - "#8225 fix inconsistent-label-cardinality for prometheus metrics: nginx_ingress_controller_requests" - - "#8162 Versioned static manifests" - - "#8159 Adding some geoip variables and default values" - - "#8221 Do not validate ingresses with unknown ingress class in admission webhook endpoint" + - "#8307 Nginx v1.19.10" + - "#8386 Alpine 3.14.4" diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md index c0ef8109d2..87a227fdb7 100644 --- a/charts/ingress-nginx/README.md +++ b/charts/ingress-nginx/README.md @@ -2,7 +2,7 @@ [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer -![Version: 4.0.18](https://img.shields.io/badge/Version-4.0.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square) +![Version: 4.0.19](https://img.shields.io/badge/Version-4.0.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.3](https://img.shields.io/badge/AppVersion-1.1.3-informational?style=flat-square) To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources. @@ -306,12 +306,12 @@ Kubernetes: `>=1.19.0-0` | controller.hostPort.ports.https | int | `443` | 'hostPort' https port | | controller.hostname | object | `{}` | Optionally customize the pod hostname. | | controller.image.allowPrivilegeEscalation | bool | `true` | | -| controller.image.digest | string | `"sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c"` | | +| controller.image.digest | string | `"sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2"` | | | controller.image.image | string | `"ingress-nginx/controller"` | | | controller.image.pullPolicy | string | `"IfNotPresent"` | | | controller.image.registry | string | `"k8s.gcr.io"` | | | controller.image.runAsUser | int | `101` | | -| controller.image.tag | string | `"v1.1.2"` | | +| controller.image.tag | string | `"v1.1.3"` | | | controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation | | controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). | | controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass | @@ -409,7 +409,7 @@ Kubernetes: `>=1.19.0-0` | controller.service.targetPorts.http | string | `"http"` | | | controller.service.targetPorts.https | string | `"https"` | | | controller.service.type | string | `"LoadBalancer"` | | -| controller.shareProcessNamespace | bool | `false` | This can be used for example to signal log rotation using `kill -USR1` from a sidecar. | +| controller.shareProcessNamespace | bool | `false` | | | controller.sysctls | object | `{}` | See https://kubernetes.io/docs/tasks/administer-cluster/sysctl-cluster/ for notes on enabling and using sysctls | | controller.tcp.annotations | object | `{}` | Annotations to be added to the tcp config configmap | | controller.tcp.configMapNamespace | string | `""` | Allows customization of the tcp-services-configmap; defaults to $(POD_NAMESPACE) | diff --git a/charts/ingress-nginx/templates/controller-service.yaml b/charts/ingress-nginx/templates/controller-service.yaml index 05fb2041e0..0f47f131ca 100644 --- a/charts/ingress-nginx/templates/controller-service.yaml +++ b/charts/ingress-nginx/templates/controller-service.yaml @@ -37,12 +37,12 @@ spec: {{- if .Values.controller.service.healthCheckNodePort }} healthCheckNodePort: {{ .Values.controller.service.healthCheckNodePort }} {{- end }} -{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version -}} +{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version -}} {{- if .Values.controller.service.ipFamilyPolicy }} ipFamilyPolicy: {{ .Values.controller.service.ipFamilyPolicy }} {{- end }} {{- end }} -{{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version -}} +{{- if semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version -}} {{- if .Values.controller.service.ipFamilies }} ipFamilies: {{ toYaml .Values.controller.service.ipFamilies | nindent 4 }} {{- end }} diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index a8b002516e..bc7891df2a 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -21,8 +21,8 @@ controller: ## for backwards compatibility consider setting the full image url via the repository value below ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail ## repository: - tag: "v1.1.2" - digest: sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + tag: "v1.1.3" + digest: sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 pullPolicy: IfNotPresent # www-data -> uid 101 runAsUser: 101 diff --git a/deploy/static/provider/aws/1.19/deploy.yaml b/deploy/static/provider/aws/1.19/deploy.yaml index 710cfcafd1..30d40e77b7 100644 --- a/deploy/static/provider/aws/1.19/deploy.yaml +++ b/deploy/static/provider/aws/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,11 +319,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -410,11 +369,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +411,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -521,17 +478,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -540,11 +492,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -575,17 +525,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -594,11 +539,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -634,11 +577,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -649,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/1.19/kustomization.yaml b/deploy/static/provider/aws/1.19/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/1.19/kustomization.yaml +++ b/deploy/static/provider/aws/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/1.20/deploy.yaml b/deploy/static/provider/aws/1.20/deploy.yaml index 440861a536..0afe26fa23 100644 --- a/deploy/static/provider/aws/1.20/deploy.yaml +++ b/deploy/static/provider/aws/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,18 +319,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -391,11 +349,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +372,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +414,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +481,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +495,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +528,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +542,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +580,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +593,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/1.20/kustomization.yaml b/deploy/static/provider/aws/1.20/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/1.20/kustomization.yaml +++ b/deploy/static/provider/aws/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/1.21/deploy.yaml b/deploy/static/provider/aws/1.21/deploy.yaml index 440861a536..b73d21f8fc 100644 --- a/deploy/static/provider/aws/1.21/deploy.yaml +++ b/deploy/static/provider/aws/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,11 +319,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -391,11 +352,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +375,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +484,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +498,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +531,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +545,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +583,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +596,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/1.21/kustomization.yaml b/deploy/static/provider/aws/1.21/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/1.21/kustomization.yaml +++ b/deploy/static/provider/aws/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/1.22/deploy.yaml b/deploy/static/provider/aws/1.22/deploy.yaml index 440861a536..b73d21f8fc 100644 --- a/deploy/static/provider/aws/1.22/deploy.yaml +++ b/deploy/static/provider/aws/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,11 +319,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -391,11 +352,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +375,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +484,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +498,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +531,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +545,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +583,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +596,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/1.22/kustomization.yaml b/deploy/static/provider/aws/1.22/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/1.22/kustomization.yaml +++ b/deploy/static/provider/aws/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/1.23/deploy.yaml b/deploy/static/provider/aws/1.23/deploy.yaml index 440861a536..b73d21f8fc 100644 --- a/deploy/static/provider/aws/1.23/deploy.yaml +++ b/deploy/static/provider/aws/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,11 +319,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -391,11 +352,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +375,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +484,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +498,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +531,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +545,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +583,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +596,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/1.23/kustomization.yaml b/deploy/static/provider/aws/1.23/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/1.23/kustomization.yaml +++ b/deploy/static/provider/aws/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/deploy.yaml b/deploy/static/provider/aws/deploy.yaml index 374823462f..0afe26fa23 100644 --- a/deploy/static/provider/aws/deploy.yaml +++ b/deploy/static/provider/aws/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -357,18 +319,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -392,11 +349,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -417,11 +372,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -461,7 +414,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -528,17 +481,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -547,11 +495,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -582,17 +528,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -601,11 +542,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -641,11 +580,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -656,11 +593,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/kustomization.yaml b/deploy/static/provider/aws/kustomization.yaml index d18ef3896e..18c6bb6a37 100644 --- a/deploy/static/provider/aws/kustomization.yaml +++ b/deploy/static/provider/aws/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.19/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.19/deploy.yaml index 426c72b067..e2232bd6ef 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.19/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -345,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -365,11 +328,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -395,11 +356,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -419,11 +378,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -463,7 +420,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -533,17 +490,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -552,11 +504,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -587,17 +537,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -606,11 +551,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -646,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -661,11 +602,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.19/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.19/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.19/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.20/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.20/deploy.yaml index 21ea91d497..07be32ffe0 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.20/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -345,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -365,18 +328,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -400,11 +358,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -425,11 +381,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -469,7 +423,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -539,17 +493,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -558,11 +507,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -593,17 +540,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -612,11 +554,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -652,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -667,11 +605,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.20/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.20/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.20/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.21/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.21/deploy.yaml index 21ea91d497..d86ddc4fda 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.21/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -345,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -365,11 +328,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -400,11 +361,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -425,11 +384,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -469,7 +426,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -539,17 +496,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -558,11 +510,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -593,17 +543,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -612,11 +557,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -652,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -667,11 +608,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.21/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.21/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.21/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.22/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.22/deploy.yaml index 21ea91d497..d86ddc4fda 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.22/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -345,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -365,11 +328,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -400,11 +361,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -425,11 +384,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -469,7 +426,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -539,17 +496,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -558,11 +510,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -593,17 +543,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -612,11 +557,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -652,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -667,11 +608,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.22/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.22/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.22/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.23/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.23/deploy.yaml index 21ea91d497..d86ddc4fda 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.23/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -345,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -365,11 +328,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -400,11 +361,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -425,11 +384,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -469,7 +426,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -539,17 +496,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -558,11 +510,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -593,17 +543,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -612,11 +557,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -652,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -667,11 +608,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/1.23/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/1.23/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/1.23/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml index 97c4697d53..07be32ffe0 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -346,11 +310,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -366,18 +328,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -401,11 +358,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -426,11 +381,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -470,7 +423,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -540,17 +493,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -559,11 +507,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -594,17 +540,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -613,11 +554,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -653,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -668,11 +605,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/aws/nlb-with-tls-termination/kustomization.yaml b/deploy/static/provider/aws/nlb-with-tls-termination/kustomization.yaml index ca2086ea91..51c1513c9c 100644 --- a/deploy/static/provider/aws/nlb-with-tls-termination/kustomization.yaml +++ b/deploy/static/provider/aws/nlb-with-tls-termination/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/aws/nlb-with-tls-termination?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/aws/nlb-with-tls-termination # ``` resources: diff --git a/deploy/static/provider/baremetal/1.19/deploy.yaml b/deploy/static/provider/baremetal/1.19/deploy.yaml index c037654566..49c11b1bd4 100644 --- a/deploy/static/provider/baremetal/1.19/deploy.yaml +++ b/deploy/static/provider/baremetal/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -381,11 +342,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -405,11 +364,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -448,7 +405,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -515,17 +472,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -534,11 +486,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -569,17 +519,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -588,11 +533,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -628,11 +571,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -643,11 +584,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/1.19/kustomization.yaml b/deploy/static/provider/baremetal/1.19/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/1.19/kustomization.yaml +++ b/deploy/static/provider/baremetal/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/baremetal/1.20/deploy.yaml b/deploy/static/provider/baremetal/1.20/deploy.yaml index 943d0ff490..aa9898d99d 100644 --- a/deploy/static/provider/baremetal/1.20/deploy.yaml +++ b/deploy/static/provider/baremetal/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,17 +315,12 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -386,11 +344,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +367,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +408,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -521,17 +475,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -540,11 +489,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -575,17 +522,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -594,11 +536,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -634,11 +574,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -649,11 +587,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/1.20/kustomization.yaml b/deploy/static/provider/baremetal/1.20/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/1.20/kustomization.yaml +++ b/deploy/static/provider/baremetal/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/baremetal/1.21/deploy.yaml b/deploy/static/provider/baremetal/1.21/deploy.yaml index 943d0ff490..c101d538b0 100644 --- a/deploy/static/provider/baremetal/1.21/deploy.yaml +++ b/deploy/static/provider/baremetal/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +411,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -521,17 +478,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -540,11 +492,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -575,17 +525,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -594,11 +539,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -634,11 +577,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -649,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/1.21/kustomization.yaml b/deploy/static/provider/baremetal/1.21/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/1.21/kustomization.yaml +++ b/deploy/static/provider/baremetal/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/baremetal/1.22/deploy.yaml b/deploy/static/provider/baremetal/1.22/deploy.yaml index 943d0ff490..c101d538b0 100644 --- a/deploy/static/provider/baremetal/1.22/deploy.yaml +++ b/deploy/static/provider/baremetal/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +411,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -521,17 +478,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -540,11 +492,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -575,17 +525,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -594,11 +539,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -634,11 +577,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -649,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/1.22/kustomization.yaml b/deploy/static/provider/baremetal/1.22/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/1.22/kustomization.yaml +++ b/deploy/static/provider/baremetal/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/baremetal/1.23/deploy.yaml b/deploy/static/provider/baremetal/1.23/deploy.yaml index 943d0ff490..c101d538b0 100644 --- a/deploy/static/provider/baremetal/1.23/deploy.yaml +++ b/deploy/static/provider/baremetal/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +411,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -521,17 +478,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -540,11 +492,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -575,17 +525,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -594,11 +539,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -634,11 +577,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -649,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/1.23/kustomization.yaml b/deploy/static/provider/baremetal/1.23/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/1.23/kustomization.yaml +++ b/deploy/static/provider/baremetal/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/baremetal/deploy.yaml b/deploy/static/provider/baremetal/deploy.yaml index cdba346c1d..aa9898d99d 100644 --- a/deploy/static/provider/baremetal/deploy.yaml +++ b/deploy/static/provider/baremetal/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -353,17 +315,12 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -387,11 +344,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +367,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -455,7 +408,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -522,17 +475,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -541,11 +489,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -576,17 +522,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -595,11 +536,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -635,11 +574,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -650,11 +587,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/baremetal/kustomization.yaml b/deploy/static/provider/baremetal/kustomization.yaml index d13af0f82b..d585f85c65 100644 --- a/deploy/static/provider/baremetal/kustomization.yaml +++ b/deploy/static/provider/baremetal/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/baremetal?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/baremetal # ``` resources: diff --git a/deploy/static/provider/cloud/1.19/deploy.yaml b/deploy/static/provider/cloud/1.19/deploy.yaml index af5e89f046..f6000c6a69 100644 --- a/deploy/static/provider/cloud/1.19/deploy.yaml +++ b/deploy/static/provider/cloud/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -382,11 +343,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -406,11 +365,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -450,7 +407,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -517,17 +474,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -536,11 +488,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -571,17 +521,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -590,11 +535,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -630,11 +573,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -645,11 +586,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/1.19/kustomization.yaml b/deploy/static/provider/cloud/1.19/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/1.19/kustomization.yaml +++ b/deploy/static/provider/cloud/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/cloud/1.20/deploy.yaml b/deploy/static/provider/cloud/1.20/deploy.yaml index ae18d5938b..d87b1331d6 100644 --- a/deploy/static/provider/cloud/1.20/deploy.yaml +++ b/deploy/static/provider/cloud/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,18 +315,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -387,11 +345,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +368,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -456,7 +410,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -523,17 +477,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -542,11 +491,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -577,17 +524,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -596,11 +538,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -636,11 +576,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -651,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/1.20/kustomization.yaml b/deploy/static/provider/cloud/1.20/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/1.20/kustomization.yaml +++ b/deploy/static/provider/cloud/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/cloud/1.21/deploy.yaml b/deploy/static/provider/cloud/1.21/deploy.yaml index ae18d5938b..a1f096f6b0 100644 --- a/deploy/static/provider/cloud/1.21/deploy.yaml +++ b/deploy/static/provider/cloud/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -387,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -456,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -523,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -542,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -577,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -596,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -636,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -651,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/1.21/kustomization.yaml b/deploy/static/provider/cloud/1.21/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/1.21/kustomization.yaml +++ b/deploy/static/provider/cloud/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/cloud/1.22/deploy.yaml b/deploy/static/provider/cloud/1.22/deploy.yaml index ae18d5938b..a1f096f6b0 100644 --- a/deploy/static/provider/cloud/1.22/deploy.yaml +++ b/deploy/static/provider/cloud/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -387,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -456,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -523,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -542,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -577,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -596,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -636,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -651,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/1.22/kustomization.yaml b/deploy/static/provider/cloud/1.22/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/1.22/kustomization.yaml +++ b/deploy/static/provider/cloud/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/cloud/1.23/deploy.yaml b/deploy/static/provider/cloud/1.23/deploy.yaml index ae18d5938b..a1f096f6b0 100644 --- a/deploy/static/provider/cloud/1.23/deploy.yaml +++ b/deploy/static/provider/cloud/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -387,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -456,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -523,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -542,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -577,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -596,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -636,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -651,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/1.23/kustomization.yaml b/deploy/static/provider/cloud/1.23/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/1.23/kustomization.yaml +++ b/deploy/static/provider/cloud/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/cloud/deploy.yaml b/deploy/static/provider/cloud/deploy.yaml index 206883b6eb..d87b1331d6 100644 --- a/deploy/static/provider/cloud/deploy.yaml +++ b/deploy/static/provider/cloud/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -353,18 +315,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -388,11 +345,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -413,11 +368,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -457,7 +410,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -524,17 +477,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -543,11 +491,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -578,17 +524,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -597,11 +538,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -637,11 +576,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -652,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/cloud/kustomization.yaml b/deploy/static/provider/cloud/kustomization.yaml index a92167fada..d477ec4059 100644 --- a/deploy/static/provider/cloud/kustomization.yaml +++ b/deploy/static/provider/cloud/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/cloud?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/cloud # ``` resources: diff --git a/deploy/static/provider/do/1.19/deploy.yaml b/deploy/static/provider/do/1.19/deploy.yaml index 69504e7021..e746a93dbf 100644 --- a/deploy/static/provider/do/1.19/deploy.yaml +++ b/deploy/static/provider/do/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -385,11 +346,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -409,11 +368,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -453,7 +410,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -520,17 +477,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -539,11 +491,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -574,17 +524,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -593,11 +538,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -633,11 +576,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -648,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/1.19/kustomization.yaml b/deploy/static/provider/do/1.19/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/1.19/kustomization.yaml +++ b/deploy/static/provider/do/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/do/1.20/deploy.yaml b/deploy/static/provider/do/1.20/deploy.yaml index 98bfe291a7..815e703747 100644 --- a/deploy/static/provider/do/1.20/deploy.yaml +++ b/deploy/static/provider/do/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,18 +318,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -390,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/1.20/kustomization.yaml b/deploy/static/provider/do/1.20/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/1.20/kustomization.yaml +++ b/deploy/static/provider/do/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/do/1.21/deploy.yaml b/deploy/static/provider/do/1.21/deploy.yaml index 98bfe291a7..df2dce3674 100644 --- a/deploy/static/provider/do/1.21/deploy.yaml +++ b/deploy/static/provider/do/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/1.21/kustomization.yaml b/deploy/static/provider/do/1.21/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/1.21/kustomization.yaml +++ b/deploy/static/provider/do/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/do/1.22/deploy.yaml b/deploy/static/provider/do/1.22/deploy.yaml index 98bfe291a7..df2dce3674 100644 --- a/deploy/static/provider/do/1.22/deploy.yaml +++ b/deploy/static/provider/do/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/1.22/kustomization.yaml b/deploy/static/provider/do/1.22/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/1.22/kustomization.yaml +++ b/deploy/static/provider/do/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/do/1.23/deploy.yaml b/deploy/static/provider/do/1.23/deploy.yaml index 98bfe291a7..df2dce3674 100644 --- a/deploy/static/provider/do/1.23/deploy.yaml +++ b/deploy/static/provider/do/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/1.23/kustomization.yaml b/deploy/static/provider/do/1.23/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/1.23/kustomization.yaml +++ b/deploy/static/provider/do/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/do/deploy.yaml b/deploy/static/provider/do/deploy.yaml index 324ae79e62..815e703747 100644 --- a/deploy/static/provider/do/deploy.yaml +++ b/deploy/static/provider/do/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -340,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,18 +318,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -391,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/do/kustomization.yaml b/deploy/static/provider/do/kustomization.yaml index c7bb8d250a..f20d445c73 100644 --- a/deploy/static/provider/do/kustomization.yaml +++ b/deploy/static/provider/do/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/do?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/do # ``` resources: diff --git a/deploy/static/provider/exoscale/1.19/deploy.yaml b/deploy/static/provider/exoscale/1.19/deploy.yaml index 3c22a01189..61e0842496 100644 --- a/deploy/static/provider/exoscale/1.19/deploy.yaml +++ b/deploy/static/provider/exoscale/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -362,11 +325,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -392,11 +353,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +375,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +484,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +498,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +531,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +545,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +583,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +596,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/1.19/kustomization.yaml b/deploy/static/provider/exoscale/1.19/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/1.19/kustomization.yaml +++ b/deploy/static/provider/exoscale/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/exoscale/1.20/deploy.yaml b/deploy/static/provider/exoscale/1.20/deploy.yaml index 136b466c9c..e3712ce33a 100644 --- a/deploy/static/provider/exoscale/1.20/deploy.yaml +++ b/deploy/static/provider/exoscale/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -362,18 +325,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -397,11 +355,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -422,11 +378,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -466,7 +420,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -533,17 +487,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -552,11 +501,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -587,17 +534,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -606,11 +548,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -646,11 +586,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -661,11 +599,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/1.20/kustomization.yaml b/deploy/static/provider/exoscale/1.20/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/1.20/kustomization.yaml +++ b/deploy/static/provider/exoscale/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/exoscale/1.21/deploy.yaml b/deploy/static/provider/exoscale/1.21/deploy.yaml index 136b466c9c..7c214d0f08 100644 --- a/deploy/static/provider/exoscale/1.21/deploy.yaml +++ b/deploy/static/provider/exoscale/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -362,11 +325,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -397,11 +358,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -422,11 +381,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -466,7 +423,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -533,17 +490,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -552,11 +504,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -587,17 +537,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -606,11 +551,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -646,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -661,11 +602,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/1.21/kustomization.yaml b/deploy/static/provider/exoscale/1.21/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/1.21/kustomization.yaml +++ b/deploy/static/provider/exoscale/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/exoscale/1.22/deploy.yaml b/deploy/static/provider/exoscale/1.22/deploy.yaml index 136b466c9c..7c214d0f08 100644 --- a/deploy/static/provider/exoscale/1.22/deploy.yaml +++ b/deploy/static/provider/exoscale/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -362,11 +325,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -397,11 +358,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -422,11 +381,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -466,7 +423,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -533,17 +490,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -552,11 +504,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -587,17 +537,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -606,11 +551,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -646,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -661,11 +602,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/1.22/kustomization.yaml b/deploy/static/provider/exoscale/1.22/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/1.22/kustomization.yaml +++ b/deploy/static/provider/exoscale/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/exoscale/1.23/deploy.yaml b/deploy/static/provider/exoscale/1.23/deploy.yaml index 136b466c9c..7c214d0f08 100644 --- a/deploy/static/provider/exoscale/1.23/deploy.yaml +++ b/deploy/static/provider/exoscale/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -362,11 +325,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -397,11 +358,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -422,11 +381,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -466,7 +423,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -533,17 +490,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -552,11 +504,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -587,17 +537,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -606,11 +551,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -646,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -661,11 +602,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/1.23/kustomization.yaml b/deploy/static/provider/exoscale/1.23/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/1.23/kustomization.yaml +++ b/deploy/static/provider/exoscale/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/exoscale/deploy.yaml b/deploy/static/provider/exoscale/deploy.yaml index d65ba8628d..e3712ce33a 100644 --- a/deploy/static/provider/exoscale/deploy.yaml +++ b/deploy/static/provider/exoscale/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -363,18 +325,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -398,11 +355,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -423,11 +378,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -467,7 +420,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -534,17 +487,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -553,11 +501,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -588,17 +534,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -607,11 +548,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -647,11 +586,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -662,11 +599,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/exoscale/kustomization.yaml b/deploy/static/provider/exoscale/kustomization.yaml index 8466627e2a..e79016cf37 100644 --- a/deploy/static/provider/exoscale/kustomization.yaml +++ b/deploy/static/provider/exoscale/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/exoscale?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/exoscale # ``` resources: diff --git a/deploy/static/provider/kind/1.19/deploy.yaml b/deploy/static/provider/kind/1.19/deploy.yaml index 171725751b..8122b831c3 100644 --- a/deploy/static/provider/kind/1.19/deploy.yaml +++ b/deploy/static/provider/kind/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -381,11 +342,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -405,11 +364,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -454,7 +411,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -528,17 +485,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -547,11 +499,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -582,17 +532,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -601,11 +546,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -641,11 +584,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -656,11 +597,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/1.19/kustomization.yaml b/deploy/static/provider/kind/1.19/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/1.19/kustomization.yaml +++ b/deploy/static/provider/kind/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/kind/1.20/deploy.yaml b/deploy/static/provider/kind/1.20/deploy.yaml index 030092a559..934c81a016 100644 --- a/deploy/static/provider/kind/1.20/deploy.yaml +++ b/deploy/static/provider/kind/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,17 +315,12 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -386,11 +344,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +367,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +414,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -534,17 +488,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -553,11 +502,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -588,17 +535,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -607,11 +549,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -647,11 +587,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -662,11 +600,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/1.20/kustomization.yaml b/deploy/static/provider/kind/1.20/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/1.20/kustomization.yaml +++ b/deploy/static/provider/kind/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/kind/1.21/deploy.yaml b/deploy/static/provider/kind/1.21/deploy.yaml index 030092a559..6d3e5ba7ac 100644 --- a/deploy/static/provider/kind/1.21/deploy.yaml +++ b/deploy/static/provider/kind/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -534,17 +491,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -553,11 +505,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -588,17 +538,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -607,11 +552,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -647,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -662,11 +603,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/1.21/kustomization.yaml b/deploy/static/provider/kind/1.21/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/1.21/kustomization.yaml +++ b/deploy/static/provider/kind/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/kind/1.22/deploy.yaml b/deploy/static/provider/kind/1.22/deploy.yaml index 030092a559..6d3e5ba7ac 100644 --- a/deploy/static/provider/kind/1.22/deploy.yaml +++ b/deploy/static/provider/kind/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -534,17 +491,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -553,11 +505,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -588,17 +538,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -607,11 +552,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -647,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -662,11 +603,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/1.22/kustomization.yaml b/deploy/static/provider/kind/1.22/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/1.22/kustomization.yaml +++ b/deploy/static/provider/kind/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/kind/1.23/deploy.yaml b/deploy/static/provider/kind/1.23/deploy.yaml index 030092a559..6d3e5ba7ac 100644 --- a/deploy/static/provider/kind/1.23/deploy.yaml +++ b/deploy/static/provider/kind/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -338,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -352,11 +315,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -386,11 +347,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -411,11 +370,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +417,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -534,17 +491,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -553,11 +505,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -588,17 +538,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -607,11 +552,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -647,11 +590,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -662,11 +603,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/1.23/kustomization.yaml b/deploy/static/provider/kind/1.23/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/1.23/kustomization.yaml +++ b/deploy/static/provider/kind/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/kind/deploy.yaml b/deploy/static/provider/kind/deploy.yaml index 1725f13472..934c81a016 100644 --- a/deploy/static/provider/kind/deploy.yaml +++ b/deploy/static/provider/kind/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +303,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -353,17 +315,12 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -387,11 +344,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -412,11 +367,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -461,7 +414,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -535,17 +488,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -554,11 +502,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -589,17 +535,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -608,11 +549,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -648,11 +587,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -663,11 +600,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/kind/kustomization.yaml b/deploy/static/provider/kind/kustomization.yaml index 94b7c887d6..bd605a188d 100644 --- a/deploy/static/provider/kind/kustomization.yaml +++ b/deploy/static/provider/kind/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/kind?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/kind # ``` resources: diff --git a/deploy/static/provider/scw/1.19/deploy.yaml b/deploy/static/provider/scw/1.19/deploy.yaml index 8e29c55640..d8dc863684 100644 --- a/deploy/static/provider/scw/1.19/deploy.yaml +++ b/deploy/static/provider/scw/1.19/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -385,11 +346,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -409,11 +368,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -453,7 +410,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -520,17 +477,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -539,11 +491,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -574,17 +524,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -593,11 +538,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -633,11 +576,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -648,11 +589,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/1.19/kustomization.yaml b/deploy/static/provider/scw/1.19/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/1.19/kustomization.yaml +++ b/deploy/static/provider/scw/1.19/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/deploy/static/provider/scw/1.20/deploy.yaml b/deploy/static/provider/scw/1.20/deploy.yaml index 82cee679da..19bfb55a8f 100644 --- a/deploy/static/provider/scw/1.20/deploy.yaml +++ b/deploy/static/provider/scw/1.20/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,18 +318,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -390,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/1.20/kustomization.yaml b/deploy/static/provider/scw/1.20/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/1.20/kustomization.yaml +++ b/deploy/static/provider/scw/1.20/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/deploy/static/provider/scw/1.21/deploy.yaml b/deploy/static/provider/scw/1.21/deploy.yaml index 82cee679da..25a56f11a8 100644 --- a/deploy/static/provider/scw/1.21/deploy.yaml +++ b/deploy/static/provider/scw/1.21/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/1.21/kustomization.yaml b/deploy/static/provider/scw/1.21/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/1.21/kustomization.yaml +++ b/deploy/static/provider/scw/1.21/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/deploy/static/provider/scw/1.22/deploy.yaml b/deploy/static/provider/scw/1.22/deploy.yaml index 82cee679da..25a56f11a8 100644 --- a/deploy/static/provider/scw/1.22/deploy.yaml +++ b/deploy/static/provider/scw/1.22/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/1.22/kustomization.yaml b/deploy/static/provider/scw/1.22/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/1.22/kustomization.yaml +++ b/deploy/static/provider/scw/1.22/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/deploy/static/provider/scw/1.23/deploy.yaml b/deploy/static/provider/scw/1.23/deploy.yaml index 82cee679da..25a56f11a8 100644 --- a/deploy/static/provider/scw/1.23/deploy.yaml +++ b/deploy/static/provider/scw/1.23/deploy.yaml @@ -13,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -44,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -125,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -152,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -218,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -245,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -264,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -291,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -309,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -339,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -355,11 +318,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -390,11 +351,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -415,11 +374,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -459,7 +416,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -526,17 +483,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -545,11 +497,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -580,17 +530,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -599,11 +544,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -639,11 +582,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -654,11 +595,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/1.23/kustomization.yaml b/deploy/static/provider/scw/1.23/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/1.23/kustomization.yaml +++ b/deploy/static/provider/scw/1.23/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/deploy/static/provider/scw/deploy.yaml b/deploy/static/provider/scw/deploy.yaml index 138a9fcf1e..19bfb55a8f 100644 --- a/deploy/static/provider/scw/deploy.yaml +++ b/deploy/static/provider/scw/deploy.yaml @@ -1,4 +1,3 @@ -#GENERATED FOR K8S 1.20 apiVersion: v1 kind: Namespace metadata: @@ -14,28 +13,21 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx --- apiVersion: v1 kind: ServiceAccount metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx --- @@ -45,11 +37,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx rules: @@ -126,17 +116,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx rules: @@ -153,11 +138,9 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx rules: - apiGroups: @@ -219,17 +202,12 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission rules: - apiGroups: @@ -246,11 +224,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx namespace: ingress-nginx roleRef: @@ -265,17 +241,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission namespace: ingress-nginx roleRef: @@ -292,11 +263,9 @@ kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx roleRef: apiGroup: rbac.authorization.k8s.io @@ -310,17 +279,12 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission roleRef: apiGroup: rbac.authorization.k8s.io @@ -340,11 +304,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx --- @@ -356,18 +318,13 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: externalTrafficPolicy: Local - ipFamilies: - - IPv4 - ipFamilyPolicy: SingleStack ports: - appProtocol: http name: http @@ -391,11 +348,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller-admission namespace: ingress-nginx spec: @@ -416,11 +371,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-controller namespace: ingress-nginx spec: @@ -460,7 +413,7 @@ spec: fieldPath: metadata.namespace - name: LD_PRELOAD value: /usr/local/lib/libmimalloc.so - image: k8s.gcr.io/ingress-nginx/controller:v1.1.2@sha256:28b11ce69e57843de44e3db6413e98d09de0f6688e33d4bd384002a44f78405c + image: k8s.gcr.io/ingress-nginx/controller:v1.1.3@sha256:31f47c1e202b39fadecf822a9b76370bd4baed199a005b3e7d4d1455f4fd3fe2 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -527,17 +480,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: pre-install,pre-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create namespace: ingress-nginx spec: @@ -546,11 +494,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-create spec: containers: @@ -581,17 +527,12 @@ spec: apiVersion: batch/v1 kind: Job metadata: - annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch namespace: ingress-nginx spec: @@ -600,11 +541,9 @@ spec: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission-patch spec: containers: @@ -640,11 +579,9 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: nginx spec: controller: k8s.io/ingress-nginx @@ -655,11 +592,9 @@ metadata: labels: app.kubernetes.io/component: admission-webhook app.kubernetes.io/instance: ingress-nginx - app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: ingress-nginx app.kubernetes.io/part-of: ingress-nginx - app.kubernetes.io/version: 1.1.2 - helm.sh/chart: ingress-nginx-4.0.18 + app.kubernetes.io/version: 1.1.3 name: ingress-nginx-admission webhooks: - admissionReviewVersions: diff --git a/deploy/static/provider/scw/kustomization.yaml b/deploy/static/provider/scw/kustomization.yaml index da792b8f5e..d8535dbdef 100644 --- a/deploy/static/provider/scw/kustomization.yaml +++ b/deploy/static/provider/scw/kustomization.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/provider/scw?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/provider/scw # ``` resources: diff --git a/docs/deploy/index.md b/docs/deploy/index.md index 966703afb7..8490405741 100644 --- a/docs/deploy/index.md +++ b/docs/deploy/index.md @@ -186,17 +186,17 @@ In AWS we use a Network load balancer (NLB) to expose the NGINX Ingress controll ##### Network Load Balancer (NLB) ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/aws/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/aws/deploy.yaml ``` ##### TLS termination in AWS Load Balancer (NLB) By default, TLS is terminated in the ingress controller. But it is also possible to terminate TLS in the Load Balancer. This section explains how to do that on AWS using an NLB. -1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template +1. Download the [deploy.yaml](https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml) template ```console - wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml + wget https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/aws/nlb-with-tls-termination/deploy.yaml ``` 2. Edit the file and change the VPC CIDR in use for the Kubernetes cluster: @@ -238,7 +238,7 @@ Then, the ingress controller can be installed like this: ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/cloud/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/cloud/deploy.yaml ``` !!! warning @@ -252,7 +252,7 @@ kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/cont #### Azure ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/cloud/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/cloud/deploy.yaml ``` More information with regards to Azure annotations for ingress controller can be found in the [official AKS documentation](https://docs.microsoft.com/en-us/azure/aks/ingress-internal-ip#create-an-ingress-controller). @@ -260,13 +260,13 @@ More information with regards to Azure annotations for ingress controller can be #### Digital Ocean ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/do/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/do/deploy.yaml ``` #### Scaleway ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/scw/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/scw/deploy.yaml ``` #### Exoscale @@ -280,7 +280,7 @@ The full list of annotations supported by Exoscale is available in the Exoscale #### Oracle Cloud Infrastructure ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/cloud/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/cloud/deploy.yaml ``` A [complete list of available annotations for Oracle Cloud Infrastructure](https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/load-balancer-annotations.md) can be found in the [OCI Cloud Controller Manager](https://github.com/oracle/oci-cloud-controller-manager) documentation. @@ -292,7 +292,7 @@ This section is applicable to Kubernetes clusters deployed on bare metal servers For quick testing, you can use a [NodePort](https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport). This should work on almost every cluster, but it will typically use a port in the range 30000-32767. ```console -kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.2/deploy/static/provider/baremetal/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.1.3/deploy/static/provider/baremetal/deploy.yaml ``` For more information about bare metal deployments (and how to use port 80 instead of a random port in the 30000-32767 range), see [bare-metal considerations](./baremetal.md). diff --git a/hack/generate-deploy-scripts.sh b/hack/generate-deploy-scripts.sh index a697b13e26..598e60fc42 100755 --- a/hack/generate-deploy-scripts.sh +++ b/hack/generate-deploy-scripts.sh @@ -18,7 +18,7 @@ if [ -n "$DEBUG" ]; then set -x fi -set -o errexit +#set -o errexit set -o nounset set -o pipefail @@ -42,6 +42,7 @@ for K8S_VERSION in "${K8S_TARGET_VERSIONS[@]}" do for TARGET in ${TARGETS} do + echo "Running ${K8S_VERSION} for target ${TARGET}" TARGET_DIR="${TEMPLATE_DIR}/${TARGET}" MANIFEST="${TEMPLATE_DIR}/common/manifest.yaml" # intermediate manifest OUTPUT_DIR="${DIR}/deploy/static/${TARGET}/${K8S_VERSION}" @@ -54,6 +55,9 @@ do --namespace ingress-nginx \ --kube-version ${K8S_VERSION} \ > $MANIFEST + sed -i '' '/app.kubernetes.io\/managed-by: Helm/d' $MANIFEST + sed -i '' '/helm.sh/d' $MANIFEST + kustomize --load-restrictor=LoadRestrictionsNone build . > ${OUTPUT_DIR}/deploy.yaml rm $MANIFEST cd ~- @@ -64,7 +68,7 @@ do if [[ ${K8S_VERSION} = ${K8S_DEFAULT_VERSION} ]] then cp ${OUTPUT_DIR}/*.yaml ${OUTPUT_DIR}/../ - sed -i "1s/^/#GENERATED FOR K8S ${K8S_VERSION}\n/" ${OUTPUT_DIR}/../deploy.yaml + sed -i "s/^/#GENERATED FOR K8S ${K8S_VERSION}\n/" ${OUTPUT_DIR}/../deploy.yaml fi done done diff --git a/hack/manifest-templates/static-kustomization-template.yaml b/hack/manifest-templates/static-kustomization-template.yaml index fd273c7c44..18118a0ce4 100644 --- a/hack/manifest-templates/static-kustomization-template.yaml +++ b/hack/manifest-templates/static-kustomization-template.yaml @@ -4,7 +4,7 @@ # ``` # namespace: ingress-nginx # bases: -# - github.com/kubernetes/ingress-nginx/deploy/static/{TARGET}?ref=master +# - github.com/kubernetes/ingress-nginx/tree/main/deploy/static/{TARGET} # ``` resources: diff --git a/stable.txt b/stable.txt index e6c5acf0d0..3e5a2f3061 100644 --- a/stable.txt +++ b/stable.txt @@ -1 +1 @@ -controller-v1.1.0 \ No newline at end of file +controller-v1.1.3 \ No newline at end of file