-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Conversation
/ok-to-test |
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' |
There was a problem hiding this comment.
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 :)
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
btw, not sure how significant it is, but this is present in reference templates in v1.0.3 - eg:
https://github.com/kubernetes/ingress-nginx/blob/bdea0c8e462ce94031df622e1eda3196ac41933e/deploy/static/provider/baremetal/deploy.yaml#L40
and
https://github.com/kubernetes/ingress-nginx/blob/bdea0c8e462ce94031df622e1eda3196ac41933e/deploy/static/provider/kind/deploy.yaml#L40
@rikatz sounds great, thanks! yes, we can include that as well i guess it should also cover the:
;) |
kvm2 driver with docker runtime
Times for minikube start: 50.3s 46.6s 47.5s 47.3s 46.1s Times for minikube ingress: 31.3s 31.3s 32.3s 29.8s 30.8s docker driver with docker runtime
Times for minikube (PR 12702) ingress: 34.4s 26.4s 25.4s 26.4s 26.4s Times for minikube start: 22.7s 21.1s 22.0s 21.3s 21.1s docker driver with containerd runtime
Times for minikube start: 31.1s 45.9s 43.1s 42.6s 36.6s Times for minikube ingress: 38.4s 28.4s 32.9s 32.9s 25.8s |
These are the flake rates of all failed tests.
To see the flake rates of all tests by environment, click here. |
pkg/minikube/assets/addons.go
Outdated
"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", |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
pkg/minikube/assets/addons.go
Outdated
"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 |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
kvm2 driver with docker runtime
Times for minikube (PR 12702) start: 45.9s 45.8s 46.5s 48.6s 46.8s Times for minikube ingress: 29.7s 32.3s 31.3s 30.2s 31.7s docker driver with docker runtime
Times for minikube start: 22.3s 22.1s 21.6s 21.1s 21.4s Times for minikube ingress: 26.9s 26.9s 82.9s 27.9s 25.9s docker driver with containerd runtime
Times for minikube start: 32.0s 30.6s 43.0s 43.4s 44.0s Times for minikube ingress: 27.9s 28.9s 31.9s 32.9s 31.9s |
These are the flake rates of all failed tests.
To see the flake rates of all tests by environment, click here. |
kvm2 driver with docker runtime
Times for minikube start: 49.1s 46.3s 46.4s 47.8s 46.5s Times for minikube ingress: 31.2s 32.3s 32.3s 31.3s 30.8s docker driver with docker runtime
Times for minikube start: 22.8s 22.0s 21.7s 21.7s 21.3s Times for minikube (PR 12702) ingress: 27.9s 34.4s 27.9s 35.4s 34.9s docker driver with containerd runtime
Times for minikube ingress: 30.4s 33.9s 29.4s 33.9s 32.9s Times for minikube start: 31.8s 43.6s 30.3s 44.2s 43.2s |
These are the flake rates of all failed tests.
To see the flake rates of all tests by environment, click here. |
/lgtm |
/retest |
/retest-this-please |
kvm2 driver with docker runtime
Times for minikube start: 50.1s 48.1s 47.9s 48.1s 47.9s Times for minikube (PR 12702) ingress: 32.8s 33.4s 32.4s 39.8s 32.8s docker driver with docker runtime
Times for minikube (PR 12702) start: 22.6s 22.5s 21.9s 22.0s 21.6s Times for minikube ingress: 27.4s 34.5s 35.5s 35.0s 35.0s docker driver with containerd runtime
Times for minikube start: 26.2s 44.6s 44.0s 26.7s 44.0s Times for minikube ingress: 38.9s 34.0s 29.5s 34.5s 33.5s |
These are the flake rates of all failed tests.
Too many tests failed - See test logs for more details. To see the flake rates of all tests by environment, click here. |
[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 |
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