Fresh dep ensure

vendor/k8s.io/kubernetes/cluster/gce/manifests/BUILD

@@ -15,17 +15,14 @@ filegroup(
     srcs = [
         "abac-authz-policy.jsonl",
         "cluster-autoscaler.manifest",
-        "e2e-image-puller.manifest",
         "etcd.manifest",
         "etcd-empty-dir-cleanup.yaml",
         "glbc.manifest",
-        "kms-plugin-container.manifest",
         "kube-addon-manager.yaml",
         "kube-apiserver.manifest",
         "kube-controller-manager.manifest",
         "kube-proxy.manifest",
         "kube-scheduler.manifest",
-        "rescheduler.manifest",
     ] + glob(["internal-*"]),
 )
 

vendor/k8s.io/kubernetes/cluster/gce/manifests/cluster-autoscaler.manifest

@@ -17,7 +17,7 @@
         "containers": [
             {
                 "name": "cluster-autoscaler",
-                "image": "k8s.gcr.io/cluster-autoscaler:v1.3.0",
+                "image": "k8s.gcr.io/cluster-autoscaler:v1.13.0",
                 "livenessProbe": {
                     "httpGet": {
                         "path": "/health-check",
@@ -33,6 +33,7 @@
                     "--logtostderr=true",
                     "--write-status-configmap=true",
                     "--balance-similar-node-groups=true",
+		    "--expendable-pods-priority-cutoff=-10",
                     "{{params}}"
                 ],
                 "env": [

vendor/k8s.io/kubernetes/cluster/gce/manifests/e2e-image-puller.manifest

@@ -1,117 +0,0 @@
-# e2e-image-puller seeds nodes in an e2e cluster with test images.
-apiVersion: v1
-kind: Pod
-metadata:
-  name: e2e-image-puller
-  namespace: kube-system
-  labels:
-    name: e2e-image-puller
-spec:
-  containers:
-  - name: image-puller
-    resources:
-      requests:
-        cpu: 100m
-      limits:
-        cpu: 100m
-    image: k8s.gcr.io/busybox:1.24
-    # TODO: Replace this with a go script that pulls in parallel?
-    # Currently it takes ~5m to pull all e2e images, so this is OK, and
-    # fewer moving parts is always better.
-    # TODO: Replace the hardcoded image list with an autogen list; the list is
-    # currently hard-coded for static verification. It was generated via:
-    # grep -Iiroh "gcr.io/.*" "${KUBE_ROOT}/test/e2e" | \
-    #     sed -e "s/[,\")}]//g" | awk '{print $1}' | sort | uniq | tr '\n' ' '
-    # We always want the subshell to exit 0 so this pod doesn't end up
-    # blocking tests in an Error state.
-    command:
-    - /bin/sh
-    - -c
-    - >
-      for i in
-      k8s.gcr.io/alpine-with-bash:1.0
-      k8s.gcr.io/apparmor-loader:0.1
-      k8s.gcr.io/busybox:1.24
-      k8s.gcr.io/dnsutils:e2e
-      k8s.gcr.io/e2e-net-amd64:1.0
-      k8s.gcr.io/echoserver:1.10
-      k8s.gcr.io/eptest:0.1
-      k8s.gcr.io/fakegitserver:0.1
-      k8s.gcr.io/galera-install:0.1
-      k8s.gcr.io/invalid-image:invalid-tag
-      k8s.gcr.io/iperf:e2e
-      k8s.gcr.io/jessie-dnsutils:e2e
-      k8s.gcr.io/k8s-dns-dnsmasq-amd64:1.14.5
-      k8s.gcr.io/liveness:e2e
-      k8s.gcr.io/logs-generator:v0.1.0
-      k8s.gcr.io/mounttest:0.8
-      k8s.gcr.io/mounttest-user:0.5
-      k8s.gcr.io/mysql-galera:e2e
-      k8s.gcr.io/mysql-healthz:1.0
-      k8s.gcr.io/netexec:1.4
-      k8s.gcr.io/netexec:1.5
-      k8s.gcr.io/netexec:1.7
-      k8s.gcr.io/nettest:1.7
-      k8s.gcr.io/nginx:1.7.9
-      k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.1
-      k8s.gcr.io/nginx-slim:0.7
-      k8s.gcr.io/nginx-slim:0.8
-      k8s.gcr.io/node-problem-detector:v0.3.0
-      k8s.gcr.io/pause
-      k8s.gcr.io/porter:4524579c0eb935c056c8e75563b4e1eda31587e0
-      k8s.gcr.io/portforwardtester:1.2
-      k8s.gcr.io/redis-install-3.2.0:e2e
-      k8s.gcr.io/resource_consumer:beta4
-      k8s.gcr.io/resource_consumer/controller:beta4
-      gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1
-      gcr.io/kubernetes-e2e-test-images/hostexec-amd64:1.1
-      k8s.gcr.io/servicelb:0.1
-      k8s.gcr.io/test-webserver:e2e
-      k8s.gcr.io/update-demo:kitten
-      k8s.gcr.io/update-demo:nautilus
-      gcr.io/kubernetes-e2e-test-images/volume-ceph:0.1
-      gcr.io/kubernetes-e2e-test-images/volume-gluster:0.2
-      gcr.io/kubernetes-e2e-test-images/volume-iscsi:0.1
-      gcr.io/kubernetes-e2e-test-images/volume-nfs:0.8
-      gcr.io/kubernetes-e2e-test-images/volume-rbd:0.1
-      k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e
-      gcr.io/google_samples/gb-redisslave:nonexistent
-      ; do echo $(date '+%X') pulling $i; crictl pull $i 1>/dev/null; done; exit 0;
-    securityContext:
-      privileged: true
-    volumeMounts:
-    - mountPath: {{ container_runtime_endpoint }}
-      name: socket
-    - mountPath: /usr/bin/crictl
-      name: crictl
-    - mountPath: /etc/crictl.yaml
-      name: config
-  # Add a container that runs a health-check
-  - name: nethealth-check
-    resources:
-      requests:
-        cpu: 100m
-      limits:
-        cpu: 100m
-    image:  k8s.gcr.io/kube-nethealth-amd64:1.0
-    command:
-    - /bin/sh
-    - -c
-    - "/usr/bin/nethealth || true"
-  volumes:
-  - hostPath:
-      path: {{ container_runtime_endpoint }}
-      type: Socket
-    name: socket
-  - hostPath:
-      path: /home/kubernetes/bin/crictl
-      type: File
-    name: crictl
-  - hostPath:
-      path: /etc/crictl.yaml
-      type: File
-    name: config
-  # This pod is really fire-and-forget.
-  restartPolicy: OnFailure
-  # This pod needs hostNetworking for true VM perf measurement as well as avoiding cbr0 issues
-  hostNetwork: true

vendor/k8s.io/kubernetes/cluster/gce/manifests/etcd-empty-dir-cleanup.yaml

@@ -14,4 +14,4 @@ spec:
   dnsPolicy: Default
   containers:
   - name: etcd-empty-dir-cleanup
-    image: k8s.gcr.io/etcd-empty-dir-cleanup:3.2.18.0
+    image: k8s.gcr.io/etcd-empty-dir-cleanup:3.2.24.0

vendor/k8s.io/kubernetes/cluster/gce/manifests/etcd.manifest

@@ -14,7 +14,7 @@
 "containers":[
     {
     "name": "etcd-container",
-    "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.2.18-0') }}",
+    "image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.2.24-1') }}",
     "resources": {
       "requests": {
         "cpu": {{ cpulimit }}
@@ -30,7 +30,7 @@
         "value": "{{ pillar.get('storage_backend', 'etcd3') }}"
       },
       { "name": "TARGET_VERSION",
-        "value": "{{ pillar.get('etcd_version', '3.2.18') }}"
+        "value": "{{ pillar.get('etcd_version', '3.2.24') }}"
       },
       { "name": "DATA_DIRECTORY",
         "value": "/var/etcd/data{{ suffix }}"
@@ -80,7 +80,7 @@
         "readOnly": false
       },
       { "name": "etc",
-        "mountPath": "{{ srv_kube_path }}",
+        "mountPath": "/etc/srv/kubernetes",
         "readOnly": false
       }
     ]
@@ -98,7 +98,7 @@
   },
   { "name": "etc",
     "hostPath": {
-        "path": "{{ srv_kube_path }}"}
+        "path": "/etc/srv/kubernetes"}
   }
 ]
 }}

vendor/k8s.io/kubernetes/cluster/gce/manifests/glbc.manifest

@@ -1,20 +1,20 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: l7-lb-controller-v1.1.1
+  name: l7-lb-controller-v1.2.3
   namespace: kube-system
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ''
     seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
   labels:
     k8s-app: gcp-lb-controller
-    version: v1.1.1
+    version: v1.2.3
     kubernetes.io/name: "GLBC"
 spec:
   terminationGracePeriodSeconds: 600
   hostNetwork: true
   containers:
-  - image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.1.1
+  - image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.2.3
     livenessProbe:
       httpGet:
         path: /healthz
@@ -45,7 +45,7 @@ spec:
     # TODO: split this out into args when we no longer need to pipe stdout to a file #6428
     - sh
     - -c
-    - 'exec /glbc --gce-ratelimit=ga.Operations.Get,qps,10,100 --gce-ratelimit=alpha.Operations.Get,qps,10,100 --gce-ratelimit=ga.BackendServices.Get,qps,1.8,1 --gce-ratelimit=ga.HealthChecks.Get,qps,1.8,1 --gce-ratelimit=alpha.HealthChecks.Get,qps,1.8,1 --verbose --apiserver-host=http://localhost:8080 --default-backend-service=kube-system/default-http-backend --sync-period=600s --running-in-cluster=false --use-real-cloud=true --config-file-path=/etc/gce.conf --healthz-port=8086 1>>/var/log/glbc.log 2>&1'
+    - 'exec /glbc --gce-ratelimit=ga.Operations.Get,qps,10,100 --gce-ratelimit=alpha.Operations.Get,qps,10,100 --gce-ratelimit=ga.BackendServices.Get,qps,1.8,1 --gce-ratelimit=ga.HealthChecks.Get,qps,1.8,1 --gce-ratelimit=alpha.HealthChecks.Get,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.Get,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.AttachNetworkEndpoints,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.DetachNetworkEndpoints,qps,1.8,1 --gce-ratelimit=beta.NetworkEndpointGroups.ListNetworkEndpoints,qps,1.8,1 --verbose --apiserver-host=http://localhost:8080 --default-backend-service=kube-system/default-http-backend --sync-period=600s --running-in-cluster=false --use-real-cloud=true --config-file-path=/etc/gce.conf --healthz-port=8086 1>>/var/log/glbc.log 2>&1'
   volumes:
   - hostPath:
       path: /etc/gce.conf

vendor/k8s.io/kubernetes/cluster/gce/manifests/kms-plugin-container.manifest

@@ -1,8 +0,0 @@
-{
-  "name": "kms-plugin",
-  "image": "gcr.io/google-containers/k8s-cloud-kms-plugin:v0.1.1",
-  "command": ["/k8s-cloud-kms-plugin", "--key-uri={{kms_key_uri}}", "--path-to-unix-socket={{kms_path_to_socket}}", "--gce-config={{gce_conf_path}}", "--logtostderr", "2>\&1"],
-  "livenessProbe": { "httpGet": {"host": "127.0.0.1", "port": 8081, "path": "/healthz"}, "initialDelaySeconds": 3, "timeoutSeconds": 3},
-  "ports":[{ "name": "healthz", "containerPort": 8081, "hostPort": 8081}, { "name": "metrics", "containerPort": 8082, "hostPort": 8082}],
-  "volumeMounts": [{{cloud_config_mount}}, {{kms_socket_mount}}]
-}

vendor/k8s.io/kubernetes/cluster/gce/manifests/kube-addon-manager.yaml

@@ -14,7 +14,7 @@ spec:
   - name: kube-addon-manager
     # When updating version also bump it in:
     # - test/kubemark/resources/manifests/kube-addon-manager.yaml
-    image: k8s.gcr.io/kube-addon-manager:v8.6
+    image: k8s.gcr.io/kube-addon-manager:v8.9
     command:
     - /bin/bash
     - -c
@@ -30,6 +30,9 @@ spec:
     - mountPath: /var/log
       name: varlog
       readOnly: false
+    env:
+    - name: KUBECTL_EXTRA_PRUNE_WHITELIST
+      value: {{kubectl_extra_prune_whitelist}}
   volumes:
   - hostPath:
       path: /etc/kubernetes/

vendor/k8s.io/kubernetes/cluster/gce/manifests/kube-apiserver.manifest

@@ -16,7 +16,6 @@
 "spec":{
 "hostNetwork": true,
 "containers":[
-    {{kms_plugin_container}}
     {
     "name": "kube-apiserver",
     "image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
@@ -35,11 +34,19 @@
       "httpGet": {
         "host": "127.0.0.1",
         "port": 8080,
-        "path": "/healthz"
+        "path": "/healthz?exclude=etcd"
       },
       "initialDelaySeconds": {{liveness_probe_initial_delay}},
       "timeoutSeconds": 15
     },
+    "readinessProbe": {
+      "httpGet": {
+        "host": "127.0.0.1",
+        "port": 8080,
+        "path": "/healthz"
+      },
+      "timeoutSeconds": 15
+    },
     "ports":[
       { "name": "https",
         "containerPort": {{secure_port}},
@@ -60,7 +67,7 @@
         {{admission_controller_config_mount}}
         {{image_policy_webhook_config_mount}}
         { "name": "srvkube",
-        "mountPath": "{{srv_kube_path}}",
+        "mountPath": "/etc/srv/kubernetes",
         "readOnly": true},
         { "name": "logfile",
         "mountPath": "/var/log/kube-apiserver.log",
@@ -102,7 +109,7 @@
   {{image_policy_webhook_config_volume}}
   { "name": "srvkube",
     "hostPath": {
-        "path": "{{srv_kube_path}}"}
+        "path": "/etc/srv/kubernetes"}
   },
   { "name": "logfile",
     "hostPath": {

vendor/k8s.io/kubernetes/cluster/gce/manifests/kube-controller-manager.manifest

@@ -21,7 +21,7 @@
     "image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
     "resources": {
       "requests": {
-        "cpu": "200m"
+        "cpu": "{{cpurequest}}"
       }
     },
     "command": [
@@ -44,7 +44,7 @@
         {{additional_cloud_config_mount}}
         {{pv_recycler_mount}}
         { "name": "srvkube",
-        "mountPath": "{{srv_kube_path}}",
+        "mountPath": "/etc/srv/kubernetes",
         "readOnly": true},
         {{flexvolume_hostpath_mount}}
         { "name": "logfile",
@@ -74,7 +74,7 @@
   {{pv_recycler_volume}}
   { "name": "srvkube",
     "hostPath": {
-        "path": "{{srv_kube_path}}"}
+        "path": "/etc/srv/kubernetes"}
   },
   {{flexvolume_hostpath}}
   { "name": "logfile",

vendor/k8s.io/kubernetes/cluster/gce/manifests/kube-proxy.manifest

@@ -6,8 +6,7 @@ metadata:
   # This annotation ensures that kube-proxy does not get evicted if the node
   # supports critical pod annotation based priority scheme.
   # Note that kube-proxy runs as a static pod so this annotation does NOT have
-  # any effect on rescheduler (default scheduler and rescheduler are not
-  # involved in scheduling kube-proxy).
+  # any effect on default scheduler which scheduling kube-proxy.
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ''
   labels:

vendor/k8s.io/kubernetes/cluster/gce/manifests/kube-scheduler.manifest

@@ -21,7 +21,7 @@
     "image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
     "resources": {
       "requests": {
-        "cpu": "75m"
+        "cpu": "{{cpurequest}}"
       }
     },
     "command": [
@@ -46,7 +46,7 @@
         },
         {
           "name": "srvkube",
-          "mountPath": "{{srv_kube_path}}",
+          "mountPath": "/etc/srv/kubernetes",
           "readOnly": true
         }
       ]
@@ -55,7 +55,7 @@
 "volumes":[
   {
     "name": "srvkube",
-    "hostPath": {"path": "{{srv_kube_path}}"}
+    "hostPath": {"path": "/etc/srv/kubernetes"}
   },
   {
     "name": "logfile",

vendor/k8s.io/kubernetes/cluster/gce/manifests/rescheduler.manifest

@@ -1,36 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: rescheduler-v0.4.0
-  namespace: kube-system
-  annotations:
-    scheduler.alpha.kubernetes.io/critical-pod: ''
-  labels:
-    k8s-app: rescheduler
-    version: v0.4.0
-    kubernetes.io/cluster-service: "true"
-    kubernetes.io/name: "Rescheduler"
-spec:
-  hostNetwork: true
-  containers:
-  - image: k8s.gcr.io/rescheduler:v0.4.0
-    name: rescheduler
-    volumeMounts:
-    - mountPath: /var/log/rescheduler.log
-      name: logfile
-      readOnly: false
-    # TODO: Make resource requirements depend on the size of the cluster
-    resources:
-      requests:
-        cpu: 10m
-        memory: 100Mi
-    command:
-    # TODO: split this out into args when we no longer need to pipe stdout to a file #6428
-    - sh
-    - -c
-    - 'exec /rescheduler --running-in-cluster=false 1>>/var/log/rescheduler.log 2>&1'
-  volumes:
-  - hostPath:
-      path: /var/log/rescheduler.log
-      type: FileOrCreate
-    name: logfile