From d8c8f0a8963075ebf4e08c0d3f496ecb1f2bad06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 22 Sep 2018 10:39:43 +0200 Subject: [PATCH 1/5] Upgrade cni and cni-plugins to release version Closes #3151 --- deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash | 2 +- deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk | 2 +- .../minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash | 2 +- .../iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash index 16b3726df3..ba8d154f6d 100644 --- a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash +++ b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash @@ -1,3 +1,3 @@ sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d cni-v0.3.0.tgz sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8 cni-v0.4.0.tgz -sha256 d1e3c693903d498fcb89076f66410167eaa6d81df4a1051eba7565672f896543 cni-amd64-v0.6.0-rc1.tgz +sha256 a7f84a742c8f3a95843b3cc636444742554a4853835649ec371a07c841daebab cni-amd64-v0.6.0.tgz diff --git a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk index 57ec012eb9..bbc3cbe7bf 100644 --- a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk +++ b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_BIN_VERSION = v0.6.0-rc1 +CNI_BIN_VERSION = v0.6.0 CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/$(CNI_BIN_VERSION) CNI_BIN_SOURCE = cni-amd64-$(CNI_BIN_VERSION).tgz diff --git a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash index b823c7adf7..b8ba3fda6f 100644 --- a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash +++ b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash @@ -1 +1 @@ -sha256 49f14413c62f77d0ce5751934a28b291c4f04af47e591631d00e787ebcd07875 cni-plugins-amd64-v0.6.0-rc1.tgz +sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d cni-plugins-amd64-v0.6.0.tgz diff --git a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk index a9f3c8ad67..44239195b8 100644 --- a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk +++ b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CNI_PLUGINS_BIN_VERSION = v0.6.0-rc1 +CNI_PLUGINS_BIN_VERSION = v0.6.0 CNI_PLUGINS_BIN_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_BIN_VERSION) CNI_PLUGINS_BIN_SOURCE = cni-plugins-amd64-$(CNI_PLUGINS_BIN_VERSION).tgz From f39ccc84a6f62c728150d8f5e1895692e0f50eb8 Mon Sep 17 00:00:00 2001 From: Sven Anderson Date: Mon, 24 Sep 2018 22:16:17 +0200 Subject: [PATCH 2/5] Upgrade gluster client in ISO to 4.1.5 --- .../package/gluster/0002-fix-xdr-files.patch | 23 ---------- .../package/gluster/0002-use-gnu-rpcgen.patch | 42 +++++++++++++++++++ .../minikube-iso/package/gluster/gluster.hash | 2 +- .../minikube-iso/package/gluster/gluster.mk | 6 +-- 4 files changed, 46 insertions(+), 27 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch create mode 100644 deploy/iso/minikube-iso/package/gluster/0002-use-gnu-rpcgen.patch diff --git a/deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch b/deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch deleted file mode 100644 index 2237fe8bb6..0000000000 --- a/deploy/iso/minikube-iso/package/gluster/0002-fix-xdr-files.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/rpc/xdr/src/changelog-xdr.x 2018-04-24 19:55:36.000000000 +0530 -+++ b/rpc/xdr/src/changelog-xdr.x 2018-06-21 19:41:11.146680931 +0530 -@@ -27,16 +27,16 @@ - /* XDR: changelog -> libgfchangelog */ - struct changelog_event_req { - /* sequence number for the buffer */ -- unsigned long seq; -+ unsigned int seq; - - /* time of dispatch */ -- unsigned long tv_sec; -- unsigned long tv_usec; -+ unsigned int tv_sec; -+ unsigned int tv_usec; - }; - - struct changelog_event_rsp { - int op_ret; - - /* ack'd buffers sequence number */ -- unsigned long seq; -+ unsigned int seq; - }; diff --git a/deploy/iso/minikube-iso/package/gluster/0002-use-gnu-rpcgen.patch b/deploy/iso/minikube-iso/package/gluster/0002-use-gnu-rpcgen.patch new file mode 100644 index 0000000000..57404863bc --- /dev/null +++ b/deploy/iso/minikube-iso/package/gluster/0002-use-gnu-rpcgen.patch @@ -0,0 +1,42 @@ +diff -ru gluster-4.1.5/rpc/xdr/gen/Makefile.am gluster-4.1.5.patched/rpc/xdr/gen/Makefile.am +--- gluster-4.1.5/rpc/xdr/gen/Makefile.am 2018-09-21 16:13:45.958611272 +0200 ++++ gluster-4.1.5.patched/rpc/xdr/gen/Makefile.am 2018-09-24 19:50:32.798967652 +0200 +@@ -19,14 +19,14 @@ + # in the build. Or we do this crufty thing instead. + $(XDRSOURCES): $(XDRGENFILES) + @if [ ! -e $(xdrdst)/$@ -o $(@:.c=.x) -nt $(xdrdst)/$@ ]; then \ +- rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\ ++ /usr/bin/rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\ + fi + + # d*mn sed in netbsd6 doesn't do -i (inline) + # (why are we still running smoke on netbsd6 and not netbsd7?) + $(XDRHEADERS): $(XDRGENFILES) + @if [ ! -e $(xdrdst)/$@ -o $(@:.h=.x) -nt $(xdrdst)/$@ ]; then \ +- rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \ ++ /usr/bin/rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \ + sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' \ + -e '/#endif/ s/-/_/' -e 's/TMP_/H_/g' \ + $(@:.h=.tmp) > $(xdrdst)/$@ && \ +Only in gluster-4.1.5.patched/rpc/xdr/gen: Makefile.am~ +diff -ru gluster-4.1.5/rpc/xdr/gen/Makefile.in gluster-4.1.5.patched/rpc/xdr/gen/Makefile.in +--- gluster-4.1.5/rpc/xdr/gen/Makefile.in 2018-09-21 16:13:56.087638030 +0200 ++++ gluster-4.1.5.patched/rpc/xdr/gen/Makefile.in 2018-09-24 19:51:06.198109046 +0200 +@@ -558,14 +558,14 @@ + # in the build. Or we do this crufty thing instead. + $(XDRSOURCES): $(XDRGENFILES) + @if [ ! -e $(xdrdst)/$@ -o $(@:.c=.x) -nt $(xdrdst)/$@ ]; then \ +- rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\ ++ /usr/bin/rpcgen -c -o $(xdrdst)/$@ $(@:.c=.x) ;\ + fi + + # d*mn sed in netbsd6 doesn't do -i (inline) + # (why are we still running smoke on netbsd6 and not netbsd7?) + $(XDRHEADERS): $(XDRGENFILES) + @if [ ! -e $(xdrdst)/$@ -o $(@:.h=.x) -nt $(xdrdst)/$@ ]; then \ +- rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \ ++ /usr/bin/rpcgen -h -o $(@:.h=.tmp) $(@:.h=.x) && \ + sed -e '/#ifndef/ s/-/_/g' -e '/#define/ s/-/_/g' \ + -e '/#endif/ s/-/_/' -e 's/TMP_/H_/g' \ + $(@:.h=.tmp) > $(xdrdst)/$@ && \ +Only in gluster-4.1.5.patched/rpc/xdr/gen: Makefile.in~ diff --git a/deploy/iso/minikube-iso/package/gluster/gluster.hash b/deploy/iso/minikube-iso/package/gluster/gluster.hash index 18c7dd0667..ebb8c7059d 100644 --- a/deploy/iso/minikube-iso/package/gluster/gluster.hash +++ b/deploy/iso/minikube-iso/package/gluster/gluster.hash @@ -1 +1 @@ -sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz +sha512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f glusterfs-4.1.5.tar.gz diff --git a/deploy/iso/minikube-iso/package/gluster/gluster.mk b/deploy/iso/minikube-iso/package/gluster/gluster.mk index 61ba3bbb06..aedf078124 100644 --- a/deploy/iso/minikube-iso/package/gluster/gluster.mk +++ b/deploy/iso/minikube-iso/package/gluster/gluster.mk @@ -4,9 +4,9 @@ # ################################################################################ -GLUSTER_VERSION = 3.10.12 -GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/3.10/$(GLUSTER_VERSION) +GLUSTER_VERSION = 4.1.5 +GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/4.1/$(GLUSTER_VERSION) GLUSTER_SOURCE = glusterfs-$(GLUSTER_VERSION).tar.gz -GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs +GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs --disable-glupy --disable-gnfs --disable-cmocka --without-server GLUSTER_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install $(eval $(autotools-package)) From bb07acdc908f6650c6e0e327be0e4021eff16fd0 Mon Sep 17 00:00:00 2001 From: David Genest Date: Tue, 25 Sep 2018 21:08:54 -0400 Subject: [PATCH 3/5] ensure that /dev has settled before operating Minikube automount relies on a VM disk to be mounted (usually /dev/sda) to provide .ssh credentials. This commit adds a dependency on systemd-udev-settle to ensure that all devices (including disks) are up and available before executing the mount script. We use systemd-udev-settle https://github.com/systemd/systemd/blob/master/units/systemd-udev-settle.service.in To ensure this. Note that in the above link, we can read a comment stating that systemd-udev-settle is used to ensure a populated /dev during bootup, which is exaclty what we want. Signed-off-by: David Genest --- .../minikube-iso/package/automount/minikube-automount.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/iso/minikube-iso/package/automount/minikube-automount.service b/deploy/iso/minikube-iso/package/automount/minikube-automount.service index 4f5a6ce6fa..f5b7a6a52f 100644 --- a/deploy/iso/minikube-iso/package/automount/minikube-automount.service +++ b/deploy/iso/minikube-iso/package/automount/minikube-automount.service @@ -1,6 +1,8 @@ [Unit] Description=minikube automount +Requires=systemd-udev-settle.service Before=docker.service rkt-api.service rkt-metadata.service +After=systemd-udev-settle.service [Service] ExecStart=/usr/sbin/minikube-automount From 001a879437d77afeac8403c6b9b07240c4f60d85 Mon Sep 17 00:00:00 2001 From: samuela Date: Mon, 1 Oct 2018 18:43:50 -0700 Subject: [PATCH 4/5] Update ISSUE_TEMPLATE --- .github/ISSUE_TEMPLATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE index b44ccd1642..ee3b55601d 100644 --- a/.github/ISSUE_TEMPLATE +++ b/.github/ISSUE_TEMPLATE @@ -33,7 +33,7 @@ echo ""; echo "OS:"; cat /etc/os-release echo ""; -echo "VM driver": +echo "VM driver:"; grep DriverName ~/.minikube/machines/minikube/config.json echo ""; echo "ISO version"; From 2ebdf5e1ebcadf7c853c3b6ba823bc92fab2e59e Mon Sep 17 00:00:00 2001 From: Fernando Diaz Date: Thu, 4 Oct 2018 15:13:53 -0500 Subject: [PATCH 5/5] Enhance the Ingress Controller Addon (#3099) - Updates Ingress-Controller Version to 0.19.0 - Adds Service Account for Ingress-Controller - Adds Support for Prometheus - Fixes bug with TCP/UDP ConfigMaps not Loading - Adds more resource limits to default-backend - Use new ingress class name - Use app.kubernetes.io/xxxxxxxxxxx labels --- deploy/addons/ingress/ingress-configmap.yaml | 4 + deploy/addons/ingress/ingress-dp.yaml | 34 +++-- deploy/addons/ingress/ingress-rbac.yaml | 149 +++++++++++++++++++ deploy/addons/ingress/ingress-svc.yaml | 5 +- docs/contributors/build_guide.md | 3 + pkg/minikube/assets/addons.go | 5 + test/integration/util/util.go | 2 +- 7 files changed, 186 insertions(+), 16 deletions(-) create mode 100644 deploy/addons/ingress/ingress-rbac.yaml diff --git a/deploy/addons/ingress/ingress-configmap.yaml b/deploy/addons/ingress/ingress-configmap.yaml index 6cadddb9a9..2d1f7df962 100644 --- a/deploy/addons/ingress/ingress-configmap.yaml +++ b/deploy/addons/ingress/ingress-configmap.yaml @@ -29,9 +29,13 @@ kind: ConfigMap metadata: name: tcp-services namespace: kube-system + labels: + addonmanager.kubernetes.io/mode: EnsureExists --- apiVersion: v1 kind: ConfigMap metadata: name: udp-services namespace: kube-system + labels: + addonmanager.kubernetes.io/mode: EnsureExists diff --git a/deploy/addons/ingress/ingress-dp.yaml b/deploy/addons/ingress/ingress-dp.yaml index ec1e041f27..a3a21b6f82 100644 --- a/deploy/addons/ingress/ingress-dp.yaml +++ b/deploy/addons/ingress/ingress-dp.yaml @@ -18,17 +18,19 @@ metadata: name: default-http-backend namespace: kube-system labels: + app.kubernetes.io/name: default-http-backend + app.kubernetes.io/part-of: kube-system addonmanager.kubernetes.io/mode: Reconcile spec: replicas: 1 selector: matchLabels: - app: default-http-backend + app.kubernetes.io/name: default-http-backend addonmanager.kubernetes.io/mode: Reconcile template: metadata: labels: - app: default-http-backend + app.kubernetes.io/name: default-http-backend addonmanager.kubernetes.io/mode: Reconcile spec: terminationGracePeriodSeconds: 60 @@ -37,7 +39,7 @@ spec: # Any image is permissible as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: k8s.gcr.io/defaultbackend:1.4 + image: gcr.io/google_containers/defaultbackend:1.4 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -50,11 +52,11 @@ spec: - containerPort: 8080 resources: limits: - cpu: 10m - memory: 20Mi + cpu: 20m + memory: 30Mi requests: - cpu: 10m - memory: 20Mi + cpu: 20m + memory: 30Mi --- apiVersion: extensions/v1beta1 kind: Deployment @@ -62,21 +64,27 @@ metadata: name: nginx-ingress-controller namespace: kube-system labels: - app: nginx-ingress-controller + app.kubernetes.io/name: nginx-ingress-controller + app.kubernetes.io/part-of: kube-system addonmanager.kubernetes.io/mode: Reconcile spec: replicas: 1 selector: matchLabels: - app: nginx-ingress-controller + app.kubernetes.io/name: nginx-ingress-controller + app.kubernetes.io/part-of: kube-system addonmanager.kubernetes.io/mode: Reconcile template: metadata: labels: - app: nginx-ingress-controller - name: nginx-ingress-controller + app.kubernetes.io/name: nginx-ingress-controller + app.kubernetes.io/part-of: kube-system addonmanager.kubernetes.io/mode: Reconcile + annotations: + prometheus.io/port: '10254' + prometheus.io/scrape: 'true' spec: + serviceAccountName: nginx-ingress terminationGracePeriodSeconds: 60 containers: - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.19.0 @@ -108,8 +116,7 @@ spec: hostPort: 80 - containerPort: 443 hostPort: 443 - # we expose 18080 to access nginx stats in url /nginx-status - # this is optional + # (Optional) we expose 18080 to access nginx stats in url /nginx-status - containerPort: 18080 hostPort: 18080 args: @@ -118,6 +125,7 @@ spec: - --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services - --udp-services-configmap=$(POD_NAMESPACE)/udp-services + - --annotations-prefix=nginx.ingress.kubernetes.io # use minikube IP address in ingress status field - --report-node-internal-ip-address securityContext: diff --git a/deploy/addons/ingress/ingress-rbac.yaml b/deploy/addons/ingress/ingress-rbac.yaml new file mode 100644 index 0000000000..082195ef35 --- /dev/null +++ b/deploy/addons/ingress/ingress-rbac.yaml @@ -0,0 +1,149 @@ +--- + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: nginx-ingress + namespace: kube-system + labels: + addonmanager.kubernetes.io/mode: Reconcile + +--- + +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRole +metadata: + name: system:nginx-ingress + labels: + kubernetes.io/bootstrapping: rbac-defaults + addonmanager.kubernetes.io/mode: Reconcile +rules: +- apiGroups: + - "" + resources: + - configmaps + - endpoints + - nodes + - pods + - secrets + verbs: + - list + - watch +- apiGroups: + - "" + resources: + - nodes + verbs: + - get +- apiGroups: + - "" + resources: + - services + verbs: + - get + - list + - watch +- apiGroups: + - "extensions" + resources: + - ingresses + verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - events + verbs: + - create + - patch +- apiGroups: + - "extensions" + resources: + - ingresses/status + verbs: + - update + +--- + +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: Role +metadata: + name: system::nginx-ingress-role + namespace: kube-system + labels: + kubernetes.io/bootstrapping: rbac-defaults + addonmanager.kubernetes.io/mode: Reconcile +rules: +- apiGroups: + - "" + resources: + - configmaps + - pods + - secrets + - namespaces + verbs: + - get +- apiGroups: + - "" + resources: + - configmaps + resourceNames: + # Defaults to "-" + # Here: "-" + # This has to be adapted if you change either parameter + # when launching the nginx-ingress-controller. + - ingress-controller-leader-nginx + verbs: + - get + - update +- apiGroups: + - "" + resources: + - configmaps + verbs: + - create +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + +--- + +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + name: system::nginx-ingress-role-binding + namespace: kube-system + labels: + kubernetes.io/bootstrapping: rbac-defaults + addonmanager.kubernetes.io/mode: EnsureExists +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: system::nginx-ingress-role +subjects: +- kind: ServiceAccount + name: nginx-ingress + namespace: kube-system + +--- + +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + name: system:nginx-ingress + labels: + kubernetes.io/bootstrapping: rbac-defaults + addonmanager.kubernetes.io/mode: EnsureExists +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: system:nginx-ingress +subjects: +- kind: ServiceAccount + name: nginx-ingress + namespace: kube-system \ No newline at end of file diff --git a/deploy/addons/ingress/ingress-svc.yaml b/deploy/addons/ingress/ingress-svc.yaml index 61c7518d60..f480bbfed4 100644 --- a/deploy/addons/ingress/ingress-svc.yaml +++ b/deploy/addons/ingress/ingress-svc.yaml @@ -18,7 +18,8 @@ metadata: name: default-http-backend namespace: kube-system labels: - app: default-http-backend + app.kubernetes.io/name: default-http-backend + app.kubernetes.io/part-of: kube-system kubernetes.io/minikube-addons: ingress kubernetes.io/minikube-addons-endpoint: ingress addonmanager.kubernetes.io/mode: Reconcile @@ -29,4 +30,4 @@ spec: targetPort: 8080 nodePort: 30001 selector: - app: default-http-backend + app.kubernetes.io/name: default-http-backend \ No newline at end of file diff --git a/docs/contributors/build_guide.md b/docs/contributors/build_guide.md index 85f312a965..a95f345dc5 100644 --- a/docs/contributors/build_guide.md +++ b/docs/contributors/build_guide.md @@ -21,6 +21,9 @@ $ cd $GOPATH/src/k8s.io/minikube $ make ``` +Note: Make sure that you uninstall any previous versions of minikube before building +from the source. + ### Building from Source in Docker (using Debian stretch image with golang) Clone minikube: ```shell diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 00687d9d27..e4c7357bfb 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -203,6 +203,11 @@ var Addons = map[string]*Addon{ constants.AddonsPath, "ingress-configmap.yaml", "0640"), + NewBinDataAsset( + "deploy/addons/ingress/ingress-rbac.yaml", + constants.AddonsPath, + "ingress-rbac.yaml", + "0640"), NewBinDataAsset( "deploy/addons/ingress/ingress-dp.yaml", constants.AddonsPath, diff --git a/test/integration/util/util.go b/test/integration/util/util.go index 7945ac4e18..434b236232 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -247,7 +247,7 @@ func WaitForIngressControllerRunning(t *testing.T) error { return errors.Wrap(err, "waiting for ingress-controller deployment to stabilize") } - selector := labels.SelectorFromSet(labels.Set(map[string]string{"app": "nginx-ingress-controller"})) + selector := labels.SelectorFromSet(labels.Set(map[string]string{"app.kubernetes.io/name": "nginx-ingress-controller"})) if err := commonutil.WaitForPodsWithLabelRunning(client, "kube-system", selector); err != nil { return errors.Wrap(err, "waiting for ingress-controller pods") }