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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Oct 26, 2021
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29abb74
update ingress to v1-1.0.3 and v1beta1-0.49.3
prezha Oct 12, 2021
c680044
remove allow-snippet-annotations as per recommendation
prezha Oct 12, 2021
db4937a
update ingress-nginx controller to v1.0.4
prezha Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 53 additions & 28 deletions deploy/addons/ingress/ingress-deploy.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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

---
apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -102,8 +103,10 @@ rules:
- list
- watch
- apiGroups:
{{- if eq .IngressAPIVersion "v1beta1"}}
- extensions
- networking.k8s.io # k8s 1.14+
{{- end}}
- networking.k8s.io
resources:
- ingresses
verbs:
Expand All @@ -118,14 +121,16 @@ rules:
- create
- patch
- apiGroups:
{{- if eq .IngressAPIVersion "v1beta1"}}
- extensions
- networking.k8s.io # k8s 1.14+
{{- end}}
- networking.k8s.io
resources:
- ingresses/status
verbs:
- update
- apiGroups:
- networking.k8s.io # k8s 1.14+
- networking.k8s.io
resources:
- ingressclasses
verbs:
Expand Down Expand Up @@ -187,23 +192,27 @@ rules:
- list
- watch
- apiGroups:
{{- if eq .IngressAPIVersion "v1beta1"}}
- extensions
- networking.k8s.io # k8s 1.14+
{{- end}}
- networking.k8s.io
resources:
- ingresses
verbs:
- get
- list
- watch
- apiGroups:
{{- if eq .IngressAPIVersion "v1beta1"}}
- extensions
- networking.k8s.io # k8s 1.14+
{{- end}}
- networking.k8s.io
resources:
- ingresses/status
verbs:
- update
- apiGroups:
- networking.k8s.io # k8s 1.14+
- networking.k8s.io
resources:
- ingressclasses
verbs:
Expand All @@ -225,7 +234,6 @@ rules:
- configmaps
verbs:
- create
- update
- apiGroups:
- ''
resources:
Expand Down Expand Up @@ -253,17 +261,6 @@ subjects:
name: ingress-nginx
namespace: ingress-nginx
---
apiVersion: networking.k8s.io/v1
kind: IngressClass
metadata:
labels:
app.kubernetes.io/component: controller
name: nginx
annotations:
ingressclass.kubernetes.io/is-default-class: "true"
spec:
controller: k8s.io/ingress-nginx
---
# Source: ingress-nginx/templates/controller-service-webhook.yaml
apiVersion: v1
kind: Service
Expand All @@ -280,6 +277,9 @@ spec:
- name: https-webhook
port: 443
targetPort: webhook
{{- if eq .IngressAPIVersion "v1"}}
appProtocol: https
{{- end}}
selector:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
Expand All @@ -303,10 +303,16 @@ spec:
port: 80
protocol: TCP
targetPort: http
{{- if eq .IngressAPIVersion "v1"}}
appProtocol: http
{{- end}}
- name: https
port: 443
protocol: TCP
targetPort: https
{{- if eq .IngressAPIVersion "v1"}}
appProtocol: https
{{- end}}
selector:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
Expand All @@ -329,10 +335,6 @@ spec:
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
revisionHistoryLimit: 10
strategy:
rollingUpdate:
maxUnavailable: 1
type: RollingUpdate
minReadySeconds: 0
template:
metadata:
Expand All @@ -355,7 +357,14 @@ spec:
args:
- /nginx-ingress-controller
- --election-id=ingress-controller-leader
{{- if eq .IngressAPIVersion "v1"}}
- --controller-class=k8s.io/ingress-nginx
{{- end}}
{{- if eq .IngressAPIVersion "v1beta1"}}
- --ingress-class=nginx
- --watch-ingress-without-class=true
- --publish-status-address=localhost
{{- end}}
- --configmap=$(POD_NAMESPACE)/ingress-nginx-controller
- --report-node-internal-ip-address
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
Expand Down Expand Up @@ -431,12 +440,28 @@ spec:
secret:
secretName: ingress-nginx-admission
---
{{- if eq .IngressAPIVersion "v1"}}
# 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:
app.kubernetes.io/name: ingress-nginx
app.kubernetes.io/instance: ingress-nginx
app.kubernetes.io/component: controller
name: nginx
namespace: ingress-nginx
annotations:
ingressclass.kubernetes.io/is-default-class: "true"
spec:
controller: k8s.io/ingress-nginx
---
{{- end}}
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
# before changing this value, check the required kubernetes version
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
# Currently(v0.49.0), ValidatingWebhookConfiguration of this validates v1beta1 request
# TODO(govargo): check this after upstream ingress-nginx can validate v1 version
# https://github.com/kubernetes/ingress-nginx/blob/controller-v0.49.0/internal/admission/controller/main.go#L46-L52
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
Expand All @@ -461,10 +486,10 @@ webhooks:
failurePolicy: Fail
sideEffects: None
admissionReviewVersions:
{{- if eq .IngressAPIVersion "v1beta1"}}
- v1
{{- end}}
- {{.IngressAPIVersion}}
{{- if eq .IngressAPIVersion "v1beta1"}}
- v1beta1
{{- end}}
clientConfig:
service:
namespace: ingress-nginx
Expand Down
4 changes: 2 additions & 2 deletions pkg/addons/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ func supportLegacyIngress(cc *config.ClusterConfig) error {
}
if semver.MustParseRange("<1.19.0")(v) {
imgs := map[string]string{
// https://github.com/kubernetes/ingress-nginx/blob/f3c50698d98299b1a61f83cb6c4bb7de0b71fb4b/deploy/static/provider/kind/deploy.yaml#L327
"IngressController": "ingress-nginx/controller:v0.49.0@sha256:e9707504ad0d4c119036b6d41ace4a33596139d3feb9ccb6617813ce48c3eeef",
// https://github.com/kubernetes/ingress-nginx/blob/0a2ec01eb4ec0e1b29c4b96eb838a2e7bfe0e9f6/deploy/static/provider/baremetal/deploy.yaml#L324
"IngressController": "ingress-nginx/controller:v0.49.3@sha256:35fe394c82164efa8f47f3ed0be981b3f23da77175bbb8268a9ae438851c8324",
// issues: https://github.com/kubernetes/ingress-nginx/issues/7418 and https://github.com/jet/kube-webhook-certgen/issues/30
"KubeWebhookCertgenCreate": "docker.io/jettech/kube-webhook-certgen:v1.5.1@sha256:950833e19ade18cd389d647efb88992a7cc077abedef343fa59e012d376d79b7",
"KubeWebhookCertgenPatch": "docker.io/jettech/kube-webhook-certgen:v1.5.1@sha256:950833e19ade18cd389d647efb88992a7cc077abedef343fa59e012d376d79b7",
Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/assets/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ var Addons = map[string]*Addon{
"0640"),
}, false, "ingress", "", map[string]string{
// https://github.com/kubernetes/ingress-nginx/blob/557604f4ef526f7755d36089b617bc7686c389f9/deploy/static/provider/kind/deploy.yaml#L323
"IngressController": "ingress-nginx/controller:v1.0.0-beta.3@sha256:44a7a06b71187a4529b0a9edee5cc22bdf71b414470eff696c3869ea8d90a695",
"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 •
edited
Loading

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

// https://github.com/kubernetes/ingress-nginx/blob/557604f4ef526f7755d36089b617bc7686c389f9/deploy/static/provider/kind/deploy.yaml#L612
"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
Expand Down