Commit graph

6100 commits

Author SHA1 Message Date
Léopold Jacquot
ddbb0be0a0
add canary backend name for requests metrics (#7696) 2021-09-26 10:54:22 -07:00
Austin Wise
15385c6d56
Tweak documentation formating about deprecated apiVersion values. (#7663)
* Tweak documentation formating about deprecated `apiVersion` values.

* retweak after rebase
2021-09-26 10:48:22 -07:00
Mateusz Gozdek
9acf62d867
images/kube-webhook-certgen/rootfs: add support for patching APIService objects (#7641)
* images/kube-webhook-certgen/rootfs/pkg/k8s: return err from functions

Initially only from some to preserve existing behavior.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: make patching return error

So we don't call log.Fatal in so many places, which makes code testable.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: require context

So initialize top-level contexts in tests and CLI, then pass them around
all the way down, so there is an ability e.g. to add timeouts to patch
operations, if needed and to follow general conventions.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: support patching APIService

APIService object is very similar to MutatingWebhookConfiguration and
ValidatingWebhookConfiguration objects, so support for patching it
shouldn't be too much of a burden.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: use new patch API

So old function PatchWebhookConfigurations can be unexported and CLI can
be extended to also support patching APIService.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: unexport old patch function

PatchObjects should be now used instead.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: add .gitignore

To ignore manually built binaries during development process.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: test patching

By adding a PatchConfig and Patch function, it is now possible to test
logic of flag validation, which was previously tied to CLI options.

This commit adds nice set of tests covering existing logic.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: improve formatting

Those strings will be changed anyway in future commits, so at first we
can properly capitalize used names.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: support patching APIService

As logic for creating a CA certificate and patching an object is almost
the same for both webhook configuration and API services, this commit
adds support to kube-webhook-certgen CLI to also patch APIService
objects, so they can be served over TLS as well.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: pass failure policy by value

k8s.k8s.patchWebhookConfigurations() always dereferences it and we do
not do a nil check, so the code may panic in some conditions, so it's
safer to just pass it by value, as it's just a wrapped string.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>
2021-09-26 10:44:22 -07:00
Ricardo Katz
5662db4509
Fix resty balancer checksum and location (#7703) 2021-09-26 10:28:21 -07:00
Jintao Zhang
0606ef8282
fix: upgrade lua-resty-balancer to v0.04 (#7702)
it has two important bugfix:

1. should force convert weight to a number since it may cause dead loop
   when weight is a string type "0".
2. out-of-bounds memory writing may happen in chash_point_sort.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-09-26 08:50:23 -07:00
Noah Ispas
3ae09fd1fa
add 0.49.1 to changelog (#7692) 2021-09-24 04:03:23 -07:00
pierre villard
1a5c0b7ed2
Correct a mistake (#7690) 2021-09-24 04:01:24 -07:00
Ricardo Katz
dedb495c55
Change legacy branch in GH action 2021-09-22 09:30:44 -03:00
Noah Ispas
f66f87fc21
preparing release v1.0.1 (#7681)
* preparing release v1.0.1

* update shas to newest promoted image

* update changelog of helm chart

* change requests from PR
2021-09-22 05:12:02 -07:00
Ricardo Katz
abab039675
Trigger v1.0.1 release (#7679) 2021-09-21 04:58:23 -07:00
Ricardo Katz
4fc57dcc49
Change enable-snippet to allow-snippet-annotation (#7670)
Signed-off-by: Ricardo Pchevuzinske Katz <rkatz@vmware.com>
2021-09-20 16:52:23 -07:00
Noah Ispas
8e7727eb65
add option for documentiony only to pr template (#7672) 2021-09-20 08:54:11 -07:00
Long Wu Yuan
c6bf056327
added example multiple controller install to faq (#7668) 2021-09-20 03:28:10 -07:00
Ricardo Katz
5e6ab651ec
Add option to force enabling snippet directives (#7665)
Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>
2021-09-19 12:40:08 -07:00
Jennifer Kirsch
314cc6c2dc
Replace kube-lego docs with cert-manager (#7659)
Since kube-lego has not been maintained in quite a while,
I thought it would be best to remove the documentation about it
and replace it with information about cert-manager.
2021-09-19 11:06:08 -07:00
Stephen Augustus
c2fe736d48
Changelog.md: Update references to sigs.k8s.io/promo-tools (#7656)
Signed-off-by: Stephen Augustus <foo@auggie.dev>
2021-09-18 04:10:08 -07:00
iugastefan922
5c6a28464b
additional info for the custom-headers documentation page (#7603)
* added another documentation example

* added end of file newline

* Revert "added end of file newline"

This reverts commit 2d196ffba3.

* added another documentation example
2021-09-16 14:23:27 -07:00
Mateusz Gozdek
260910c0a0
images/kube-webhook-certgen/rootfs: improvements (#7630)
* images/kube-webhook-certgen/rootfs/README.md: remove trailing whitespace

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: improve code formatting

Automatically using gofumpt.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: remove executable bits from files

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: remove unreachable code

log.Fatal(|f) will alread call os.Exit(1), so this code is never
reached.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: fix unit tests

Right now they fail as everything else migrated from using v1beta1 to
v1.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs: create clientset in cmd package

So one can easily mock the client, without touching unexported parts of
the code and to soften the dependency between CLI code (kubeconfig
path).

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/cmd: simplify bool logic

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: improve formatting

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: improve variable names

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: refactor a bit

Move patching logic to separate functions.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>

* images/kube-webhook-certgen/rootfs/pkg/k8s: fix error log messages

In patchMutating() function, log messages were waying still patching
validating webhook.

Signed-off-by: Mateusz Gozdek <mgozdek@microsoft.com>
2021-09-16 13:59:26 -07:00
bishtsaurabh5
b3389a1b6f
Add github action for building images (#7636)
- Add github action test-image-build
- Filters the images folder
and checks for changes
- If the changes are done then the
make build would be performed
2021-09-16 13:53:27 -07:00
Jintao Zhang
53fab99a86
Update e2e-test-runner image (#7648)
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-09-16 10:01:46 -07:00
Jintao Zhang
d9f96bbbba
Update NGINX base image to v1.19 (#7643)
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-09-16 05:07:46 -07:00
Ricardo Katz
19df0a3c4b
Add security contacts (#7642) 2021-09-15 12:24:12 -07:00
agile6v
557a765754
fix typos. (#7640) 2021-09-15 11:30:12 -07:00
Jintao Zhang
498892514d
Downgrade nginx to v1.19 (#7639)
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-09-15 11:08:11 -07:00
Renato Britto Araujo
0dbaadf608
Add e2e tests for secure cookie annotations (#7575) (#7619)
Co-authored-by: Agoretti <andremotta96@gmail.com>

Co-authored-by: Agoretti <andremotta96@gmail.com>
2021-09-12 13:10:07 -07:00
Jennifer Kirsch
ff2b743a94
Only build nginx-errors for linux/amd64 (#7625)
* Fix wrong image location used in nginx-errors example config

* Only build nginx-errors for linux/amd64
2021-09-12 10:08:06 -07:00
Ricardo Katz
cda59ccc9c
Add new flag to watch ingressclass by name instead of spec (#7609) 2021-09-10 10:14:01 -07:00
Ricardo Katz
89eee0deba
Change the cloudbuild timeout 2021-09-09 09:17:26 -03:00
Ricardo Katz
903446f326
Rename cloudbuild.yml to cloudbuild.yaml 2021-09-09 09:00:31 -03:00
Jennifer Kirsch
c9a00fbc73
Fix old tag of custom error pages used in example (#7460)
* Fix old tag of custom error pages used in example

* Move nginx-errors to k8s registry

Since the setup for the custom-error-messages was really different from
the other images that are build using cloudbuild, I changed it to "fit
in better"

* Use Go version 1.17 for custom-error-pages

Since Go >= 1.16 required the use of modules, I also initialized the module using the name k8s.io/ingress-nginx/custom-error-pages
2021-09-09 04:38:11 -07:00
Kundan Kumar
7be4015e13
Added command to get Nginx versionq! (#7577) 2021-09-09 03:30:11 -07:00
Bhumij Gupta
8b3a6f0252
Helm notes outputs non nil value for ingress.class annotation (#7611)
Signed-off-by: bhumijgupta <bhumijgupta@gmail.com>
2021-09-08 02:17:20 -07:00
Renan Gonçalves
48601bcd0e
Allow the usage of Services as Upstream on a global level (#7469)
It is possible to change this behavior on an ingress level, which works
well when you only have a few of them. When running several dozen
ingress and with a high change rate of running pods it makes it easier
to define this configuration on a global level.

This change is completely backwards compatible, only adding the
possibility of defining a new key in the configmap.
2021-09-07 12:47:15 -07:00
fatedier
82e1fc8cac
getEndpoints uses service target port directly if it's a number and mismatch with port name in endpoint (#7393) 2021-09-07 11:15:16 -07:00
FBLGit
a714fb69db
This PR: (#7514)
<!--- Provide a general summary of your changes in the Title above --->
<!--- Why is this change required? What problem does it solve? -->

Introduces the CLI command flag `--disable-full-test`

By default, it doesn't alter the current behavior of the tests performed by the admission controller.
With or Without the flag, a full checkOverlap is actioned, without any alteration
and the object `pcfg` is created with the whole set of ingreses.

If the flag is set to true, it does manipulate the size of `pcfg` up to the content of $this single ingress.

This is achieved by overriding pcfg content by just the last slice that got recently appended to the object `ings`
```
	if n.cfg.DisableFullValidationTest {
		_, _, pcfg = n.getConfiguration(ings[len(ings)-1:])
	}
```

The following steps of generateTemplate and testTemplate are significally reduced to a signle scenario
```
    content, err := n.generateTemplate(cfg, *pcfg)
    ...
    err = n.testTemplate(content)
```

This flag doesn't avoid the proper testing of collisions, neither bad syntaxis within the rendered
configuration of the ingress.

But it does eliminate a scenario, which I wasn't able to produce, where by for some reason even proper rendering
and valid values, without collisions of host/path may end into an invalid nginx.conf

The reasoning for this Feature is:
- Test duration increases by the number of ingresses in the cluster.
- File size grows to very important numbers 150-200Mb on clusters with just 2000~ ingresses.
- Tests in that scenario, takes approximately 20s using the last 0.48.1 improvements
- Produces a considerable memory consumption, as well as CPU, compute, that affects directly the containers
  that serve traffic.

Since the flag is trully optional, and by default is disabled I fell as a good thing to have that can definitively
help on large-scale scenarios that still want to have a reasonable set of tests in place at a lower cost.

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [X ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->
Tested with the build kit the following scenarios on a cluster with 1000~ ingresses:
- With Flag Disabled or Flag, not present (current status as per 0.48.1)

collision scenario (wrong snippet content):
`kubectl apply -f ../collision-syntax.yaml  0.18s user 0.05s system 3% cpu 6.639 total`

collisions scenario (duplicated host):
`kubectl apply -f ../collision-host.yaml  0.17s user 0.05s system 3% cpu 6.245 total`

create/update:
`kubectl apply -f ing-215.yaml  0.16s user 0.05s system 3% cpu 5.845 total`

- With Flag Enabled (true):
collision scenario (wrong snippet content):
`kubectl apply -f ../collision.yaml  0.18s user 0.02s system 57% cpu 0.347 total`

collision scenario (duplicated host):
`kubectl apply -f ../collision.yaml  0.21s user 0.06s system 85% cpu 0.318 total`

create/update:
`kubectl apply -f ing-973.yaml  0.17s user 0.03s system 72% cpu 0.271 total`

As part of the test, I did verified that the created nginx for the test was of a smaller size, and that it didnt affect negatively the final nginx.conf (of a much larger side) where this was merged by the next steps in place after the validation. I couldn't observe any other change in the behaviour and so far the routine looks simple and non harmful.

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [x] My change requires a change to the documentation.
- [x] I have updated the documentation accordingly.
- [x] I've read the [CONTRIBUTION](https://github.com/kubernetes/ingress-nginx/blob/main/CONTRIBUTING.md) guide
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.

For the test part, I would need to understand the placement and test case that this would require, I wasn't able to see an existing scenario for this
2021-09-07 10:53:16 -07:00
Maxim
af5f40a0eb
Trigger syncIngress on Service addition/deletion #7346 (#7374)
Normally Ingress sinchronization for Services is triggered when
corresponding Service's Endpoints are added, deleted or modified.
Services of type ExternalName, however, do not have any endpoints
and hence do not trigger Ingress synchronization as only Update
events are being watched. This commit makes sure that Update and
Delete Service events also enqueue a syncIngress task.
2021-09-07 10:47:16 -07:00
Emily L Shepherd
3c86f838d4
Sync Hostname and IP address from service to ingress status (#7464)
* Change statusSync.runningAddresses() return type

Previously, this method returning a string slice containing the resolved
IP addresses / FQDNs to sync onto the Ingress. It was then converted
just before use into a slice of LoadBalancerIngresses.

This commit changes this logic so that this method generates
LoadBalancerIngress objects directly, and returns these. This has two
main benefits:
- Future work in syncing _both_ hostname and IP, or any other fields
  that may be used in future (eg Ports), is now supported.
- There is less need to rely on net.ParseIP() to determine if a value is
  an IP address or Hostname, as this can be correctly assigned at
  generation time based on where each value came from.

* Sync both IP and Hostname to Ingress Status

Previously, if the IP address was set on a PublishService's
LoadBalancerIngress entries, only that would be synced. Hostname was
only synced as a fallback when the IP address was missing.

Now, both fields are checked independantly and both are synced if
present.
2021-09-07 10:41:16 -07:00
Elvin Efendi
33061b8cdf
put modsecurity e2e tests into their own packages (#7560) 2021-09-07 10:35:22 -07:00
Ray
cf9ae96d72
Additional AuthTLS assertions and doc change to demonstrate auth-tls-secret enables the other AuthTLS annotations (#7202)
* Fix indentation of nested list in AuthTLS annotations

Also, put `<annotation>`: <description text>` on a single line in
Markdown markup, which will match what gets rendered eventually.

On the other hand, for the line on auth-tls-secret (This annotation
expects the Secret name in the form "namespace/secretName"), its
Markdown markup suggests that the author wanted the line to start on its
own line, but currently this gets rendered on the same line. It's nice
for this to be on its own line, since it's kind of a "note" about the
annotation syntax. Format/indent the markup appropriately so that it
shows up on its line.

* Fix indentation of nested list in CORS annotations

Also, put `<annotation>`: <description text>` on a single line in
Markdown markup, which will match what gets rendered eventually.

On the other hand, for lines noting the allowed characters (This is a
multi-valued field...), its Markdown markup suggests that the author
wanted the line to start on its own line, but currently this gets
rendered on the same line. It's nice for this to be on its own line,
since it's kind of a "note" about the annotation syntax. Format/indent
the markup appropriately so that it shows up on its line.

* Replace f.HTTPTestClientWithTLSConfig() in AuthTLS E2E, the odd one out for requests without client certs

* Demonstrate and document that auth-tls-secret enables the other AuthTLS annotations like verify client, depth

* Split E2E for auth-tls-error-page and *-pass-certificate-to-upstream
2021-09-07 10:35:16 -07:00
Yuhao Zhang
e7791941ba
fix cli flag typo in faq (#7606) 2021-09-07 09:11:16 -07:00
pierre-yves
f182b317ba
fix charts README.md to give additional detail on prometheus metrics … (#7601)
* fix charts README.md to give additional detail on prometheus metrics configuration

* charts readme.md remove blank line
2021-09-07 06:47:15 -07:00
KuberDriver
da29c7712a
Update e2e test runner image (#7596)
* Update to the base nginx image

* Revert "Update to the base nginx image"

This reverts commit ad43c1d060.

* Update test runner image

* correcting the sha and version of e2e test runner images
2021-09-06 16:21:16 -07:00
KuberDriver
7d577d9761
Update cloudbuild timeout (#7604)
* Update to the base nginx image

* Revert "Update to the base nginx image"

This reverts commit ad43c1d060.

* Updated cloudbuild to increase build timeout value
2021-09-06 11:44:28 -07:00
Tony Li
f27deed2e8
remove timestamp when requeuing Element (#7440)
Signed-off-by: xiayu.lyt <xiayu.lyt@alibaba-inc.com>
2021-09-06 10:12:28 -07:00
Long Wu Yuan
9f9122c381
fix 7591 (#7598) 2021-09-05 11:22:28 -07:00
KuberDriver
90c065d508
Update to the base nginx image (#7597)
* Update to the base nginx image

* update template.go

* update template_test.go
2021-09-05 04:50:28 -07:00
Long Wu Yuan
4eeb1dfb56
improve faq for migration to ingress api v1 (#7540) 2021-09-04 20:45:20 -07:00
Ricardo Katz
b7c973dcec
Merge pull request #7594 from rikatz/remove-alpine-extrathings
Remove addgroup directive from alpine building
2021-09-04 02:14:58 -03:00
Ricardo Katz
4ce0227268 Remove addgroup directive from alpine building 2021-09-04 02:12:50 -03:00
Ricardo Katz
77bc323285
Merge pull request #7592 from rikatz/change-buildx
Change builder in a new attempt to make it run
2021-09-04 01:11:30 -03:00