Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ingress controller to v1/1.0.4 and v1beta1/0.49.3 #12702

Merged
merged 3 commits into from
Oct 26, 2021

Conversation

prezha
Copy link
Contributor

@prezha prezha commented Oct 12, 2021

fix: #12710

update ingress controller to current v1/1.0.4 (for k8s >= v1.19) and v1beta1/0.49.3 (for k8s < v1.19)

should resolve the issue reported in the slack channel: https://kubernetes.slack.com/archives/C1F5CT6Q1/p1634063547313500

ref: https://kubernetes.slack.com/archives/C1F5CT6Q1/p1634069399318200

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 12, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2021
@prezha
Copy link
Contributor Author

prezha commented Oct 12, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Oct 12, 2021
@rikatz
Copy link

rikatz commented Oct 12, 2021

We are just releasing v1.0.4 if you want to wait :D

@@ -46,6 +46,7 @@ metadata:
data:
# see https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md for all possible options and their description
hsts: "false"
allow-snippet-annotations: 'true'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend you just to add this if strictly required by another part of the deployment :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rikatz thank you for the review and recommendation! i believe we can safely remove it then

Copy link
Contributor Author

@prezha prezha Oct 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prezha
Copy link
Contributor Author

prezha commented Oct 12, 2021

We are just releasing v1.0.4 if you want to wait :D

@rikatz sounds great, thanks! yes, we can include that as well

i guess it should also cover the:

Known Issues

    Ingress controller now (starting from v1.0.0) mandates cluster scoped access to IngressClass. This leads to problems when updating old Ingress controller to newest version, as described here. We plan to fix it in v1.0.4 (promise!!), see this.

;)

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 47.6s    | 47.6s               |
| enable ingress | 31.1s    | 31.4s               |
+----------------+----------+---------------------+

Times for minikube start: 50.3s 46.6s 47.5s 47.3s 46.1s
Times for minikube (PR 12702) start: 48.2s 47.9s 47.2s 47.3s 47.5s

Times for minikube ingress: 31.3s 31.3s 32.3s 29.8s 30.8s
Times for minikube (PR 12702) ingress: 31.5s 32.2s 31.3s 31.4s 30.8s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 21.6s    | 22.0s               |
| enable ingress | 28.4s    | 27.8s               |
+----------------+----------+---------------------+

Times for minikube (PR 12702) ingress: 34.4s 26.4s 25.4s 26.4s 26.4s
Times for minikube ingress: 25.9s 27.4s 34.9s 27.4s 26.4s

Times for minikube start: 22.7s 21.1s 22.0s 21.3s 21.1s
Times for minikube (PR 12702) start: 22.3s 22.2s 22.3s 20.8s 22.3s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 39.9s    | 42.2s               |
| enable ingress | 31.7s    | 34.8s               |
+----------------+----------+---------------------+

Times for minikube start: 31.1s 45.9s 43.1s 42.6s 36.6s
Times for minikube (PR 12702) start: 43.9s 43.4s 36.2s 43.4s 43.9s

Times for minikube ingress: 38.4s 28.4s 32.9s 32.9s 25.8s
Times for minikube (PR 12702) ingress: 32.9s 18.9s 56.9s 32.4s 32.9s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Linux TestFunctional/serial/ComponentHealth (gopogh) 3.07 (chart)
Docker_Linux TestStartStop/group/no-preload/serial/Pause (gopogh) 7.36 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)

To see the flake rates of all tests by environment, click here.

"IngressController": "ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695",
// https://github.com/kubernetes/ingress-nginx/blob/557604f4ef526f7755d36089b617bc7686c389f9/deploy/static/provider/kind/deploy.yaml#L612
// https://github.com/kubernetes/ingress-nginx/blob/bdea0c8e462ce94031df622e1eda3196ac41933e/deploy/static/provider/kind/deploy.yaml#L327
"IngressController": "ingress-nginx/controller:v1.0.3@sha256:4ade87838eb8256b094fbb5272d7dda9b6c7fa8b759e6af5383c1300996a7452",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can already use here v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef :)

Just waiting this PR (kubernetes/k8s.io#2926) to get merged and the image promoted

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And ready, PR is merged: k8s.gcr.io/ingress-nginx/controller:v1.0.4@sha256:545cff00370f28363dad31e3b59a94ba377854d3a11f18988f5f9e56841ef9ef

Copy link
Contributor Author

@prezha prezha Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

amended, thanks!
the only additional change i've noticed (and added as well here) is the addition of

  ipFamilyPolicy: SingleStack
  ipFamilies:
    - IPv4

in the controller service

"KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
// https://github.com/kubernetes/ingress-nginx/blob/557604f4ef526f7755d36089b617bc7686c389f9/deploy/static/provider/kind/deploy.yaml#L660
// https://github.com/kubernetes/ingress-nginx/blob/bdea0c8e462ce94031df622e1eda3196ac41933e/deploy/static/provider/kind/deploy.yaml#L667
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also if you wanna bump this one, no big change but:

k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, would be good to keep it in sync with the controller i guess

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 46.7s    | 46.7s               |
| enable ingress | 31.1s    | 30.3s               |
+----------------+----------+---------------------+

Times for minikube (PR 12702) start: 45.9s 45.8s 46.5s 48.6s 46.8s
Times for minikube start: 47.6s 47.4s 46.0s 46.3s 46.2s

Times for minikube ingress: 29.7s 32.3s 31.3s 30.2s 31.7s
Times for minikube (PR 12702) ingress: 31.3s 30.2s 29.8s 30.2s 29.8s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 21.7s    | 21.5s               |
| enable ingress | 38.1s    | 26.6s               |
+----------------+----------+---------------------+

Times for minikube start: 22.3s 22.1s 21.6s 21.1s 21.4s
Times for minikube (PR 12702) start: 21.6s 20.7s 22.1s 21.6s 21.8s

Times for minikube ingress: 26.9s 26.9s 82.9s 27.9s 25.9s
Times for minikube (PR 12702) ingress: 26.9s 26.4s 26.9s 26.4s 26.4s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 38.6s    | 40.3s               |
| enable ingress | 30.7s    | 29.2s               |
+----------------+----------+---------------------+

Times for minikube start: 32.0s 30.6s 43.0s 43.4s 44.0s
Times for minikube (PR 12702) start: 43.4s 42.8s 42.5s 36.4s 36.4s

Times for minikube ingress: 27.9s 28.9s 31.9s 32.9s 31.9s
Times for minikube (PR 12702) ingress: 28.4s 31.9s 27.4s 32.3s 25.9s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Linux_containerd TestMultiNode/serial/AddNode (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/CopyFile (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/DeleteNode (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/DeployApp2Nodes (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/FreshStart2Nodes (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/PingHostFrom2Pods (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/RestartKeepsNodes (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/RestartMultiNode (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/StartAfterStop (gopogh) 0.00 (chart)
Docker_Linux_containerd TestMultiNode/serial/StopNode (gopogh) 0.00 (chart)
Docker_Linux TestKubernetesUpgrade (gopogh) 2.61 (chart)
KVM_Linux_containerd TestPause/serial/PauseAgain (gopogh) 7.79 (chart)
Docker_Linux_containerd TestFunctional/serial/LogsFileCmd (gopogh) 9.27 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)

To see the flake rates of all tests by environment, click here.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 13, 2021
@prezha prezha changed the title update ingress to v1-1.0.3 and v1beta1-0.49.3 update ingress controller to v1/1.0.4 and v1beta1/0.49.3 Oct 13, 2021
@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 47.2s    | 47.3s               |
| enable ingress | 31.6s    | 34.9s               |
+----------------+----------+---------------------+

Times for minikube start: 49.1s 46.3s 46.4s 47.8s 46.5s
Times for minikube (PR 12702) start: 46.8s 48.3s 47.0s 47.6s 47.0s

Times for minikube ingress: 31.2s 32.3s 32.3s 31.3s 30.8s
Times for minikube (PR 12702) ingress: 33.3s 32.7s 32.5s 31.3s 44.8s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 21.9s    | 21.5s               |
| enable ingress | 30.6s    | 32.1s               |
+----------------+----------+---------------------+

Times for minikube start: 22.8s 22.0s 21.7s 21.7s 21.3s
Times for minikube (PR 12702) start: 21.3s 22.3s 21.3s 21.9s 20.6s

Times for minikube (PR 12702) ingress: 27.9s 34.4s 27.9s 35.4s 34.9s
Times for minikube ingress: 35.4s 27.5s 27.9s 27.4s 34.9s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 38.6s    | 42.0s               |
| enable ingress | 32.1s    | 40.5s               |
+----------------+----------+---------------------+

Times for minikube ingress: 30.4s 33.9s 29.4s 33.9s 32.9s
Times for minikube (PR 12702) ingress: 36.9s 36.9s 37.9s 53.9s 36.9s

Times for minikube start: 31.8s 43.6s 30.3s 44.2s 43.2s
Times for minikube (PR 12702) start: 43.2s 40.5s 42.7s 42.5s 41.0s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Hyper-V_Windows TestNetworkPlugins/group/cilium/Start (gopogh) 6.45 (chart)
Hyper-V_Windows TestNetworkPlugins/group/calico/Start (gopogh) 9.68 (chart)
Hyper-V_Windows TestNetworkPlugins/group/custom-weave/Start (gopogh) 12.90 (chart)
Hyper-V_Windows TestNetworkPlugins/group/enable-default-cni/Start (gopogh) 16.13 (chart)
Hyper-V_Windows TestNetworkPlugins/group/false/Start (gopogh) 16.13 (chart)
Hyper-V_Windows TestNetworkPlugins/group/bridge/Start (gopogh) 19.35 (chart)
Hyper-V_Windows TestNetworkPlugins/group/flannel/Start (gopogh) 19.35 (chart)
Hyper-V_Windows TestNetworkPlugins/group/kubenet/Start (gopogh) 19.35 (chart)
Hyper-V_Windows TestDownloadOnly/v1.14.0/preload-exists (gopogh) 41.94 (chart)
Hyper-V_Windows TestDownloadOnly/v1.22.2/preload-exists (gopogh) 41.94 (chart)
Hyper-V_Windows TestDownloadOnly/v1.22.3-rc.0/preload-exists (gopogh) 41.94 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)
Hyper-V_Windows TestMultiNode/serial/PingHostFrom2Pods (gopogh) 100.00 (chart)
Hyper-V_Windows TestMultiNode/serial/RestartKeepsNodes (gopogh) 100.00 (chart)
Hyper-V_Windows TestRunningBinaryUpgrade (gopogh) 100.00 (chart)
Hyper-V_Windows TestStoppedBinaryUpgrade/Upgrade (gopogh) 100.00 (chart)

To see the flake rates of all tests by environment, click here.

@rikatz
Copy link

rikatz commented Oct 24, 2021

/lgtm
Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 24, 2021
@rikatz
Copy link

rikatz commented Oct 24, 2021

/retest

@spowelljr
Copy link
Member

/retest-this-please

@minikube-pr-bot
Copy link

kvm2 driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 48.4s    | 48.0s               |
| enable ingress | 34.4s    | 34.3s               |
+----------------+----------+---------------------+

Times for minikube start: 50.1s 48.1s 47.9s 48.1s 47.9s
Times for minikube (PR 12702) start: 48.5s 47.5s 47.7s 49.0s 47.5s

Times for minikube (PR 12702) ingress: 32.8s 33.4s 32.4s 39.8s 32.8s
Times for minikube ingress: 32.4s 40.4s 33.4s 32.8s 32.9s

docker driver with docker runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 22.8s    | 22.1s               |
| enable ingress | 33.5s    | 32.7s               |
+----------------+----------+---------------------+

Times for minikube (PR 12702) start: 22.6s 22.5s 21.9s 22.0s 21.6s
Times for minikube start: 23.9s 22.4s 22.8s 22.3s 22.7s

Times for minikube ingress: 27.4s 34.5s 35.5s 35.0s 35.0s
Times for minikube (PR 12702) ingress: 32.5s 31.0s 37.0s 28.0s 35.0s

docker driver with containerd runtime

+----------------+----------+---------------------+
|    COMMAND     | MINIKUBE | MINIKUBE (PR 12702) |
+----------------+----------+---------------------+
| minikube start | 37.1s    | 42.7s               |
| enable ingress | 34.1s    | 26.4s               |
+----------------+----------+---------------------+

Times for minikube start: 26.2s 44.6s 44.0s 26.7s 44.0s
Times for minikube (PR 12702) start: 43.7s 43.8s 43.9s 37.5s 44.4s

Times for minikube ingress: 38.9s 34.0s 29.5s 34.5s 33.5s
Times for minikube (PR 12702) ingress: 37.0s 19.0s 19.5s 32.6s 24.0s

@minikube-pr-bot
Copy link

These are the flake rates of all failed tests.

Environment Failed Tests Flake Rate (%)
Docker_Windows TestStartStop/group/old-k8s-version/serial/Pause (gopogh) 7.30 (chart)
Docker_Linux TestStartStop/group/old-k8s-version/serial/Pause (gopogh) 7.69 (chart)
Docker_Windows TestNetworkPlugins/group/false/DNS (gopogh) 20.44 (chart)
Docker_Windows TestNetworkPlugins/group/calico/DNS (gopogh) 30.00 (chart)
KVM_Linux TestAddons/serial/GCPAuth (gopogh) 36.64 (chart)
Docker_Linux_containerd TestAddons/serial/GCPAuth (gopogh) 41.96 (chart)
Docker_Linux TestAddons/serial/GCPAuth (gopogh) 41.96 (chart)
KVM_Linux_containerd TestAddons/serial/GCPAuth (gopogh) 45.45 (chart)
Docker_Windows TestMountStart/serial/StartWithMountFirst (gopogh) 61.22 (chart)
Docker_Windows TestMountStart/serial/StartWithMountSecond (gopogh) 61.22 (chart)
Docker_Windows TestMountStart/serial/VerifyMountFirst (gopogh) 61.22 (chart)
Docker_Windows TestMountStart/serial/VerifyMountPostDelete (gopogh) 61.22 (chart)
Docker_Windows TestMountStart/serial/VerifyMountSecond (gopogh) 61.22 (chart)
Docker_Windows TestNetworkPlugins/group/custom-weave/Start (gopogh) 67.15 (chart)
Docker_Windows TestNetworkPlugins/group/kindnet/DNS (gopogh) 67.39 (chart)
Docker_Windows TestNetworkPlugins/group/enable-default-cni/DNS (gopogh) 74.81 (chart)
Docker_Windows TestNetworkPlugins/group/bridge/DNS (gopogh) 78.95 (chart)
Docker_Windows TestNetworkPlugins/group/kubenet/DNS (gopogh) 81.20 (chart)
Docker_Linux_containerd TestScheduledStopUnix (gopogh) 100.00 (chart)
Docker_Windows TestCertOptions (gopogh) 100.00 (chart)
Docker_Windows TestDownloadOnlyKic (gopogh) 100.00 (chart)
Docker_Windows TestDownloadOnly/v1.14.0/preload-exists (gopogh) 100.00 (chart)
Docker_Windows TestDownloadOnly/v1.22.2/preload-exists (gopogh) 100.00 (chart)
Docker_Windows TestDownloadOnly/v1.22.3-rc.0/preload-exists (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/RestartStopped (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/Stop (gopogh) 100.00 (chart)
Docker_Windows TestMountStart/serial/VerifyMountPostStop (gopogh) 100.00 (chart)
Docker_Windows TestPause/serial/VerifyDeletedResources (gopogh) 100.00 (chart)
Hyper-V_Windows TestDownloadOnly/v1.14.0/preload-exists (gopogh) 100.00 (chart)
Hyper-V_Windows TestDownloadOnly/v1.22.2/preload-exists (gopogh) 100.00 (chart)
More tests... Continued...

Too many tests failed - See test logs for more details.

To see the flake rates of all tests by environment, click here.

@spowelljr spowelljr merged commit 57de50a into kubernetes:master Oct 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: prezha, rikatz, spowelljr

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:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update ingress controller to v1.0.4
5 participants