Merge branch 'master' into dashboard_on_demand

kubernetes · Oct 4, 2018 · dc6d1ba · dc6d1ba
2 parents fd0d466 + 2ebdf5e
commit dc6d1ba
Show file tree

Hide file tree

Showing 17 changed files with 239 additions and 48 deletions.
diff --git 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";

diff --git 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
@@ -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,33 +52,39 @@ 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
 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
@@ -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 "<election-id>-<ingress-class>"
+  # Here: "<ingress-controller-leader>-<nginx>"
+  # 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
diff --git 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
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
 

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
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
@@ -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
@@ -1 +1 @@
-sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz
+sha512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f  glusterfs-4.1.5.tar.gz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sha256 49f14413c62f77d0ce5751934a28b291c4f04af47e591631d00e787ebcd07875 cni-plugins-amd64-v0.6.0-rc1.tgz
		sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d cni-plugins-amd64-v0.6.0.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		sha512 52043cb298831281b96869a6b4bcc25277493a50f95e8fda7fa26cbfba80b5e5d204ba83b0f13299599eefb29f058ed8cfc1d54188695f76323567df03c0501d glusterfs-3.10.12.tar.gz
		sha512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f glusterfs-4.1.5.tar.gz