Release v1 #7470

rikatz · 2021-08-09T22:09:08Z

What this PR does / why we need it:

This PR is a preparation to release ingress-nginx v1

All the conflicts are getting solved here

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Which issue/s this PR fixes

Fixes #7398

rikatz · 2021-08-09T22:15:12Z

/hold

rikatz · 2021-08-09T22:15:25Z

/uncc @ChiefAlexander @cmluciano

rikatz · 2021-08-09T22:18:51Z

/kind feature
/triage accepted
/priority important-soon
/milestone v1

tao12345666333 · 2021-08-10T00:31:17Z

/cc

tao12345666333 · 2021-08-17T16:18:05Z

/test pull-ingress-nginx-test

…bernetes#7425)

* Add dev-v1 branch into helm releaser (kubernetes#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 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>

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

* Update go version, modules and remove ioutil * Release new helm chart with certgen fixed

strongjz · 2021-08-21T19:10:31Z

/ok-to-test

rikatz · 2021-08-21T19:59:26Z

/hold cancel

As soon as someone lgtm this, we will officially have v1 into main branch :)

strongjz · 2021-08-21T20:03:57Z

TAG

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


once we merge this will do a v1 release or do we want to do them together?

It wont release nothing, as there is already v1.0.0-beta.3 and I didn't changed from there :)

The release v1 will be made after fixing the other small issues and Go version (hopefuly this monday)

strongjz · 2021-08-21T20:35:27Z

stable.txt

@@ -1 +1 @@
-controller-v0.49.0
+controller-v0.49.0


until we cut v1, were going to keep this stable?

yeap! so people relying on stable.txt file can grab it using scripts.

The change here is due to some extra line that was added in past, but it's still the same file

strongjz · 2021-08-21T20:41:19Z

/lgtm

Nice work on that beast of a merge conflict @rikatz

k8s-ci-robot · 2021-08-21T20:41:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, strongjz, tao12345666333

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [rikatz,strongjz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

rikatz · 2021-08-21T20:47:07Z

W0000000t thank you all for the help on this!!!

ElvinEfendi · 2022-01-12T17:57:17Z

internal/ingress/controller/controller.go

@@ -221,17 +223,12 @@ func (n *NGINXController) CheckIngress(ing *networking.Ingress) error {
 		return nil
 	}

-	if !class.IsValid(ing) {


Why did we do this? This effectively means one e.g can not deploy two ingerss-nginx instances in a cluster where one rejects catch-all ingresses while the other does not. This change will mean all catch-all ingresses in the cluster are rejected.

discussion in #7546

rikatz · 2022-01-13T00:17:46Z

This whole ingress class situation still keeps biting us. There was a recent discussion on sig-net about this

I would like to bring this discussion again to have our own approach that suits to our users.

There is a restriction on the api being class OR annotations, but even this is being rediscussed.

We can talk a bit more about this on slack :)

* Drop v1beta1 from ingress nginx (kubernetes#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 (kubernetes#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (kubernetes#7219) * Fix link to e2e-tests.md in developer-guide (kubernetes#7201) * Use ENV expansion for namespace in args (kubernetes#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 (kubernetes#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (kubernetes#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 (kubernetes#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 (kubernetes#7208) * Add file containing stable release (kubernetes#7313) * Handle named (non-numeric) ports correctly (kubernetes#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (kubernetes#7308) * remove mercurial from build (kubernetes#7031) * Retry to download maxmind DB if it fails (kubernetes#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 (kubernetes#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 (kubernetes#7161) * Lower webhook timeout for digital ocean (kubernetes#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (kubernetes#7365) (kubernetes#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (kubernetes#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (kubernetes#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 (kubernetes#7422) * Change the order of annotation just to trigger a new helm release (kubernetes#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (kubernetes#7428) * Add dev-v1 branch into helm releaser (kubernetes#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 (kubernetes#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 (kubernetes#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (kubernetes#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (kubernetes#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>

k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. area/docs labels Aug 9, 2021

k8s-ci-robot requested review from ChiefAlexander and cmluciano August 9, 2021 22:09

rikatz force-pushed the release-v1 branch from 9dd7d93 to d34700e Compare August 9, 2021 22:10

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 9, 2021

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2021

k8s-ci-robot removed request for cmluciano and ChiefAlexander August 9, 2021 22:15

rikatz force-pushed the release-v1 branch from d34700e to 7e1f4b1 Compare August 9, 2021 22:17

k8s-ci-robot requested a review from tao12345666333 August 10, 2021 00:31

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 10, 2021

rikatz force-pushed the release-v1 branch from 7e1f4b1 to c1cd59b Compare August 17, 2021 14:29

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 17, 2021

strongjz and others added 12 commits August 21, 2021 15:59

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

85b2654

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

bac45ad

Change the order of annotation just to trigger a new helm release (ku…

e2ad863

…bernetes#7425)

Add controller.watchIngressWithoutClass config option (kubernetes#7459)

0affd96

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

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

eef9ad2

* Update go version, modules and remove ioutil * Release new helm chart with certgen fixed

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

3fdc12c

Fix CI conflict

c1bbf94

Fix CI conflict

bec9334

Fix build.sh from rebase process

3dc3dbb

Fix controller_test post rebase

b8e9af7

rikatz force-pushed the release-v1 branch from 50ce538 to b8e9af7 Compare August 21, 2021 19:02

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 21, 2021

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Aug 21, 2021

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 21, 2021

strongjz reviewed Aug 21, 2021

View reviewed changes

k8s-ci-robot assigned strongjz Aug 21, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 21, 2021

k8s-ci-robot merged commit 90c7968 into kubernetes:main Aug 21, 2021

afirth mentioned this pull request Jan 7, 2022

validating webhook should ignore ingresses with a different ingressclass #7546

Closed

ElvinEfendi reviewed Jan 12, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Release v1 #7470

Release v1 #7470

rikatz commented Aug 9, 2021

rikatz commented Aug 9, 2021

rikatz commented Aug 9, 2021

rikatz commented Aug 9, 2021

tao12345666333 commented Aug 10, 2021

tao12345666333 commented Aug 17, 2021

strongjz commented Aug 21, 2021

rikatz commented Aug 21, 2021

strongjz Aug 21, 2021

rikatz Aug 21, 2021

strongjz Aug 21, 2021

rikatz Aug 21, 2021

strongjz commented Aug 21, 2021

k8s-ci-robot commented Aug 21, 2021

rikatz commented Aug 21, 2021

ElvinEfendi Jan 12, 2022

timmysilv Jan 21, 2022

rikatz commented Jan 13, 2022

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

		@@ -1 +1 @@
		controller-v0.49.0
		controller-v0.49.0

Release v1 #7470

Release v1 #7470

Conversation

rikatz commented Aug 9, 2021

What this PR does / why we need it:

Types of changes

Which issue/s this PR fixes

rikatz commented Aug 9, 2021

rikatz commented Aug 9, 2021

rikatz commented Aug 9, 2021

tao12345666333 commented Aug 10, 2021

tao12345666333 commented Aug 17, 2021

strongjz commented Aug 21, 2021

rikatz commented Aug 21, 2021

strongjz Aug 21, 2021

Choose a reason for hiding this comment

rikatz Aug 21, 2021

Choose a reason for hiding this comment

strongjz Aug 21, 2021

Choose a reason for hiding this comment

rikatz Aug 21, 2021

Choose a reason for hiding this comment

strongjz commented Aug 21, 2021

k8s-ci-robot commented Aug 21, 2021

rikatz commented Aug 21, 2021

ElvinEfendi Jan 12, 2022

Choose a reason for hiding this comment

timmysilv Jan 21, 2022

Choose a reason for hiding this comment

rikatz commented Jan 13, 2022