DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Release v1 (#7470)

Browse source 
* Drop v1beta1 from ingress nginx (#7156)

* Drop v1beta1 from ingress nginx

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix intorstr logic in controller

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* fixing admission

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* more intorstr fixing

* correct template rendering

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix e2e tests for v1 api

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix gofmt errors

* This is finally working...almost there...

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Re-add removed validation of AdmissionReview

* Prepare for v1.0.0-alpha.1 release

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Update changelog and matrix table for v1.0.0-alpha.1 (#7274)

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* add docs for syslog feature (#7219)

* Fix link to e2e-tests.md in developer-guide (#7201)

* Use ENV expansion for namespace in args (#7146)

Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does.

* chart: using Helm builtin capabilities check (#7190)

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

* Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944)

It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780

* Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107)

* Fix MaxWorkerOpenFiles calculation on high cores nodes

* Add e2e test for rlimit_nofile

* Fix doc for max-worker-open-files

* ingress/tcp: add additional error logging on failed (#7208)

* Add file containing stable release (#7313)

* Handle named (non-numeric) ports correctly (#7311)

Signed-off-by: Carlos Panato <ctadeu@gmail.com>

* Updated v1beta1 to v1 as its deprecated (#7308)

* remove mercurial from build (#7031)

* Retry to download maxmind DB if it fails (#7242)

* Retry to download maxmind DB if it fails.

Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com>

* Add retries count arg, move retry logic into DownloadGeoLite2DB function

Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com>

* Reorder parameters in DownloadGeoLite2DB

Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com>

* Remove hardcoded value

Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com>

* Release v1.0.0-alpha.1

* Add changelog for v1.0.0-alpha.2

* controller: ignore non-service backends (#7332)

* controller: ignore non-service backends

Signed-off-by: Carlos Panato <ctadeu@gmail.com>

* update per feedback

Signed-off-by: Carlos Panato <ctadeu@gmail.com>

* fix: allow scope/tcp/udp configmap namespace to altered (#7161)

* Lower webhook timeout for digital ocean (#7319)

* Lower webhook timeout for digital ocean

* Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29

* update OWNERS and aliases files (#7365) (#7366)

Signed-off-by: Carlos Panato <ctadeu@gmail.com>

* Downgrade Lua modules for s390x (#7355)

Downgrade Lua modules to last known working version.

* Fix IngressClass logic for newer releases (#7341)

* Fix IngressClass logic for newer releases

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Change e2e tests for the new IngressClass presence

* Fix chart and admission tests

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix helm chart test

Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>

* Fix reviews

* Remove ingressclass code from admission

* update tag to v1.0.0-beta.1

* update readme and changelog for v1.0.0-beta.1

* Release v1.0.0-beta.1 - helm and manifests (#7422)

* Change the order of annotation just to trigger a new helm release (#7425)

* [cherry-pick] Add dev-v1 branch into helm releaser (#7428)

* Add dev-v1 branch into helm releaser (#7424)

* chore: add link for artifacthub.io/prerelease annotations

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>

Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com>

* k8s job ci pipeline for dev-v1 br v1.22.0 (#7453)

* k8s job ci pipeline for dev-v1 br v1.22.0

Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com>

* k8s job ci pipeline for dev-v1 br v1.21.2

Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com>

* remove v1.21.1 version

Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com>

* Add controller.watchIngressWithoutClass config option (#7459)

Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com>

* Release new helm chart with certgen fixed (#7478)

* Update go version, modules and remove ioutil

* Release new helm chart with certgen fixed

* changed appversion, chartversion, TAG, image (#7490)

* Fix CI conflict

* Fix CI conflict

* Fix build.sh from rebase process

* Fix controller_test post rebase

Co-authored-by: Tianhao Guo <rggth09@gmail.com>
Co-authored-by: Ray <61553+rctay@users.noreply.github.com>
Co-authored-by: Bill Cassidy <cassid4@gmail.com>
Co-authored-by: Jintao Zhang <tao12345666333@163.com>
Co-authored-by: Sathish Ramani <rsathishx87@gmail.com>
Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com>
Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com>
Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com>
Co-authored-by: Tom Hayward <thayward@infoblox.com>
Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com>
Co-authored-by: Tore <tore.lonoy@gmail.com>
Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl>
Co-authored-by: Shahid <shahid@us.ibm.com>
Co-authored-by: James Strong <strong.james.e@gmail.com>
Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com>
Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com>
Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com>
Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
This commit is contained in:
Ricardo Katz 2021-08-21 17:42:00 -03:00 committed by GitHub
parent f3c50698d9
commit 90c79689c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
226 changed files with 3518 additions and 1940 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
.github/workflows/ci.yaml vendored
View file

@ -57,8 +57,6 @@ jobs:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: changes needs: changes
if: |
(needs.changes.outputs.go == 'true')
steps: steps:
@ -116,6 +114,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- changes - changes
- build
if: | if: |
(needs.changes.outputs.charts == 'true') (needs.changes.outputs.charts == 'true')
@ -124,6 +123,11 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: cache
uses: actions/download-artifact@v2
with:
name: docker.tar.gz
- name: Lint - name: Lint
run: | run: |
./build/run-in-docker.sh ./hack/verify-chart-lint.sh ./build/run-in-docker.sh ./hack/verify-chart-lint.sh
@ -138,12 +142,23 @@ jobs:
uses: engineerd/setup-kind@v0.5.0 uses: engineerd/setup-kind@v0.5.0
with: with:
version: v0.11.1 version: v0.11.1
image: kindest/node:v1.20.2 image: kindest/node:v1.21.1
- uses: geekyeggo/delete-artifact@v1
with:
name: docker.tar.gz
failOnError: false
- name: Load images from cache
run: |
echo "loading docker images..."
pigz -dc docker.tar.gz | docker load
- name: Test - name: Test
env: env:
KIND_CLUSTER_NAME: kind KIND_CLUSTER_NAME: kind
SKIP_CLUSTER_CREATION: true SKIP_CLUSTER_CREATION: true
SKIP_IMAGE_CREATION: true
run: | run: |
kind get kubeconfig > $HOME/.kube/kind-config-kind kind get kubeconfig > $HOME/.kube/kind-config-kind
make kind-e2e-chart-tests make kind-e2e-chart-tests
@ -159,7 +174,7 @@ jobs:
strategy: strategy:
matrix: matrix:
k8s: [v1.16.15, v1.17.17, v1.18.19, v1.19.11, v1.20.7, v1.21.2] k8s: [v1.19.11, v1.20.7, v1.21.2, v1.22.0]
steps: steps:

76
Changelog.md
View file

@ -81,6 +81,82 @@ _Changes:_
- [X] [#7216](https://github.com/kubernetes/ingress-nginx/pull/7216) Admission: Skip validation checks if an ingress - [X] [#7216](https://github.com/kubernetes/ingress-nginx/pull/7216) Admission: Skip validation checks if an ingress
is marked as deleted #7216 is marked as deleted #7216
### 1.0.0-beta.3
** This is a breaking change**
This release only supports Kubernetes versions >= v1.19. The support for Ingress Object in `networking.k8s.io/v1beta` is being dropped and manifests should now use `networking.k8s.io/v1`.
**Image:**
- `k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695`
Changes:
- [X] [#7487](https://github.com/kubernetes/ingress-nginx/pull/7487)[Cherry - Pick] - Fix default backend annotation and tests
- [X] [#7459](https://github.com/kubernetes/ingress-nginx/pull/7459) Add controller.watchIngressWithoutClass config option
- [X] [#7478](https://github.com/kubernetes/ingress-nginx/pull/7478) Release new helm chart with certgen fixed
### 1.0.0-beta.1
**THIS IS A BREAKING CHANGE**
This release only supports Kubernetes versions >= v1.19. The support for Ingress Object in `networking.k8s.io/v1beta` is being dropped and manifests should now use `networking.k8s.io/v1`.
**Image:**
- `k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.1@sha256:f058f3fdc940095957695829745956c6acddcaef839907360965e27fd3348e2e`
_ New Features:_
_Changes:_
- [X] [#7341](https://github.com/kubernetes/ingress-nginx/pull/7341) Fix IngressClass logic for newer releases (#7341)
- [X] [#7355](https://github.com/kubernetes/ingress-nginx/pull/7355) Downgrade Lua modules for s390x (#7355)
- [X] [#7319](https://github.com/kubernetes/ingress-nginx/pull/7319) Lower webhook timeout for digital ocean (#7319)
- [X] [#7161](https://github.com/kubernetes/ingress-nginx/pull/7161) fix: allow scope/tcp/udp configmap namespace to altered (#7161)
- [X] [#7331](https://github.com/kubernetes/ingress-nginx/pull/7331) Fix forwarding of auth-response-headers to gRPC backends (#7331)
- [X] [#7332](https://github.com/kubernetes/ingress-nginx/pull/7332) controller: ignore non-service backends (#7332)
### 1.0.0-alpha.2
**THIS IS A BREAKING CHANGE**
This release only supports Kubernetes versions >= v1.19. The support for Ingress Object in `networking.k8s.io/v1beta` is being dropped and manifests should now use `networking.k8s.io/v1`.
**Image:**
- `k8s.gcr.io/ingress-nginx/controller:v1.0.0-alpha.2@sha256:04a0ad3a1279c2a58898e789eed767eafa138ee1e5b9b23a988c6e8485cf958d`
_ New Features:_
- [X] [#7314](https://github.com/kubernetes/ingress-nginx/pull/7314) Add configuration to disable external name service feature
- [X] [#7313](https://github.com/kubernetes/ingress-nginx/pull/7313) Add file containing stable release
- [X] [#7311](https://github.com/kubernetes/ingress-nginx/pull/7311) Handle named (non-numeric) ports correctly
- [X] [#7308](https://github.com/kubernetes/ingress-nginx/pull/7308) Updated v1beta1 to v1 as its deprecated
- [X] [#7298](https://github.com/kubernetes/ingress-nginx/pull/7298) Speed up admission hook by eliminating deep copy of Ingresses in CheckIngress
- [X] [#7242](https://github.com/kubernetes/ingress-nginx/pull/7242) Retry to download maxmind DB if it fails
- [X] [#7228](https://github.com/kubernetes/ingress-nginx/pull/7228) Discover mounted geoip db files
- [X] [#7208](https://github.com/kubernetes/ingress-nginx/pull/7208) ingress/tcp: add additional error logging on failed
- [X] [#7190](https://github.com/kubernetes/ingress-nginx/pull/7190) chart: using Helm builtin capabilities check
- [X] [#7146](https://github.com/kubernetes/ingress-nginx/pull/7146) Use ENV expansion for namespace in args
- [X] [#7107](https://github.com/kubernetes/ingress-nginx/pull/7107) Fix MaxWorkerOpenFiles calculation on high cores nodes
- [X] [#7076](https://github.com/kubernetes/ingress-nginx/pull/7076) Rewrite clean-nginx-conf.sh in Go to speed up admission webhook
- [X] [#7031](https://github.com/kubernetes/ingress-nginx/pull/7031) Remove mercurial from build
- [X] [#6990](https://github.com/kubernetes/ingress-nginx/pull/6990) Use listen to ensure the port is free
- [X] [#6944](https://github.com/kubernetes/ingress-nginx/pull/6944) Update proper default value for HTTP2MaxConcurrentStreams in Docs
- [X] [#6940](https://github.com/kubernetes/ingress-nginx/pull/6940) Fix definition order of modsecurity directives
### 1.0.0-alpha.1
**THIS IS A BREAKING CHANGE**
This release only supports Kubernetes versions >= v1.19. The support for Ingress Object in `networking.k8s.io/v1beta` is being dropped and manifests should now use `networking.k8s.io/v1`.
**Image:**
- `k8s.gcr.io/ingress-nginx/controller:v1.0.0-alpha.1@sha256:32f3f02a038c0d7cf33b71a14028c3a4ddee6f4c3fe5fadfa14b915e5e0d9faf`
_ New Features:_
- [X] [#7156] Drops support for Ingress Object v1beta1
### 0.47.0 ### 0.47.0
**Image:** **Image:**

1
README.md
View file

@ -30,6 +30,7 @@ For detailed changes on the `ingress-nginx` helm chart, please check the followi
| Ingress-nginx version | k8s supported version | Alpine Version | Nginx Version | | Ingress-nginx version | k8s supported version | Alpine Version | Nginx Version |
|-----------------------|------------- |----------------|---------------| |-----------------------|------------- |----------------|---------------|
| v1.0.0-beta.1 | 1.22, 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 |
| v1.0.0-alpha.2 | 1.22, 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | | v1.0.0-alpha.2 | 1.22, 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 |
| v1.0.0-alpha.1 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | | v1.0.0-alpha.1 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 |
| v0.49.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 | | v0.49.0 | 1.21, 1.20, 1.19 | 3.13.5 | 1.20.1 |

2
RELEASE.md
View file

@ -75,4 +75,6 @@ The sha is available in output from [cloud build](https://console.cloud.google.c
* Update Supported versions in the Support Versions table in the README.md * Update Supported versions in the Support Versions table in the README.md
* Merge * Merge
* Update the stable.txt file to reflect the release to be created
7. Github release 7. Github release

2
TAG
View file

@ -1 +1 @@
v0.49.0 v1.0.0-beta.3

12
charts/ingress-nginx/Chart.yaml
View file

@ -2,8 +2,8 @@ apiVersion: v2
name: ingress-nginx name: ingress-nginx
# When the version is modified, make sure the artifacthub.io/changes list is updated # When the version is modified, make sure the artifacthub.io/changes list is updated
# Also update CHANGELOG.md # Also update CHANGELOG.md
version: 3.36.0 version: 4.0.0-beta.3
appVersion: 0.49.0 appVersion: 1.0.0-beta.3
home: https://github.com/kubernetes/ingress-nginx home: https://github.com/kubernetes/ingress-nginx
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer 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 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
@ -16,10 +16,12 @@ type: application
maintainers: maintainers:
- name: ChiefAlexander - name: ChiefAlexander
engine: gotpl engine: gotpl
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.19.0-0"
annotations: annotations:
# Use this annotation to indicate that this chart version is a pre-release.
# https://artifacthub.io/docs/topics/annotations/helm/
artifacthub.io/prerelease: "true"
# List of changes for the release in artifacthub.io # List of changes for the release in artifacthub.io
# https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog # https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
artifacthub.io/changes: | artifacthub.io/changes: |
- Migrate the webhook-certgen program inside ingress repo. - Fix default backend annotation and tests
- Fix forwarding of auth-response-headers to gRPC backends

7
charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml Normal file
View file

@ -0,0 +1,7 @@
controller:
watchIngressWithoutClass: true
ingressClassResource:
name: custom-nginx
enabled: true
default: true
controllerValue: "k8s.io/custom-nginx"

4
charts/ingress-nginx/ci/daemonset-customconfig-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
kind: DaemonSet kind: DaemonSet
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false

4
charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false

4
charts/ingress-nginx/ci/daemonset-headers-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
addHeaders: addHeaders:

4
charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/daemonset-nodeport-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/daemonset-podannotations-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
metrics: metrics:

4
charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/daemonset-tcp-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deamonset-default-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deamonset-metrics-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
metrics: metrics:

4
charts/ingress-nginx/ci/deamonset-psp-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: true enabled: true
service: service:

4
charts/ingress-nginx/ci/deamonset-webhook-values.yaml
View file

@ -1,5 +1,9 @@
controller: controller:
kind: DaemonSet kind: DaemonSet
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: true enabled: true
service: service:

4
charts/ingress-nginx/ci/deployment-autoscaling-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
autoscaling: autoscaling:
enabled: true enabled: true
admissionWebhooks: admissionWebhooks:

4
charts/ingress-nginx/ci/deployment-customconfig-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
config: config:
use-proxy-protocol: "true" use-proxy-protocol: "true"
admissionWebhooks: admissionWebhooks:

4
charts/ingress-nginx/ci/deployment-customnodeport-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deployment-default-values.yaml
View file

@ -1,4 +1,8 @@
# Left blank to test default values # Left blank to test default values
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
service: service:
type: ClusterIP type: ClusterIP

4
charts/ingress-nginx/ci/deployment-headers-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
addHeaders: addHeaders:

4
charts/ingress-nginx/ci/deployment-internal-lb-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deployment-metrics-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
metrics: metrics:

4
charts/ingress-nginx/ci/deployment-nodeport-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deployment-podannotations-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
metrics: metrics:

4
charts/ingress-nginx/ci/deployment-psp-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
service: service:
type: ClusterIP type: ClusterIP

4
charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: false enabled: false
service: service:

4
charts/ingress-nginx/ci/deployment-tcp-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
service: service:
type: ClusterIP type: ClusterIP

4
charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: true enabled: true
service: service:

4
charts/ingress-nginx/ci/deployment-webhook-values.yaml
View file

@ -1,4 +1,8 @@
controller: controller:
image:
repository: ingress-controller/controller
tag: 1.0.0-dev
digest: null
admissionWebhooks: admissionWebhooks:
enabled: true enabled: true
service: service:

2
charts/ingress-nginx/templates/NOTES.txt
View file

@ -29,7 +29,7 @@ Get the application URL by running these commands:
An example Ingress that makes use of the controller: An example Ingress that makes use of the controller:
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

5
charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
View file

@ -18,7 +18,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -28,12 +28,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: {{ .Release.Namespace | quote }} namespace: {{ .Release.Namespace | quote }}
name: {{ include "ingress-nginx.controller.fullname" . }}-admission name: {{ include "ingress-nginx.controller.fullname" . }}-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
{{- if .Values.controller.admissionWebhooks.timeoutSeconds }} {{- if .Values.controller.admissionWebhooks.timeoutSeconds }}
timeoutSeconds: {{ .Values.controller.admissionWebhooks.timeoutSeconds }} timeoutSeconds: {{ .Values.controller.admissionWebhooks.timeoutSeconds }}
{{- end }} {{- end }}

8
charts/ingress-nginx/templates/clusterrole.yaml
View file

@ -48,8 +48,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- "networking.k8s.io" # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -64,14 +63,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- "networking.k8s.io" # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- "networking.k8s.io" # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:

15
charts/ingress-nginx/templates/controller-daemonset.yaml
View file

@ -77,22 +77,22 @@ spec:
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
{{- if .Values.defaultBackend.enabled }} {{- if .Values.defaultBackend.enabled }}
- --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }} - --default-backend-service=$(POD_NAMESPACE)/{{ include "ingress-nginx.defaultBackend.fullname" . }}
{{- end }} {{- end }}
{{- if .Values.controller.publishService.enabled }} {{- if .Values.controller.publishService.enabled }}
- --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }} - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
{{- end }} {{- end }}
- --election-id={{ .Values.controller.electionID }} - --election-id={{ .Values.controller.electionID }}
- --ingress-class={{ .Values.controller.ingressClass }} - --controller-class={{ .Values.controller.ingressClassResource.controllerValue }}
- --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }} - --configmap={{ default "$(POD_NAMESPACE)" .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.tcp }} {{- if .Values.tcp }}
- --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp - --tcp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
{{- end }} {{- end }}
{{- if .Values.udp }} {{- if .Values.udp }}
- --udp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-udp - --udp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
{{- end }} {{- end }}
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }} - --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}
{{- end }} {{- end }}
{{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }} {{- if and .Values.controller.reportNodeInternalIp .Values.controller.hostNetwork }}
- --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }} - --report-node-internal-ip-address={{ .Values.controller.reportNodeInternalIp }}
@ -111,6 +111,9 @@ spec:
{{- if not (eq .Values.controller.healthCheckPath "/healthz") }} {{- if not (eq .Values.controller.healthCheckPath "/healthz") }}
- --health-check-path={{ .Values.controller.healthCheckPath }} - --health-check-path={{ .Values.controller.healthCheckPath }}
{{- end }} {{- end }}
{{- if .Values.controller.watchIngressWithoutClass }}
- --watch-ingress-without-class=true
{{- end }}
{{- range $key, $value := .Values.controller.extraArgs }} {{- range $key, $value := .Values.controller.extraArgs }}
{{- /* Accept keys without values or with false as value */}} {{- /* Accept keys without values or with false as value */}}
{{- if eq ($value | quote | len) 2 }} {{- if eq ($value | quote | len) 2 }}

11
charts/ingress-nginx/templates/controller-deployment.yaml
View file

@ -87,13 +87,13 @@ spec:
- --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }} - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
{{- end }} {{- end }}
- --election-id={{ .Values.controller.electionID }} - --election-id={{ .Values.controller.electionID }}
- --ingress-class={{ .Values.controller.ingressClass }} - --controller-class={{ .Values.controller.ingressClassResource.controllerValue }}
- --configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.controller.fullname" . }} - --configmap={{ default "$(POD_NAMESPACE)" .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.tcp }} {{- if .Values.tcp }}
- --tcp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-tcp - --tcp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
{{- end }} {{- end }}
{{- if .Values.udp }} {{- if .Values.udp }}
- --udp-services-configmap=$(POD_NAMESPACE)/{{ include "ingress-nginx.fullname" . }}-udp - --udp-services-configmap={{ default "$(POD_NAMESPACE)" .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
{{- end }} {{- end }}
{{- if .Values.controller.scope.enabled }} {{- if .Values.controller.scope.enabled }}
- --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }} - --watch-namespace={{ default "$(POD_NAMESPACE)" .Values.controller.scope.namespace }}
@ -112,6 +112,9 @@ spec:
{{- if not (eq .Values.controller.healthCheckPath "/healthz") }} {{- if not (eq .Values.controller.healthCheckPath "/healthz") }}
- --health-check-path={{ .Values.controller.healthCheckPath }} - --health-check-path={{ .Values.controller.healthCheckPath }}
{{- end }} {{- end }}
{{- if .Values.controller.watchIngressWithoutClass }}
- --watch-ingress-without-class=true
{{- end }}
{{- range $key, $value := .Values.controller.extraArgs }} {{- range $key, $value := .Values.controller.extraArgs }}
{{- /* Accept keys without values or with false as value */}} {{- /* Accept keys without values or with false as value */}}
{{- if eq ($value | quote | len) 2 }} {{- if eq ($value | quote | len) 2 }}

12
charts/ingress-nginx/templates/controller-ingressclass.yaml
View file

@ -1,9 +1,7 @@
{{- if and (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) (.Values.controller.ingressClassResource.enabled) -}} {{- if .Values.controller.ingressClassResource.enabled -}}
{{- if and (semverCompare "=1.18-0" .Capabilities.KubeVersion.GitVersion) }} # We don't support namespaced ingressClass yet
apiVersion: networking.k8s.io/v1beta1 # So a ClusterRole and a ClusterRoleBinding is required
{{- else }}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
{{- end }}
kind: IngressClass kind: IngressClass
metadata: metadata:
labels: labels:
@ -12,12 +10,12 @@ metadata:
{{- with .Values.controller.labels }} {{- with .Values.controller.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
name: {{ .Values.controller.ingressClass }} name: {{ .Values.controller.ingressClassResource.name }}
{{- if .Values.controller.ingressClassResource.default }} {{- if .Values.controller.ingressClassResource.default }}
annotations: annotations:
ingressclass.kubernetes.io/is-default-class: "true" ingressclass.kubernetes.io/is-default-class: "true"
{{- end }} {{- end }}
spec: spec:
controller: k8s.io/ingress-nginx controller: {{ .Values.controller.ingressClassResource.controllerValue }}
{{ template "ingressClass.parameters" . }} {{ template "ingressClass.parameters" . }}
{{- end }} {{- end }}

10
charts/ingress-nginx/templates/controller-role.yaml
View file

@ -34,8 +34,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- "networking.k8s.io" # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -43,14 +42,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- "networking.k8s.io" # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- "networking.k8s.io" # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -62,7 +60,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- {{ .Values.controller.electionID }}-{{ .Values.controller.ingressClass }} - {{ .Values.controller.electionID }}
verbs: verbs:
- get - get
- update - update

2
charts/ingress-nginx/templates/controller-servicemonitor.yaml
View file

@ -1,4 +1,4 @@
{{- if and .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled -}} {{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled -}}
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:

34
charts/ingress-nginx/values.yaml
View file

@ -15,8 +15,8 @@ controller:
# for backwards compatibility consider setting the full image url via the repository value below # 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 # use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
# repository: # repository:
tag: "v0.49.0" tag: "v1.0.0-beta.3"
digest: sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef digest: sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# www-data -> uid 101 # www-data -> uid 101
runAsUser: 101 runAsUser: 101
@ -61,6 +61,11 @@ controller:
# Ingress status was blank because there is no Service exposing the NGINX Ingress controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply # Ingress status was blank because there is no Service exposing the NGINX Ingress controller in a configuration using the host network, the default --publish-service flag used in standard cloud setups does not apply
reportNodeInternalIp: false reportNodeInternalIp: false
# Process Ingress objects without ingressClass annotation/ingressClassName field
# Overrides value for --watch-ingress-without-class flag of the controller binary
# Defaults to false
watchIngressWithoutClass: false
# Required for use with CNI based kubernetes installations (such as ones set up by kubeadm), # Required for use with CNI based kubernetes installations (such as ones set up by kubeadm),
# since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920 # since CNI and hostport don't mix yet. Can be deprecated once https://github.com/kubernetes/kubernetes/issues/23920
# is merged # is merged
@ -79,15 +84,13 @@ controller:
## ##
electionID: ingress-controller-leader electionID: ingress-controller-leader
## Name of the ingress class to route through this controller
##
ingressClass: nginx
# This section refers to the creation of the IngressClass resource # This section refers to the creation of the IngressClass resource
# IngressClass resources are supported since k8s >= 1.18 # IngressClass resources are supported since k8s >= 1.18 and required since k8s >= 1.19
ingressClassResource: ingressClassResource:
enabled: false name: nginx
enabled: true
default: false default: false
controllerValue: "k8s.io/ingress-nginx"
# Parameters is a link to a custom resource containing additional # Parameters is a link to a custom resource containing additional
# configuration for the controller. This is optional if the controller # configuration for the controller. This is optional if the controller
@ -124,23 +127,23 @@ controller:
## ##
scope: scope:
enabled: false enabled: false
namespace: "" # defaults to .Release.Namespace namespace: "" # defaults to $(POD_NAMESPACE)
## Allows customization of the configmap / nginx-configmap namespace ## Allows customization of the configmap / nginx-configmap namespace
## ##
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Allows customization of the tcp-services-configmap ## Allows customization of the tcp-services-configmap
## ##
tcp: tcp:
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Annotations to be added to the tcp config configmap ## Annotations to be added to the tcp config configmap
annotations: {} annotations: {}
## Allows customization of the udp-services-configmap ## Allows customization of the udp-services-configmap
## ##
udp: udp:
configMapNamespace: "" # defaults to .Release.Namespace configMapNamespace: "" # defaults to $(POD_NAMESPACE)
## Annotations to be added to the udp config configmap ## Annotations to be added to the udp config configmap
annotations: {} annotations: {}
@ -544,12 +547,13 @@ controller:
patch: patch:
enabled: true enabled: true
image: image:
registry: docker.io registry: k8s.gcr.io
image: jettech/kube-webhook-certgen image: ingress-nginx/kube-webhook-certgen
# for backwards compatibility consider setting the full image url via the repository value below # 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 # use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
# repository: # repository:
tag: v1.5.1 tag: v1.0
digest: sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Provide a priority class name to the webhook patching job ## Provide a priority class name to the webhook patching job
## ##

35
cmd/nginx/flags.go
View file

@ -24,10 +24,10 @@ import (
"github.com/spf13/pflag" "github.com/spf13/pflag"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/controller" "k8s.io/ingress-nginx/internal/ingress/controller"
ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config" ngx_config "k8s.io/ingress-nginx/internal/ingress/controller/config"
"k8s.io/ingress-nginx/internal/ingress/controller/ingressclass"
"k8s.io/ingress-nginx/internal/ingress/status" "k8s.io/ingress-nginx/internal/ingress/status"
ing_net "k8s.io/ingress-nginx/internal/net" ing_net "k8s.io/ingress-nginx/internal/net"
"k8s.io/ingress-nginx/internal/nginx" "k8s.io/ingress-nginx/internal/nginx"
@ -55,10 +55,18 @@ only when the flag --apiserver-host is specified.`)
Takes the form "namespace/name". The controller configures NGINX to forward Takes the form "namespace/name". The controller configures NGINX to forward
requests to the first port of this Service.`) requests to the first port of this Service.`)
ingressClass = flags.String("ingress-class", "", ingressClassAnnotation = flags.String("ingress-class", ingressclass.DefaultAnnotationValue,
`Name of the ingress class this controller satisfies. `[IN DEPRECATION] Name of the ingress class this controller satisfies.
The class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.18.0 or higher or the annotation "kubernetes.io/ingress.class" (deprecated). The class of an Ingress object is set using the annotation "kubernetes.io/ingress.class" (deprecated).
If this parameter is not set, or set to the default value of "nginx", it will handle ingresses with either an empty or "nginx" class name.`) The parameter --controller-class has precedence over this.`)
ingressClassController = flags.String("controller-class", ingressclass.DefaultControllerName,
`Ingress Class Controller value this Ingress satisfies.
The class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.19.0 or higher. The .spec.controller value of the IngressClass
referenced in an Ingress Object should be the same value specified here to make this object be watched.`)
watchWithoutClass = flags.Bool("watch-ingress-without-class", false,
`Define if Ingress Controller should also watch for Ingresses without an IngressClass or the annotation specified`)
configMap = flags.String("configmap", "", configMap = flags.String("configmap", "",
`Name of the ConfigMap containing custom global configurations for the controller.`) `Name of the ConfigMap containing custom global configurations for the controller.`)
@ -207,18 +215,6 @@ https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-g
status.UpdateInterval = *statusUpdateInterval status.UpdateInterval = *statusUpdateInterval
} }
if *ingressClass != "" {
klog.InfoS("Watching for Ingress", "class", *ingressClass)
if *ingressClass != class.DefaultClass {
klog.Warningf("Only Ingresses with class %q will be processed by this Ingress controller", *ingressClass)
} else {
klog.Warning("Ingresses with an empty class will also be processed by this Ingress controller")
}
class.IngressClass = *ingressClass
}
parser.AnnotationsPrefix = *annotationsPrefix parser.AnnotationsPrefix = *annotationsPrefix
// check port collisions // check port collisions
@ -297,6 +293,11 @@ https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-g
HTTPS: *httpsPort, HTTPS: *httpsPort,
SSLProxy: *sslProxyPort, SSLProxy: *sslProxyPort,
}, },
IngressClassConfiguration: &ingressclass.IngressClassConfiguration{
Controller: *ingressClassController,
AnnotationValue: *ingressClassAnnotation,
WatchWithoutClass: *watchWithoutClass,
},
DisableCatchAll: *disableCatchAll, DisableCatchAll: *disableCatchAll,
ValidationWebhook: *validationWebhook, ValidationWebhook: *validationWebhook,
ValidationWebhookCertPath: *validationWebhookCert, ValidationWebhookCertPath: *validationWebhookCert,

32
cmd/nginx/main.go
View file

@ -43,7 +43,6 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/ingress/controller" "k8s.io/ingress-nginx/internal/ingress/controller"
"k8s.io/ingress-nginx/internal/ingress/metric" "k8s.io/ingress-nginx/internal/ingress/metric"
"k8s.io/ingress-nginx/internal/k8s" "k8s.io/ingress-nginx/internal/k8s"
@ -104,35 +103,16 @@ func main() {
conf.FakeCertificate = ssl.GetFakeSSLCert() conf.FakeCertificate = ssl.GetFakeSSLCert()
klog.InfoS("SSL fake certificate created", "file", conf.FakeCertificate.PemFileName) klog.InfoS("SSL fake certificate created", "file", conf.FakeCertificate.PemFileName)
var isNetworkingIngressAvailable bool if !k8s.NetworkingIngressAvailable(kubeClient) {
klog.Fatalf("ingress-nginx requires Kubernetes v1.19.0 or higher")
isNetworkingIngressAvailable, k8s.IsIngressV1Beta1Ready, _ = k8s.NetworkingIngressAvailable(kubeClient)
if !isNetworkingIngressAvailable {
klog.Fatalf("ingress-nginx requires Kubernetes v1.14.0 or higher")
} }
if k8s.IsIngressV1Beta1Ready { _, err = kubeClient.NetworkingV1().IngressClasses().List(context.TODO(), metav1.ListOptions{})
klog.InfoS("Enabling new Ingress features available since Kubernetes v1.18")
k8s.IngressClass, err = kubeClient.NetworkingV1beta1().IngressClasses().
Get(context.TODO(), class.IngressClass, metav1.GetOptions{})
if err != nil { if err != nil {
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
if !errors.IsUnauthorized(err) && !errors.IsForbidden(err) { if errors.IsUnauthorized(err) || !errors.IsForbidden(err) {
klog.Fatalf("Error searching IngressClass: %v", err) klog.Fatalf("Error searching IngressClass: Please verify your RBAC and allow Ingress Controller to list and get Ingress Classes: %v", err)
} }
klog.ErrorS(err, "Searching IngressClass", "class", class.IngressClass)
}
klog.Warningf("No IngressClass resource with name %v found. Only annotation will be used.", class.IngressClass)
// TODO: remove once this is fixed in client-go
k8s.IngressClass = nil
}
if k8s.IngressClass != nil && k8s.IngressClass.Spec.Controller != k8s.IngressNGINXController {
klog.Errorf(`Invalid IngressClass (Spec.Controller) value "%v". Should be "%v"`, k8s.IngressClass.Spec.Controller, k8s.IngressNGINXController)
klog.Fatalf("IngressClass with name %v is not valid for ingress-nginx (invalid Spec.Controller)", class.IngressClass)
} }
} }
@ -153,7 +133,7 @@ func main() {
mc := metric.NewDummyCollector() mc := metric.NewDummyCollector()
if conf.EnableMetrics { if conf.EnableMetrics {
mc, err = metric.NewCollector(conf.MetricsPerHost, reg) mc, err = metric.NewCollector(conf.MetricsPerHost, reg, conf.IngressClassConfiguration.Controller)
if err != nil { if err != nil {
klog.Fatalf("Error creating prometheus collector: %v", err) klog.Fatalf("Error creating prometheus collector: %v", err)
} }

29
cmd/plugin/commands/ingresses/ingresses.go
View file

@ -22,7 +22,8 @@ import (
"text/tabwriter" "text/tabwriter"
"github.com/spf13/cobra" "github.com/spf13/cobra"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/ingress-nginx/cmd/plugin/request" "k8s.io/ingress-nginx/cmd/plugin/request"
@ -157,9 +158,10 @@ func getIngressRows(ingresses *[]networking.Ingress) []ingressRow {
defaultBackendService := "" defaultBackendService := ""
defaultBackendPort := "" defaultBackendPort := ""
if ing.Spec.Backend != nil { if ing.Spec.DefaultBackend != nil {
defaultBackendService = ing.Spec.Backend.ServiceName name, port := serviceToNameAndPort(ing.Spec.DefaultBackend.Service)
defaultBackendPort = ing.Spec.Backend.ServicePort.String() defaultBackendService = name
defaultBackendPort = port.String()
} }
// Handle catch-all ingress // Handle catch-all ingress
@ -197,14 +199,15 @@ func getIngressRows(ingresses *[]networking.Ingress) []ingressRow {
} }
for _, path := range rule.HTTP.Paths { for _, path := range rule.HTTP.Paths {
svcName, svcPort := serviceToNameAndPort(path.Backend.Service)
row := ingressRow{ row := ingressRow{
Namespace: ing.Namespace, Namespace: ing.Namespace,
IngressName: ing.Name, IngressName: ing.Name,
Host: rule.Host, Host: rule.Host,
Path: path.Path, Path: path.Path,
TLS: hasTLS, TLS: hasTLS,
ServiceName: path.Backend.ServiceName, ServiceName: svcName,
ServicePort: path.Backend.ServicePort.String(), ServicePort: svcPort.String(),
Address: address, Address: address,
} }
@ -215,3 +218,17 @@ func getIngressRows(ingresses *[]networking.Ingress) []ingressRow {
return rows return rows
} }
func serviceToNameAndPort(svc *networking.IngressServiceBackend) (string, intstr.IntOrString) {
var svcName string
if svc != nil {
svcName = svc.Name
if svc.Port.Number > 0 {
return svcName, intstr.FromInt(int(svc.Port.Number))
}
if svc.Port.Name != "" {
return svcName, intstr.FromString(svc.Port.Name)
}
}
return "", intstr.IntOrString{}
}

75
cmd/plugin/commands/ingresses/ingresses_test.go Normal file
View file

@ -0,0 +1,75 @@
/*
Copyright 2021 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package ingresses
import (
"testing"
networking "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/intstr"
)
func TestGetIngressInformation(t *testing.T) {
testcases := map[string]struct {
ServiceBackend *networking.IngressServiceBackend
wantName string
wantPort intstr.IntOrString
}{
"empty ingressServiceBackend": {
ServiceBackend: &networking.IngressServiceBackend{},
wantName: "",
wantPort: intstr.IntOrString{},
},
"ingressServiceBackend with port 8080": {
ServiceBackend: &networking.IngressServiceBackend{
Name: "test",
Port: networking.ServiceBackendPort{
Number: 8080,
},
},
wantName: "test",
wantPort: intstr.IntOrString{
Type: intstr.Int,
IntVal: 8080,
},
},
"ingressServiceBackend with port name a-svc": {
ServiceBackend: &networking.IngressServiceBackend{
Name: "test",
Port: networking.ServiceBackendPort{
Name: "a-svc",
},
},
wantName: "test",
wantPort: intstr.IntOrString{
Type: intstr.String,
StrVal: "a-svc",
},
},
}
for title, testCase := range testcases {
gotName, gotPort := serviceToNameAndPort(testCase.ServiceBackend)
if gotName != testCase.wantName {
t.Fatalf("%s: expected '%v' but returned %v", title, testCase.wantName, gotName)
}
if gotPort != testCase.wantPort {
t.Fatalf("%s: expected '%v' but returned %v", title, testCase.wantPort, gotPort)
}
}
}

2
cmd/plugin/commands/lint/main.go
View file

@ -22,7 +22,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1" kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"

2
cmd/plugin/lints/ingress.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"strings" "strings"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
kmeta "k8s.io/apimachinery/pkg/apis/meta/v1" kmeta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/cmd/plugin/util" "k8s.io/ingress-nginx/cmd/plugin/util"
) )

4
cmd/plugin/request/request.go
View file

@ -22,12 +22,12 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
typednetworking "k8s.io/client-go/kubernetes/typed/networking/v1beta1" typednetworking "k8s.io/client-go/kubernetes/typed/networking/v1"
"k8s.io/ingress-nginx/cmd/plugin/util" "k8s.io/ingress-nginx/cmd/plugin/util"
) )

127
deploy/static/provider/aws/deploy-tls-termination.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,16 +28,16 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
namespace: ingress-nginx namespace: ingress-nginx
data: data:
http-snippet: | http-snippet:|
server{ server{
listen 2443; listen 2443;
return 308 https://$host$request_uri; return 308 https://$host$request_uri;
@ -50,10 +50,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -83,8 +83,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -99,14 +98,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -119,10 +117,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -139,10 +137,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -174,8 +172,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -183,14 +180,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -202,7 +198,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -225,10 +221,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -247,10 +243,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -278,10 +274,10 @@ metadata:
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
service.beta.kubernetes.io/aws-load-balancer-type: elb service.beta.kubernetes.io/aws-load-balancer-type: elb
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -308,10 +304,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -334,7 +330,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -345,7 +341,7 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -419,6 +415,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -426,10 +440,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -440,7 +454,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -450,12 +464,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -467,10 +480,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -483,10 +496,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -507,10 +520,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -532,10 +545,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -557,10 +570,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -582,10 +595,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -593,16 +606,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -632,10 +645,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -643,16 +656,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

125
deploy/static/provider/aws/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -43,10 +43,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -76,8 +76,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -92,14 +91,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -112,10 +110,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -132,10 +130,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -167,8 +165,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -176,14 +173,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -195,7 +191,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -218,10 +214,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -240,10 +236,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -268,10 +264,10 @@ metadata:
service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true' service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: 'true'
service.beta.kubernetes.io/aws-load-balancer-type: nlb service.beta.kubernetes.io/aws-load-balancer-type: nlb
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -298,10 +294,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -324,7 +320,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -335,7 +331,7 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -406,6 +402,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -413,10 +427,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -427,7 +441,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -437,12 +451,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -454,10 +467,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -470,10 +483,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -494,10 +507,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -519,10 +532,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -544,10 +557,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -569,10 +582,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -580,16 +593,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -619,10 +632,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -630,16 +643,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

125
deploy/static/provider/baremetal/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -43,10 +43,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -76,8 +76,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -92,14 +91,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -112,10 +110,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -132,10 +130,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -167,8 +165,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -176,14 +173,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -195,7 +191,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -218,10 +214,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -240,10 +236,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -265,10 +261,10 @@ kind: Service
metadata: metadata:
annotations: annotations:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -294,10 +290,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -320,7 +316,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -330,7 +326,7 @@ spec:
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -401,6 +397,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -408,10 +422,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -422,7 +436,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -432,12 +446,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -449,10 +462,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -465,10 +478,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -489,10 +502,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -514,10 +527,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -539,10 +552,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -564,10 +577,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -575,16 +588,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -614,10 +627,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -625,16 +638,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

125
deploy/static/provider/cloud/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -43,10 +43,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -76,8 +76,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -92,14 +91,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -112,10 +110,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -132,10 +130,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -167,8 +165,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -176,14 +173,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -195,7 +191,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -218,10 +214,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -240,10 +236,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -265,10 +261,10 @@ kind: Service
metadata: metadata:
annotations: annotations:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -295,10 +291,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -321,7 +317,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -332,7 +328,7 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -403,6 +399,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -410,10 +424,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -424,7 +438,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -434,12 +448,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -451,10 +464,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -467,10 +480,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -491,10 +504,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -516,10 +529,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -541,10 +554,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -566,10 +579,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -577,16 +590,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -616,10 +629,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -627,16 +640,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

126
deploy/static/provider/do/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -44,10 +44,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -77,8 +77,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -93,14 +92,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -113,10 +111,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -133,10 +131,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -168,8 +166,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -177,14 +174,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -196,7 +192,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -219,10 +215,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -241,10 +237,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -267,10 +263,10 @@ metadata:
annotations: annotations:
service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: 'true' service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: 'true'
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -297,10 +293,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -323,7 +319,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -334,7 +330,7 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -405,6 +401,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -412,10 +426,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -426,7 +440,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -436,12 +450,12 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
timeoutSeconds: 29
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -453,10 +467,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -469,10 +483,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -493,10 +507,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -518,10 +532,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -543,10 +557,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -568,10 +582,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -579,16 +593,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -618,10 +632,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -629,16 +643,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

127
deploy/static/provider/exoscale/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -43,10 +43,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -76,8 +76,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -92,14 +91,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -112,10 +110,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -132,10 +130,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -167,8 +165,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -176,14 +173,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -195,7 +191,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -218,10 +214,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -240,10 +236,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -273,10 +269,10 @@ metadata:
service.beta.kubernetes.io/exoscale-loadbalancer-service-healthcheck-timeout: 3s service.beta.kubernetes.io/exoscale-loadbalancer-service-healthcheck-timeout: 3s
service.beta.kubernetes.io/exoscale-loadbalancer-service-strategy: source-hash service.beta.kubernetes.io/exoscale-loadbalancer-service-strategy: source-hash
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -303,10 +299,10 @@ apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -329,7 +325,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -340,8 +336,8 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=ingress-nginx/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
- --validating-webhook-key=/usr/local/certificates/key - --validating-webhook-key=/usr/local/certificates/key
@ -411,6 +407,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -418,10 +432,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -432,7 +446,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -442,12 +456,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -459,10 +472,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -475,10 +488,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -499,10 +512,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -524,10 +537,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -549,10 +562,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -574,10 +587,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -585,16 +598,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -624,10 +637,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -635,16 +648,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

125
deploy/static/provider/kind/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -43,10 +43,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -76,8 +76,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -92,14 +91,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -112,10 +110,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -132,10 +130,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -167,8 +165,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -176,14 +173,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -195,7 +191,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -218,10 +214,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -240,10 +236,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -265,10 +261,10 @@ kind: Service
metadata: metadata:
annotations: annotations:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -294,10 +290,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -324,7 +320,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -334,7 +330,7 @@ spec:
args: args:
- /nginx-ingress-controller - /nginx-ingress-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -413,6 +409,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -420,10 +434,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -434,7 +448,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -444,12 +458,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -461,10 +474,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -477,10 +490,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -501,10 +514,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -526,10 +539,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -551,10 +564,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -576,10 +589,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -587,16 +600,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -626,10 +639,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -637,16 +650,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

125
deploy/static/provider/scw/deploy.yaml
View file

@ -13,10 +13,10 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -28,10 +28,10 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -44,10 +44,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
rules: rules:
@ -77,8 +77,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -93,14 +92,13 @@ rules:
- create - create
- patch - patch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -113,10 +111,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
name: ingress-nginx name: ingress-nginx
roleRef: roleRef:
@ -133,10 +131,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -168,8 +166,7 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses - ingresses
verbs: verbs:
@ -177,14 +174,13 @@ rules:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- extensions - networking.k8s.io
- networking.k8s.io # k8s 1.14+
resources: resources:
- ingresses/status - ingresses/status
verbs: verbs:
- update - update
- apiGroups: - apiGroups:
- networking.k8s.io # k8s 1.14+ - networking.k8s.io
resources: resources:
- ingressclasses - ingressclasses
verbs: verbs:
@ -196,7 +192,7 @@ rules:
resources: resources:
- configmaps - configmaps
resourceNames: resourceNames:
- ingress-controller-leader-nginx - ingress-controller-leader
verbs: verbs:
- get - get
- update - update
@ -219,10 +215,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx name: ingress-nginx
@ -241,10 +237,10 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
@ -267,10 +263,10 @@ metadata:
annotations: annotations:
service.beta.kubernetes.io/scw-loadbalancer-proxy-protocol-v2: 'true' service.beta.kubernetes.io/scw-loadbalancer-proxy-protocol-v2: 'true'
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -297,10 +293,10 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller app.kubernetes.io/component: controller
name: ingress-nginx-controller name: ingress-nginx-controller
@ -323,7 +319,7 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: controller - name: controller
image: k8s.gcr.io/ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef image: k8s.gcr.io/ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
lifecycle: lifecycle:
preStop: preStop:
@ -334,7 +330,7 @@ spec:
- /nginx-ingress-controller - /nginx-ingress-controller
- --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller - --publish-service=$(POD_NAMESPACE)/ingress-nginx-controller
- --election-id=ingress-controller-leader - --election-id=ingress-controller-leader
- --ingress-class=nginx - --controller-class=k8s.io/ingress-nginx
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller - --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --validating-webhook=:8443 - --validating-webhook=:8443
- --validating-webhook-certificate=/usr/local/certificates/cert - --validating-webhook-certificate=/usr/local/certificates/cert
@ -405,6 +401,24 @@ spec:
secret: secret:
secretName: ingress-nginx-admission secretName: ingress-nginx-admission
--- ---
# Source: ingress-nginx/templates/controller-ingressclass.yaml
# We don't support namespaced ingressClass yet
# So a ClusterRole and a ClusterRoleBinding is required
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml # Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version # before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites # https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
@ -412,10 +426,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
name: ingress-nginx-admission name: ingress-nginx-admission
@ -426,7 +440,7 @@ webhooks:
- apiGroups: - apiGroups:
- networking.k8s.io - networking.k8s.io
apiVersions: apiVersions:
- v1beta1 - v1
operations: operations:
- CREATE - CREATE
- UPDATE - UPDATE
@ -436,12 +450,11 @@ webhooks:
sideEffects: None sideEffects: None
admissionReviewVersions: admissionReviewVersions:
- v1 - v1
- v1beta1
clientConfig: clientConfig:
service: service:
namespace: ingress-nginx namespace: ingress-nginx
name: ingress-nginx-controller-admission name: ingress-nginx-controller-admission
path: /networking/v1beta1/ingresses path: /networking/v1/ingresses
--- ---
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml # Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
apiVersion: v1 apiVersion: v1
@ -453,10 +466,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
--- ---
@ -469,10 +482,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -493,10 +506,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -518,10 +531,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
rules: rules:
@ -543,10 +556,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
roleRef: roleRef:
@ -568,10 +581,10 @@ metadata:
helm.sh/hook: pre-install,pre-upgrade helm.sh/hook: pre-install,pre-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -579,16 +592,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-create name: ingress-nginx-admission-create
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: create - name: create
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- create - create
@ -618,10 +631,10 @@ metadata:
helm.sh/hook: post-install,post-upgrade helm.sh/hook: post-install,post-upgrade
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
@ -629,16 +642,16 @@ spec:
metadata: metadata:
name: ingress-nginx-admission-patch name: ingress-nginx-admission-patch
labels: labels:
helm.sh/chart: ingress-nginx-3.36.0 helm.sh/chart: ingress-nginx-4.0.0-beta.3
app.kubernetes.io/name: ingress-nginx app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/version: 0.49.0 app.kubernetes.io/version: 1.0.0-beta.3
app.kubernetes.io/managed-by: Helm app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: admission-webhook app.kubernetes.io/component: admission-webhook
spec: spec:
containers: containers:
- name: patch - name: patch
image: docker.io/jettech/kube-webhook-certgen:v1.5.1 image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: args:
- patch - patch

2
docs/developer-guide/getting-started.md
View file

@ -68,7 +68,7 @@ FOCUS="no-auth-locations" make kind-e2e-test
Valid values are defined in the describe definition of the e2e tests like [Default Backend](https://github.com/kubernetes/ingress-nginx/blob/main/test/e2e/defaultbackend/default_backend.go#L29) Valid values are defined in the describe definition of the e2e tests like [Default Backend](https://github.com/kubernetes/ingress-nginx/blob/main/test/e2e/defaultbackend/default_backend.go#L29)
The complete list of tests can be found [here](e2e-tests.md) The complete list of tests can be found [here](../e2e-tests.md)
### Custom docker image ### Custom docker image

4
docs/examples/affinity/cookie/ingress-samesite.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: cookie-samesite-none name: cookie-samesite-none
@ -19,7 +19,7 @@ spec:
servicePort: 80 servicePort: 80
path: / path: /
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: cookie-samesite-strict name: cookie-samesite-strict

2
docs/examples/affinity/cookie/ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: nginx-test name: nginx-test

2
docs/examples/auth/basic/README.md
View file

@ -30,7 +30,7 @@ type: Opaque
```console ```console
echo " echo "
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: ingress-with-auth name: ingress-with-auth

2
docs/examples/auth/client-certs/ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

4
docs/examples/auth/external-auth/README.md
View file

@ -13,7 +13,7 @@ NAME HOSTS ADDRESS PORTS AGE
external-auth external-auth-01.sample.com 172.17.4.99 80 13s external-auth external-auth-01.sample.com 172.17.4.99 80 13s
$ kubectl get ing external-auth -o yaml $ kubectl get ing external-auth -o yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:
@ -23,7 +23,7 @@ metadata:
name: external-auth name: external-auth
namespace: default namespace: default
resourceVersion: "2068378" resourceVersion: "2068378"
selfLink: /apis/networking/v1beta1/namespaces/default/ingresses/external-auth selfLink: /apis/networking/v1/namespaces/default/ingresses/external-auth
uid: 5c388f1d-8970-11e6-9004-080027d2dc94 uid: 5c388f1d-8970-11e6-9004-080027d2dc94
spec: spec:
rules: rules:

2
docs/examples/auth/external-auth/ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

4
docs/examples/auth/oauth-external-auth/dashboard-ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:
@ -18,7 +18,7 @@ spec:
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: oauth2-proxy name: oauth2-proxy

2
docs/examples/chashsubset/deployment.yaml
View file

@ -54,7 +54,7 @@ spec:
targetPort: 8080 targetPort: 8080
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

2
docs/examples/customization/configuration-snippets/ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: nginx-configuration-snippet name: nginx-configuration-snippet

4
docs/examples/customization/external-auth-headers/deploy/echo-service.yaml
View file

@ -43,7 +43,7 @@ spec:
selector: selector:
k8s-app: demo-echo-service k8s-app: demo-echo-service
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: public-demo-echo-service name: public-demo-echo-service
@ -61,7 +61,7 @@ spec:
servicePort: 80 servicePort: 80
path: / path: /
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: secure-demo-echo-service name: secure-demo-echo-service

2
docs/examples/docker-registry/ingress-with-tls.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

2
docs/examples/docker-registry/ingress-without-tls.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

2
docs/examples/multi-tls/multi-tls.yaml
View file

@ -92,7 +92,7 @@ spec:
fieldPath: status.podIP fieldPath: status.podIP
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: foo-tls name: foo-tls

4
docs/examples/rewrite/README.md
View file

@ -34,7 +34,7 @@ Create an Ingress rule with a rewrite annotation:
```console ```console
$ echo ' $ echo '
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:
@ -66,7 +66,7 @@ For example, the ingress definition above will result in the following rewrites:
Create an Ingress rule with an app-root annotation: Create an Ingress rule with an app-root annotation:
``` ```
$ echo " $ echo "
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

2
docs/examples/static-ip/nginx-ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: ingress-nginx name: ingress-nginx

2
docs/examples/tls-termination/README.md
View file

@ -11,7 +11,7 @@ You need a [TLS cert](../PREREQUISITES.md#tls-certificates) and a [test HTTP ser
Create a `ingress.yaml` file. Create a `ingress.yaml` file.
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: nginx-test name: nginx-test

2
docs/examples/tls-termination/ingress.yaml
View file

@ -1,4 +1,4 @@
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: nginx-test name: nginx-test

2
docs/troubleshooting.md
View file

@ -32,7 +32,7 @@ Rules:
/tea tea-svc:80 (<none>) /tea tea-svc:80 (<none>)
/coffee coffee-svc:80 (<none>) /coffee coffee-svc:80 (<none>)
Annotations: Annotations:
kubectl.kubernetes.io/last-applied-configuration: {"apiVersion":"networking.k8s.io/v1beta1","kind":"Ingress","metadata":{"annotations":{},"name":"cafe-ingress","namespace":"default","selfLink":"/apis/networking/v1beta1/namespaces/default/ingresses/cafe-ingress"},"spec":{"rules":[{"host":"cafe.com","http":{"paths":[{"backend":{"serviceName":"tea-svc","servicePort":80},"path":"/tea"},{"backend":{"serviceName":"coffee-svc","servicePort":80},"path":"/coffee"}]}}]},"status":{"loadBalancer":{"ingress":[{"ip":"169.48.142.110"}]}}} kubectl.kubernetes.io/last-applied-configuration: {"apiVersion":"networking.k8s.io/v1","kind":"Ingress","metadata":{"annotations":{},"name":"cafe-ingress","namespace":"default","selfLink":"/apis/networking/v1/namespaces/default/ingresses/cafe-ingress"},"spec":{"rules":[{"host":"cafe.com","http":{"paths":[{"backend":{"serviceName":"tea-svc","servicePort":80},"path":"/tea"},{"backend":{"serviceName":"coffee-svc","servicePort":80},"path":"/coffee"}]}}]},"status":{"loadBalancer":{"ingress":[{"ip":"169.48.142.110"}]}}}
Events: Events:
Type Reason Age From Message Type Reason Age From Message

2
docs/user-guide/fcgi-services.md
View file

@ -60,7 +60,7 @@ data:
--- ---
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

8
docs/user-guide/ingress-path-matching.md
View file

@ -15,7 +15,7 @@ This can be enabled by setting the `nginx.ingress.kubernetes.io/use-regex` annot
See the [description](./nginx-configuration/annotations.md#use-regex) of the `use-regex` annotation for more details. See the [description](./nginx-configuration/annotations.md#use-regex) of the `use-regex` annotation for more details.
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress name: test-ingress
@ -51,7 +51,7 @@ In NGINX, regular expressions follow a **first match** policy. In order to enabl
Let the following two ingress definitions be created: Let the following two ingress definitions be created:
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress-1 name: test-ingress-1
@ -71,7 +71,7 @@ spec:
``` ```
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress-2 name: test-ingress-2
@ -125,7 +125,7 @@ This case is expected and a result of NGINX's a first match policy for paths tha
Let the following ingress be defined: Let the following ingress be defined:
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: test-ingress-3 name: test-ingress-3

2
docs/user-guide/nginx-configuration/annotations.md
View file

@ -394,7 +394,7 @@ For more information please see [the `server_name` documentation](http://nginx.o
Using the annotation `nginx.ingress.kubernetes.io/server-snippet` it is possible to add custom configuration in the server configuration block. Using the annotation `nginx.ingress.kubernetes.io/server-snippet` it is possible to add custom configuration in the server configuration block.
```yaml ```yaml
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
annotations: annotations:

19
docs/user-guide/nginx-configuration/configmap.md
View file

@ -54,7 +54,7 @@ The following table shows a configuration option's name, type, and the default v
|[http2-max-field-size](#http2-max-field-size)|string|"4k"| |[http2-max-field-size](#http2-max-field-size)|string|"4k"|
|[http2-max-header-size](#http2-max-header-size)|string|"16k"| |[http2-max-header-size](#http2-max-header-size)|string|"16k"|
|[http2-max-requests](#http2-max-requests)|int|1000| |[http2-max-requests](#http2-max-requests)|int|1000|
|[http2-max-concurrent-streams](#http2-max-concurrent-streams)|int|1000| |[http2-max-concurrent-streams](#http2-max-concurrent-streams)|int|128|
|[hsts](#hsts)|bool|"true"| |[hsts](#hsts)|bool|"true"|
|[hsts-include-subdomains](#hsts-include-subdomains)|bool|"true"| |[hsts-include-subdomains](#hsts-include-subdomains)|bool|"true"|
|[hsts-max-age](#hsts-max-age)|string|"15724800"| |[hsts-max-age](#hsts-max-age)|string|"15724800"|
@ -178,6 +178,9 @@ The following table shows a configuration option's name, type, and the default v
|[proxy-buffering](#proxy-buffering)|string|"off"| |[proxy-buffering](#proxy-buffering)|string|"off"|
|[limit-req-status-code](#limit-req-status-code)|int|503| |[limit-req-status-code](#limit-req-status-code)|int|503|
|[limit-conn-status-code](#limit-conn-status-code)|int|503| |[limit-conn-status-code](#limit-conn-status-code)|int|503|
|[enable-syslog](#enable-syslog)|bool|false|
|[syslog-host](#syslog-host)|string|""|
|[syslog-port](#syslog-port)|int|514|
|[no-tls-redirect-locations](#no-tls-redirect-locations)|string|"/.well-known/acme-challenge"| |[no-tls-redirect-locations](#no-tls-redirect-locations)|string|"/.well-known/acme-challenge"|
|[global-auth-url](#global-auth-url)|string|""| |[global-auth-url](#global-auth-url)|string|""|
|[global-auth-method](#global-auth-method)|string|""| |[global-auth-method](#global-auth-method)|string|""|
@ -451,7 +454,7 @@ _**default:**_ 16384
## max-worker-open-files ## max-worker-open-files
Sets the [maximum number of files](http://nginx.org/en/docs/ngx_core_module.html#worker_rlimit_nofile) that can be opened by each worker process. Sets the [maximum number of files](http://nginx.org/en/docs/ngx_core_module.html#worker_rlimit_nofile) that can be opened by each worker process.
The default of 0 means "max open files (system's limit) / [worker-processes](#worker-processes) - 1024". The default of 0 means "max open files (system's limit) - 1024".
_**default:**_ 0 _**default:**_ 0
## map-hash-bucket-size ## map-hash-bucket-size
@ -1077,6 +1080,18 @@ Sets the [status code to return in response to rejected requests](http://nginx.o
Sets the [status code to return in response to rejected connections](http://nginx.org/en/docs/http/ngx_http_limit_conn_module.html#limit_conn_status). _**default:**_ 503 Sets the [status code to return in response to rejected connections](http://nginx.org/en/docs/http/ngx_http_limit_conn_module.html#limit_conn_status). _**default:**_ 503
## enable-syslog
Enable [syslog](http://nginx.org/en/docs/syslog.html) feature for access log and error log. _**default:**_ false
## syslog-host
Sets the address of syslog server. The address can be specified as a domain name or IP address.
## syslog-port
Sets the port of syslog server. _**default:**_ 514
## no-tls-redirect-locations ## no-tls-redirect-locations
A comma-separated list of locations on which http requests will never get redirected to their https counterpart. A comma-separated list of locations on which http requests will never get redirected to their https counterpart.

2
docs/user-guide/third-party-addons/opentracing.md
View file

@ -168,7 +168,7 @@ In the Zipkin interface we can see the details:
# Apply the Ingress Resource # Apply the Ingress Resource
$ echo ' $ echo '
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: echo-ingress name: echo-ingress

2
go.mod
View file

@ -41,7 +41,7 @@ require (
k8s.io/code-generator v0.21.3 k8s.io/code-generator v0.21.3
k8s.io/component-base v0.21.3 k8s.io/component-base v0.21.3
k8s.io/klog/v2 v2.10.0 k8s.io/klog/v2 v2.10.0
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732 pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732
sigs.k8s.io/controller-runtime v0.9.5 sigs.k8s.io/controller-runtime v0.9.5
sigs.k8s.io/mdtoc v1.0.1 sigs.k8s.io/mdtoc v1.0.1

2
hack/generate-deploy-scripts.sh
View file

@ -163,6 +163,8 @@ controller:
service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: "true" service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol: "true"
config: config:
use-proxy-protocol: "true" use-proxy-protocol: "true"
admissionWebhooks:
timeoutSeconds: 29
EOF EOF

25
images/nginx/rootfs/build.sh
View file

@ -131,6 +131,13 @@ export BUILD_PATH=/tmp/build
ARCH=$(uname -m) ARCH=$(uname -m)
if [[ ${ARCH} == "s390x" ]]; then
export LUAJIT_VERSION=9d5750d28478abfdcaefdfdc408f87752a21e431
export LUA_RESTY_CORE=0.1.17
export LUA_NGX_VERSION=0.10.15
export LUA_STREAM_NGX_VERSION=0.0.7
fi
get_src() get_src()
{ {
hash="$1" hash="$1"
@ -229,17 +236,30 @@ get_src 3a3a03060bf5e3fef52c9a2de02e6035cb557f389453d8f3b0c1d3d570636994 \
get_src 754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b \ get_src 754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b \
"https://github.com/msgpack/msgpack-c/archive/cpp-$MSGPACK_VERSION.tar.gz" "https://github.com/msgpack/msgpack-c/archive/cpp-$MSGPACK_VERSION.tar.gz"
if [[ ${ARCH} == "s390x" ]]; then
get_src 7d5f3439c8df56046d0564b5857fd8a30296ab1bd6df0f048aed7afb56a0a4c2 \
"https://github.com/openresty/lua-nginx-module/archive/v$LUA_NGX_VERSION.tar.gz"
get_src 99c47c75c159795c9faf76bbb9fa58e5a50b75286c86565ffcec8514b1c74bf9 \
"https://github.com/openresty/stream-lua-nginx-module/archive/v$LUA_STREAM_NGX_VERSION.tar.gz"
else
get_src 085a9fb2bf9c4466977595a5fe5156d76f3a2d9a2a81be3cacaff2021773393e \ get_src 085a9fb2bf9c4466977595a5fe5156d76f3a2d9a2a81be3cacaff2021773393e \
"https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz" "https://github.com/openresty/lua-nginx-module/archive/$LUA_NGX_VERSION.tar.gz"
get_src ba38c9f8e4265836ba7f2ac559ddf140693ff2f5ae33ab1e384f51f3992151ab \ get_src ba38c9f8e4265836ba7f2ac559ddf140693ff2f5ae33ab1e384f51f3992151ab \
"https://github.com/openresty/stream-lua-nginx-module/archive/$LUA_STREAM_NGX_VERSION.tar.gz" "https://github.com/openresty/stream-lua-nginx-module/archive/$LUA_STREAM_NGX_VERSION.tar.gz"
fi
get_src a92c9ee6682567605ece55d4eed5d1d54446ba6fba748cff0a2482aea5713d5f \ get_src a92c9ee6682567605ece55d4eed5d1d54446ba6fba748cff0a2482aea5713d5f \
"https://github.com/openresty/lua-upstream-nginx-module/archive/$LUA_UPSTREAM_VERSION.tar.gz" "https://github.com/openresty/lua-upstream-nginx-module/archive/$LUA_UPSTREAM_VERSION.tar.gz"
if [[ ${ARCH} == "s390x" ]]; then
get_src 266ed1abb70a9806d97cb958537a44b67db6afb33d3b32292a2d68a2acedea75 \
"https://github.com/openresty/luajit2/archive/$LUAJIT_VERSION.tar.gz"
else
get_src 1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f \ get_src 1ee6dad809a5bb22efb45e6dac767f7ce544ad652d353a93d7f26b605f69fe3f \
"https://github.com/openresty/luajit2/archive/v$LUAJIT_VERSION.tar.gz" "https://github.com/openresty/luajit2/archive/v$LUAJIT_VERSION.tar.gz"
fi
get_src f29393f2cd9288105a0029a6a324fe1f7558a9e7e852d59a6355f7581bb90e30 \ get_src f29393f2cd9288105a0029a6a324fe1f7558a9e7e852d59a6355f7581bb90e30 \
"https://github.com/DataDog/dd-opentracing-cpp/archive/$DATADOG_CPP_VERSION.tar.gz" "https://github.com/DataDog/dd-opentracing-cpp/archive/$DATADOG_CPP_VERSION.tar.gz"
@ -262,8 +282,13 @@ get_src 462c6b38792bab4ca8212bdfd3f2e38f6883bb45c8fb8a03474ea813e0fab853 \
get_src b3d28adac2acee1e5904e9f65d6e80e0553b01647fa0701b812bc7e464de74ad \ get_src b3d28adac2acee1e5904e9f65d6e80e0553b01647fa0701b812bc7e464de74ad \
"https://github.com/openresty/lua-resty-balancer/archive/$LUA_RESTY_BALANCER.tar.gz" "https://github.com/openresty/lua-resty-balancer/archive/$LUA_RESTY_BALANCER.tar.gz"
if [[ ${ARCH} == "s390x" ]]; then
get_src 8f5f76d2689a3f6b0782f0a009c56a65e4c7a4382be86422c9b3549fe95b0dc4 \
"https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
else
get_src 4d971f711fad48c097070457c128ca36053835d8a3ba25a937e9991547d55d4d \ get_src 4d971f711fad48c097070457c128ca36053835d8a3ba25a937e9991547d55d4d \
"https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz" "https://github.com/openresty/lua-resty-core/archive/v$LUA_RESTY_CORE.tar.gz"
fi
get_src 8d602af2669fb386931760916a39f6c9034f2363c4965f215042c086b8215238 \ get_src 8d602af2669fb386931760916a39f6c9034f2363c4965f215042c086b8215238 \
"https://github.com/openresty/lua-cjson/archive/$LUA_CJSON_VERSION.tar.gz" "https://github.com/openresty/lua-cjson/archive/$LUA_CJSON_VERSION.tar.gz"

90
internal/admission/controller/convert.go
View file

@ -1,90 +0,0 @@
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package controller
import (
"unsafe"
admissionv1 "k8s.io/api/admission/v1"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)
// these conversions are copied from https://github.com/kubernetes/kubernetes/blob/4db3a096ce8ac730b2280494422e1c4cf5fe875e/pkg/apis/admission/v1beta1/zz_generated.conversion.go
// to avoid copying in kubernetes/kubernetes
// they are sightly modified to remove complexity
func convertV1beta1AdmissionReviewToAdmissionAdmissionReview(in *admissionv1beta1.AdmissionReview, out *admissionv1.AdmissionReview) {
if in.Request != nil {
if out.Request == nil {
out.Request = &admissionv1.AdmissionRequest{}
}
in, out := &in.Request, &out.Request
*out = new(admissionv1.AdmissionRequest)
convertV1beta1AdmissionRequestToAdmissionAdmissionRequest(*in, *out)
} else {
out.Request = nil
}
out.Response = (*admissionv1.AdmissionResponse)(unsafe.Pointer(in.Response)) // #nosec
}
func convertV1beta1AdmissionRequestToAdmissionAdmissionRequest(in *admissionv1beta1.AdmissionRequest, out *admissionv1.AdmissionRequest) {
out.UID = types.UID(in.UID)
out.Kind = in.Kind
out.Resource = in.Resource
out.SubResource = in.SubResource
out.RequestKind = (*metav1.GroupVersionKind)(unsafe.Pointer(in.RequestKind)) // #nosec
out.RequestResource = (*metav1.GroupVersionResource)(unsafe.Pointer(in.RequestResource)) // #nosec
out.RequestSubResource = in.RequestSubResource
out.Name = in.Name
out.Namespace = in.Namespace
out.Operation = admissionv1.Operation(in.Operation)
out.Object = in.Object
out.OldObject = in.OldObject
out.Options = in.Options
}
func convertAdmissionAdmissionReviewToV1beta1AdmissionReview(in *admissionv1.AdmissionReview, out *admissionv1beta1.AdmissionReview) {
if in.Request != nil {
if out.Request == nil {
out.Request = &admissionv1beta1.AdmissionRequest{}
}
in, out := &in.Request, &out.Request
*out = new(admissionv1beta1.AdmissionRequest)
convertAdmissionAdmissionRequestToV1beta1AdmissionRequest(*in, *out)
} else {
out.Request = nil
}
out.Response = (*admissionv1beta1.AdmissionResponse)(unsafe.Pointer(in.Response)) // #nosec
}
func convertAdmissionAdmissionRequestToV1beta1AdmissionRequest(in *admissionv1.AdmissionRequest, out *admissionv1beta1.AdmissionRequest) {
out.UID = types.UID(in.UID)
out.Kind = in.Kind
out.Resource = in.Resource
out.SubResource = in.SubResource
out.RequestKind = (*metav1.GroupVersionKind)(unsafe.Pointer(in.RequestKind)) // #nosec
out.RequestResource = (*metav1.GroupVersionResource)(unsafe.Pointer(in.RequestResource)) // #nosec
out.RequestSubResource = in.RequestSubResource
out.Name = in.Name
out.Namespace = in.Namespace
out.Operation = admissionv1beta1.Operation(in.Operation)
out.Object = in.Object
out.OldObject = in.OldObject
out.Options = in.Options
}

33
internal/admission/controller/main.go
View file

@ -21,12 +21,10 @@ import (
"net/http" "net/http"
admissionv1 "k8s.io/api/admission/v1" admissionv1 "k8s.io/api/admission/v1"
admissionv1beta1 "k8s.io/api/admission/v1beta1" networking "k8s.io/api/networking/v1"
networking "k8s.io/api/networking/v1beta1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -46,7 +44,7 @@ type IngressAdmission struct {
var ( var (
ingressResource = metav1.GroupVersionKind{ ingressResource = metav1.GroupVersionKind{
Group: networking.GroupName, Group: networking.GroupName,
Version: "v1beta1", Version: "v1",
Kind: "Ingress", Kind: "Ingress",
} }
) )
@ -55,21 +53,12 @@ var (
// with Allowed=false if the Object is an ingress that would prevent nginx to reload the configuration // with Allowed=false if the Object is an ingress that would prevent nginx to reload the configuration
// with Allowed=true otherwise // with Allowed=true otherwise
func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object, error) { func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object, error) {
outputVersion := admissionv1.SchemeGroupVersion
review, isV1 := obj.(*admissionv1.AdmissionReview) review, isV1 := obj.(*admissionv1.AdmissionReview)
if !isV1 { if !isV1 {
outputVersion = admissionv1beta1.SchemeGroupVersion
reviewv1beta1, isv1beta1 := obj.(*admissionv1beta1.AdmissionReview)
if !isv1beta1 {
return nil, fmt.Errorf("request is not of type AdmissionReview v1 or v1beta1") return nil, fmt.Errorf("request is not of type AdmissionReview v1 or v1beta1")
} }
review = &admissionv1.AdmissionReview{}
convertV1beta1AdmissionReviewToAdmissionAdmissionReview(reviewv1beta1, review)
}
if !apiequality.Semantic.DeepEqual(review.Request.Kind, ingressResource) { if !apiequality.Semantic.DeepEqual(review.Request.Kind, ingressResource) {
return nil, fmt.Errorf("rejecting admission review because the request does not contain an Ingress resource but %s with name %s in namespace %s", return nil, fmt.Errorf("rejecting admission review because the request does not contain an Ingress resource but %s with name %s in namespace %s",
review.Request.Kind.String(), review.Request.Name, review.Request.Namespace) review.Request.Kind.String(), review.Request.Name, review.Request.Namespace)
@ -94,7 +83,7 @@ func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object,
} }
review.Response = status review.Response = status
return convertResponse(review, outputVersion), nil return review, nil
} }
if err := ia.Checker.CheckIngress(&ingress); err != nil { if err := ia.Checker.CheckIngress(&ingress); err != nil {
@ -106,24 +95,12 @@ func (ia *IngressAdmission) HandleAdmission(obj runtime.Object) (runtime.Object,
} }
review.Response = status review.Response = status
return convertResponse(review, outputVersion), nil return review, nil
} }
klog.InfoS("successfully validated configuration, accepting", "ingress", fmt.Sprintf("%v/%v", review.Request.Name, review.Request.Namespace)) klog.InfoS("successfully validated configuration, accepting", "ingress", fmt.Sprintf("%v/%v", review.Request.Name, review.Request.Namespace))
status.Allowed = true status.Allowed = true
review.Response = status review.Response = status
return convertResponse(review, outputVersion), nil return review, nil
}
func convertResponse(review *admissionv1.AdmissionReview, outputVersion schema.GroupVersion) runtime.Object {
// reply v1
if outputVersion.Version == admissionv1.SchemeGroupVersion.Version {
return review
}
// reply v1beta1
reviewv1beta1 := &admissionv1beta1.AdmissionReview{}
convertAdmissionAdmissionReviewToV1beta1AdmissionReview(review, reviewv1beta1)
return review
} }

4
internal/admission/controller/main_test.go
View file

@ -21,7 +21,7 @@ import (
"testing" "testing"
admissionv1 "k8s.io/api/admission/v1" admissionv1 "k8s.io/api/admission/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/json"
@ -71,7 +71,7 @@ func TestHandleAdmission(t *testing.T) {
result, err = adm.HandleAdmission(&admissionv1.AdmissionReview{ result, err = adm.HandleAdmission(&admissionv1.AdmissionReview{
Request: &admissionv1.AdmissionRequest{ Request: &admissionv1.AdmissionRequest{
Kind: v1.GroupVersionKind{Group: networking.GroupName, Version: "v1beta1", Kind: "Ingress"}, Kind: v1.GroupVersionKind{Group: networking.GroupName, Version: "v1", Kind: "Ingress"},
Object: runtime.RawExtension{ Object: runtime.RawExtension{
Raw: []byte{0xff}, Raw: []byte{0xff},
}, },

2
internal/admission/controller/server.go
View file

@ -21,7 +21,6 @@ import (
"net/http" "net/http"
admissionv1 "k8s.io/api/admission/v1" admissionv1 "k8s.io/api/admission/v1"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer/json" "k8s.io/apimachinery/pkg/runtime/serializer/json"
"k8s.io/klog/v2" "k8s.io/klog/v2"
@ -32,7 +31,6 @@ var (
) )
func init() { func init() {
admissionv1beta1.AddToScheme(scheme)
admissionv1.AddToScheme(scheme) admissionv1.AddToScheme(scheme)
} }

2
internal/ingress/annotations/alias/main.go
View file

@ -20,7 +20,7 @@ import (
"sort" "sort"
"strings" "strings"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"

2
internal/ingress/annotations/alias/main_test.go
View file

@ -21,7 +21,7 @@ import (
"testing" "testing"
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver" "k8s.io/ingress-nginx/internal/ingress/resolver"

2
internal/ingress/annotations/annotations.go
View file

@ -25,7 +25,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/alias" "k8s.io/ingress-nginx/internal/ingress/annotations/alias"

21
internal/ingress/annotations/annotations_test.go
View file

@ -20,9 +20,8 @@ import (
"testing" "testing"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/defaults" "k8s.io/ingress-nginx/internal/ingress/defaults"
@ -77,8 +76,12 @@ func (m mockCfg) GetAuthCertificate(name string) (*resolver.AuthSSLCert, error)
func buildIngress() *networking.Ingress { func buildIngress() *networking.Ingress {
defaultBackend := networking.IngressBackend{ defaultBackend := networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
} }
return &networking.Ingress{ return &networking.Ingress{
@ -87,9 +90,13 @@ func buildIngress() *networking.Ingress {
Namespace: apiv1.NamespaceDefault, Namespace: apiv1.NamespaceDefault,
}, },
Spec: networking.IngressSpec{ Spec: networking.IngressSpec{
Backend: &networking.IngressBackend{ DefaultBackend: &networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
}, },
Rules: []networking.IngressRule{ Rules: []networking.IngressRule{
{ {

2
internal/ingress/annotations/auth/main.go
View file

@ -24,7 +24,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/file"

21
internal/ingress/annotations/auth/main_test.go
View file

@ -25,9 +25,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors" ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
"k8s.io/ingress-nginx/internal/ingress/resolver" "k8s.io/ingress-nginx/internal/ingress/resolver"
@ -35,8 +34,12 @@ import (
func buildIngress() *networking.Ingress { func buildIngress() *networking.Ingress {
defaultBackend := networking.IngressBackend{ defaultBackend := networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
} }
return &networking.Ingress{ return &networking.Ingress{
@ -45,9 +48,13 @@ func buildIngress() *networking.Ingress {
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: networking.IngressSpec{ Spec: networking.IngressSpec{
Backend: &networking.IngressBackend{ DefaultBackend: &networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
}, },
Rules: []networking.IngressRule{ Rules: []networking.IngressRule{
{ {

2
internal/ingress/annotations/authreq/main.go
View file

@ -23,7 +23,7 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors" ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"

22
internal/ingress/annotations/authreq/main_test.go
View file

@ -22,18 +22,20 @@ import (
"testing" "testing"
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver" "k8s.io/ingress-nginx/internal/ingress/resolver"
"k8s.io/apimachinery/pkg/util/intstr"
) )
func buildIngress() *networking.Ingress { func buildIngress() *networking.Ingress {
defaultBackend := networking.IngressBackend{ defaultBackend := networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
} }
return &networking.Ingress{ return &networking.Ingress{
@ -42,9 +44,13 @@ func buildIngress() *networking.Ingress {
Namespace: api.NamespaceDefault, Namespace: api.NamespaceDefault,
}, },
Spec: networking.IngressSpec{ Spec: networking.IngressSpec{
Backend: &networking.IngressBackend{ DefaultBackend: &networking.IngressBackend{
ServiceName: "default-backend", Service: &networking.IngressServiceBackend{
ServicePort: intstr.FromInt(80), Name: "default-backend",
Port: networking.ServiceBackendPort{
Number: 80,
},
},
}, },
Rules: []networking.IngressRule{ Rules: []networking.IngressRule{
{ {

2
internal/ingress/annotations/authreqglobal/main.go
View file

@ -17,7 +17,7 @@ limitations under the License.
package authreqglobal package authreqglobal
import ( import (
networking "k8s.io/api/networking/v1beta1" networking "k8s.io/api/networking/v1"
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" "k8s.io/ingress-nginx/internal/ingress/annotations/parser"
"k8s.io/ingress-nginx/internal/ingress/resolver" "k8s.io/ingress-nginx/internal/ingress/resolver"

Some files were not shown because too many files have changed in this diff Show more