diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index f6b3fd736e..5b5179b76d 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -127,7 +127,7 @@ logging_fluentd_cpu: "100m" logging_s3_bucket: "zalando-logging-{{.InfrastructureAccount | getAWSAccountID}}-{{.Region}}" logging_agent_in_visibility: "true" scalyr_team_token: "" -logging_agent_version: "v0.31" +logging_agent_version: "v0.32" zmon_redis_mem: "1Gi" zmon_agent_mem: "500Mi" @@ -200,7 +200,7 @@ teapot_admission_controller_validate_application_label: "false" {{end}} {{if eq .Environment "e2e"}} -teapot_admission_controller_ignore_namespaces: "^kube-system|(e2e-tests-(downward-api|kubectl|projected|statefulset|pod-network)-.*)$" +teapot_admission_controller_ignore_namespaces: "^kube-system|((downward-api|kubectl|projected|statefulset|pod-network)-.*)$" {{else}} teapot_admission_controller_ignore_namespaces: "^kube-system$" {{end}} @@ -219,8 +219,8 @@ cluster_dns: "coredns" coredns_log_svc_names: "true" coreos_image: "ami-0d1579b60bb706fb7" # Container Linux 2079.6.0 (HVM, eu-central-1) -kuberuntu_image: {{ amiID "zalando-ubuntu-kubernetes-production-v1.13.10-master-54" "861068367966" }} +kuberuntu_image: {{ amiID "zalando-ubuntu-kubernetes-production-v1.14.6-master-56" "861068367966" }} # Feature toggle to allow gradual decommissioning of ingress-template-controller enable_ingress_template_controller: "false" @@ -256,6 +256,9 @@ node_cidr_mask_size: "24" # Default: 24 # maximum number of PIDs allowed to be allocated per pod pod_max_pids: "4096" +# the cpu management policy which should be used by the kubelet +cpu_manager_policy: "none" + # when set to true, routes external traffic to the apiserver through a skipper sidecar apiserver_proxy: "true" # when set to true, service account tokens can be used from outside the cluster diff --git a/cluster/manifests/01-visibility/priority-logging.yaml b/cluster/manifests/01-visibility/priority-logging.yaml index 15f09bad55..fa1f0f1bd3 100644 --- a/cluster/manifests/01-visibility/priority-logging.yaml +++ b/cluster/manifests/01-visibility/priority-logging.yaml @@ -1,4 +1,4 @@ -apiVersion: scheduling.k8s.io/v1alpha1 +apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: name: visibility-logging diff --git a/cluster/manifests/01-visibility/priority.yaml b/cluster/manifests/01-visibility/priority.yaml index d45477dea6..c9bf1396df 100644 --- a/cluster/manifests/01-visibility/priority.yaml +++ b/cluster/manifests/01-visibility/priority.yaml @@ -1,4 +1,4 @@ -apiVersion: scheduling.k8s.io/v1alpha1 +apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: name: visibility-zmon diff --git a/cluster/manifests/emergency-access-service/ingress.yaml b/cluster/manifests/emergency-access-service/ingress.yaml index 8ec286910f..dec53e7bd2 100644 --- a/cluster/manifests/emergency-access-service/ingress.yaml +++ b/cluster/manifests/emergency-access-service/ingress.yaml @@ -1,5 +1,5 @@ {{ if eq .Environment "production" }} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: emergency-access-service diff --git a/cluster/manifests/external-dns/deployment.yaml b/cluster/manifests/external-dns/deployment.yaml index 711a7f171f..38918e2ec7 100644 --- a/cluster/manifests/external-dns/deployment.yaml +++ b/cluster/manifests/external-dns/deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system labels: application: external-dns - version: v0.5.15 + version: v0.5.16 spec: strategy: type: Recreate @@ -16,7 +16,7 @@ spec: metadata: labels: application: external-dns - version: v0.5.15 + version: v0.5.16 {{ if eq .ConfigItems.kube_aws_iam_controller_kube_system_enable "false"}} annotations: iam.amazonaws.com/role: "{{ .LocalID }}-app-external-dns" @@ -30,7 +30,7 @@ spec: serviceAccountName: external-dns containers: - name: external-dns - image: pierone.stups.zalan.do/teapot/external-dns:v0.5.15 + image: pierone.stups.zalan.do/teapot/external-dns:v0.5.16 args: - --source=service - --source=ingress diff --git a/cluster/manifests/kube-cluster-autoscaler/autoscaling-priority-class.yaml b/cluster/manifests/kube-cluster-autoscaler/autoscaling-priority-class.yaml index c05fc6e307..2a9f22346d 100644 --- a/cluster/manifests/kube-cluster-autoscaler/autoscaling-priority-class.yaml +++ b/cluster/manifests/kube-cluster-autoscaler/autoscaling-priority-class.yaml @@ -1,4 +1,4 @@ -apiVersion: scheduling.k8s.io/v1alpha1 +apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: name: autoscaling-buffer diff --git a/cluster/manifests/kube-downscaler/deployment.yaml b/cluster/manifests/kube-downscaler/deployment.yaml index fc11995707..b0ab646b70 100644 --- a/cluster/manifests/kube-downscaler/deployment.yaml +++ b/cluster/manifests/kube-downscaler/deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system labels: application: kube-downscaler - version: v0.12 + version: v0.18 spec: replicas: 1 selector: @@ -15,7 +15,7 @@ spec: metadata: labels: application: kube-downscaler - version: v0.12 + version: v0.18 spec: dnsConfig: options: @@ -26,14 +26,13 @@ spec: containers: - name: downscaler # see https://github.com/hjacobs/kube-downscaler/releases - image: registry.opensource.zalan.do/teapot/kube-downscaler:0.14 + image: registry.opensource.zalan.do/teapot/kube-downscaler:0.18 args: - --interval=30 - --exclude-namespaces=kube-system,visibility - --exclude-deployments=kube-downscaler,downscaler,postgres-operator - "--default-uptime={{ .ConfigItems.downscaler_default_uptime }}" - - --kind=stack - - --kind=deployment + - --include-resources=stacks,deployments resources: limits: cpu: 5m diff --git a/cluster/manifests/kube-proxy/daemonset.yaml b/cluster/manifests/kube-proxy/daemonset.yaml index 9df094d1eb..882203cbcf 100644 --- a/cluster/manifests/kube-proxy/daemonset.yaml +++ b/cluster/manifests/kube-proxy/daemonset.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system labels: application: kube-proxy - version: v1.13.7 + version: v1.14.6 spec: selector: matchLabels: @@ -17,7 +17,7 @@ spec: name: kube-proxy labels: application: kube-proxy - version: v1.13.7 + version: v1.14.6 annotations: config/hash: {{"configmap.yaml" | manifestHash}} spec: @@ -31,7 +31,7 @@ spec: hostNetwork: true containers: - name: kube-proxy - image: registry.opensource.zalan.do/teapot/kube-proxy:v1.13.7 + image: registry.opensource.zalan.do/teapot/kube-proxy:v1.14.6 args: - --hostname-override=$(HOSTNAME_OVERRIDE) - --config=/config/kube-proxy.yaml diff --git a/cluster/manifests/logging-agent/daemonset.yaml b/cluster/manifests/logging-agent/daemonset.yaml index c3ac8b374e..c28c4cb57a 100644 --- a/cluster/manifests/logging-agent/daemonset.yaml +++ b/cluster/manifests/logging-agent/daemonset.yaml @@ -83,7 +83,7 @@ spec: mountPath: /mnt/scalyr-checkpoint containers: - name: log-watcher - image: registry.opensource.zalan.do/logging/kubernetes-log-watcher:0.31 + image: registry.opensource.zalan.do/logging/kubernetes-log-watcher:0.33 env: - name: CLUSTER_NODE_NAME valueFrom: @@ -139,7 +139,7 @@ spec: - name: scalyr-agent - image: registry.opensource.zalan.do/eagleeye/scalyr-agent:0.5 + image: registry.opensource.zalan.do/eagleeye/scalyr-agent:master-8 env: # Note: added for scalyr-config-base, but not needed by the scalyr-agent itself. diff --git a/cluster/manifests/prometheus/configmap.yaml b/cluster/manifests/prometheus/configmap.yaml index ac00672b60..c3199e643b 100644 --- a/cluster/manifests/prometheus/configmap.yaml +++ b/cluster/manifests/prometheus/configmap.yaml @@ -81,14 +81,11 @@ data: scheme: http kubernetes_sd_configs: - role: endpoints - namespaces: - names: - - kube-system relabel_configs: # Look for the Prometheus annotations and scrape based on those - - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape] + - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_endpoints_name, __meta_kubernetes_service_annotation_prometheus_io_scrape] action: keep - regex: true + regex: ^(kube-system;.*?|default;stackset-controller);true$ - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme] action: replace target_label: __scheme__ diff --git a/cluster/manifests/prometheus/ingress.yaml b/cluster/manifests/prometheus/ingress.yaml index 2bc9b4ee7d..5efb8e3db3 100644 --- a/cluster/manifests/prometheus/ingress.yaml +++ b/cluster/manifests/prometheus/ingress.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system annotations: zalando.org/skipper-filter: | - oauthTokeninfoAnyScope("uid") + oauthTokeninfoAnyKV("realm", "/employees", "realm", "/services") labels: application: prometheus spec: diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml index 615ef53e15..532ef20733 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system labels: application: skipper-ingress - version: v0.10.271 + version: v0.10.273 component: ingress spec: strategy: @@ -18,7 +18,7 @@ spec: metadata: labels: application: skipper-ingress - version: v0.10.271 + version: v0.10.273 component: ingress annotations: kubernetes-log-watcher/scalyr-parser: | @@ -42,7 +42,7 @@ spec: hostNetwork: true containers: - name: skipper-ingress - image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.271 + image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.273 ports: - name: ingress-port containerPort: 9999 diff --git a/cluster/manifests/zmon-agent/deployment.yaml b/cluster/manifests/zmon-agent/deployment.yaml index 48196cdfa8..f66cf1ba1f 100644 --- a/cluster/manifests/zmon-agent/deployment.yaml +++ b/cluster/manifests/zmon-agent/deployment.yaml @@ -47,7 +47,7 @@ spec: readOnly: false containers: - name: zmon-agent - image: "pierone.stups.zalan.do/zmon/zmon-agent-core:0.4-2-ga5bdbee-zv5" + image: "pierone.stups.zalan.do/zmon/zmon-agent-core:0.4-11-gf8f2ced-zv5" resources: limits: cpu: {{.ConfigItems.zmon_agent_cpu}} diff --git a/cluster/manifests/zmon-worker/deployment.yaml b/cluster/manifests/zmon-worker/deployment.yaml index 651e1461e7..806918b57b 100644 --- a/cluster/manifests/zmon-worker/deployment.yaml +++ b/cluster/manifests/zmon-worker/deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: visibility labels: application: zmon-worker - version: "v208-py2eol-zv250-py2eol-2-gbe56be1" + version: "v209-py2eol-v251-py2eol" spec: replicas: {{.ConfigItems.zmon_worker_replicas}} selector: @@ -15,7 +15,7 @@ spec: metadata: labels: application: zmon-worker - version: "v208-py2eol-zv250-py2eol-2-gbe56be1" + version: "v209-py2eol-v251-py2eol" annotations: iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon" spec: @@ -46,7 +46,7 @@ spec: readOnly: false containers: - name: zmon-worker - image: "pierone.stups.zalan.do/zmon/zmon-worker:v208-py2eol-zv250-py2eol-2-gbe56be1" + image: "pierone.stups.zalan.do/zmon/zmon-worker:v209-py2eol-v251-py2eol" resources: limits: cpu: {{.ConfigItems.zmon_worker_cpu}} diff --git a/cluster/node-pools/master-default/userdata.clc.yaml b/cluster/node-pools/master-default/userdata.clc.yaml index d273649fed..0081f1c879 100644 --- a/cluster/node-pools/master-default/userdata.clc.yaml +++ b/cluster/node-pools/master-default/userdata.clc.yaml @@ -180,7 +180,7 @@ systemd: After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service [Service] - Environment=KUBELET_IMAGE_TAG=v1.13.7 + Environment=KUBELET_IMAGE_TAG=v1.14.6 Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet Environment="RKT_RUN_ARGS=--insecure-options=image \ @@ -361,7 +361,7 @@ storage: namespace: kube-system labels: application: kube-apiserver - version: v1.13.7 + version: v1.14.6 annotations: kubernetes-log-watcher/scalyr-parser: | [{"container": "webhook", "parser": "json-structured-log"}] @@ -373,7 +373,7 @@ storage: hostNetwork: true containers: - name: kube-apiserver - image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.13.7 + image: registry.opensource.zalan.do/teapot/kube-apiserver:v1.14.6 args: - --apiserver-count={{ .Values.apiserver_count }} - --bind-address=0.0.0.0 @@ -711,7 +711,7 @@ storage: namespace: kube-system labels: application: kube-controller-manager - version: v1.13.7 + version: v1.14.6 spec: priorityClassName: system-node-critical tolerations: @@ -719,7 +719,7 @@ storage: effect: NoSchedule containers: - name: kube-controller-manager - image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.13.7 + image: registry.opensource.zalan.do/teapot/kube-controller-manager:v1.14.6 args: - --kubeconfig=/etc/kubernetes/controller-kubeconfig - --leader-elect=true @@ -780,7 +780,7 @@ storage: namespace: kube-system labels: application: kube-scheduler - version: v1.13.7 + version: v1.14.6 spec: priorityClassName: system-node-critical tolerations: @@ -789,7 +789,7 @@ storage: hostNetwork: true containers: - name: kube-scheduler - image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.13.7 + image: registry.opensource.zalan.do/teapot/kube-scheduler:v1.14.6 args: - --master=http://127.0.0.1:8080 - --leader-elect=true @@ -1248,7 +1248,7 @@ storage: --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \ --mount volume=dns,target=/etc/resolv.conf \ --net=host \ - docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \ + docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \ --exec=/kubectl -- \ --kubeconfig=/etc/kubernetes/kubeconfig \ label node "$(hostname)" \ @@ -1261,7 +1261,7 @@ storage: --net=host \ --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \ --mount volume=dns,target=/etc/resolv.conf \ - docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \ + docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \ --exec=/kubectl -- \ --kubeconfig=/etc/kubernetes/kubeconfig \ drain "$(hostname)" \ diff --git a/cluster/node-pools/worker-default/userdata.clc.yaml b/cluster/node-pools/worker-default/userdata.clc.yaml index 0cb87fbf01..55f7e15710 100644 --- a/cluster/node-pools/worker-default/userdata.clc.yaml +++ b/cluster/node-pools/worker-default/userdata.clc.yaml @@ -179,7 +179,7 @@ systemd: After=docker.service dockercfg.service meta-data-iptables.service private-ipv4.service collect-instance-metadata.service [Service] - Environment=KUBELET_IMAGE_TAG=v1.13.7 + Environment=KUBELET_IMAGE_TAG=v1.14.6 Environment=KUBELET_IMAGE_ARGS=--exec=/kubelet Environment=KUBELET_IMAGE_URL=docker://registry.opensource.zalan.do/teapot/kubelet Environment="RKT_RUN_ARGS=--insecure-options=image \ @@ -488,7 +488,7 @@ storage: --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \ --mount volume=dns,target=/etc/resolv.conf \ --net=host \ - docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \ + docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \ --exec=/kubectl -- \ --kubeconfig=/etc/kubernetes/kubeconfig \ label node "$(hostname)" \ @@ -501,7 +501,7 @@ storage: --net=host \ --volume dns,kind=host,source=/run/systemd/resolve/resolv.conf,readOnly=true \ --mount volume=dns,target=/etc/resolv.conf \ - docker://registry.opensource.zalan.do/teapot/kubectl:v1.13.7 \ + docker://registry.opensource.zalan.do/teapot/kubectl:v1.14.6 \ --exec=/kubectl -- \ --kubeconfig=/etc/kubernetes/kubeconfig \ drain "$(hostname)" \ diff --git a/cluster/node-pools/worker-ubuntu-default/userdata.yaml b/cluster/node-pools/worker-ubuntu-default/userdata.yaml index 67b6f94f8e..4bd8a9b23d 100644 --- a/cluster/node-pools/worker-ubuntu-default/userdata.yaml +++ b/cluster/node-pools/worker-ubuntu-default/userdata.yaml @@ -53,6 +53,7 @@ write_files: SupportPodPidsLimit: true podPidsLimit: {{ .NodePool.ConfigItems.pod_max_pids }} {{- end }} + cpuManagerPolicy: {{ .NodePool.ConfigItems.cpu_manager_policy }} maxPods: {{ .Cluster.ConfigItems.node_max_pods }} healthzPort: 10248 healthzBindAddress: "0.0.0.0" diff --git a/test/e2e/Makefile b/test/e2e/Makefile index c0e3beaefc..aad0d51b70 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -2,7 +2,7 @@ BINARY ?= kubernetes-on-aws-e2e VERSION ?= $(shell git describe --tags --always --dirty) -KUBE_VERSION ?= v1.13.5 +KUBE_VERSION ?= v1.14.6 IMAGE ?= registry-write.opensource.zalan.do/teapot/$(BINARY) TAG ?= $(VERSION) DOCKERFILE ?= Dockerfile diff --git a/test/e2e/README.md b/test/e2e/README.md index 2bf761036f..b3692571bd 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -85,11 +85,11 @@ scratch and test the Kubernetes type Foo. defer func() { By("deleting the foo) defer GinkgoRecover() - err2 := cs.Core().Foo(ns).Delete(foo.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Foo(ns).Delete(foo.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() // creates the Ingress Object - _, err := cs.Core().Foo(ns).Create(foo) + _, err := cs.CoreV1().Foo(ns).Create(foo) Expect(err).NotTo(HaveOccurred()) }) }) @@ -113,10 +113,10 @@ scratch and test the Kubernetes type Foo. defer func() { By("deleting the pod") defer GinkgoRecover() - err2 := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - _, err = cs.Core().Pods(ns).Create(pod) + _, err = cs.CoreV1().Pods(ns).Create(pod) Expect(err).NotTo(HaveOccurred()) framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) ``` @@ -137,10 +137,10 @@ scratch and test the Kubernetes type Foo. defer func() { By("deleting the service") defer GinkgoRecover() - err2 := cs.Core().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - _, err := cs.Core().Services(ns).Create(service) + _, err := cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) ``` @@ -163,14 +163,14 @@ Create Kubernetes ingress object: defer func() { By("deleting the ingress") defer GinkgoRecover() - err2 := cs.Extensions().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0)) + err2 := cs.ExtensionsV1beta1().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing) + ingressCreate, err := cs.ExtensionsV1beta1().Ingresses(ns).Create(ing) Expect(err).NotTo(HaveOccurred()) addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, 3*time.Minute) Expect(err).NotTo(HaveOccurred()) - ingress, err := cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) + ingress, err := cs.ExtensionsV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("ALB endpoint from ingress status: %s", ingress.Status.LoadBalancer.Ingress[0].Hostname)) ``` diff --git a/test/e2e/apiserver.go b/test/e2e/apiserver.go index 0ccb2e0fbb..0f21e41dca 100644 --- a/test/e2e/apiserver.go +++ b/test/e2e/apiserver.go @@ -50,13 +50,8 @@ var _ = framework.KubeDescribe("API Server webhook tests", func() { By("Creating deployment " + nameprefix + " in namespace " + ns) deployment := createImagePolicyWebhookTestDeployment(nameprefix+"-", ns, tag, podname, replicas) - _, err := cs.ExtensionsV1beta1().Deployments(ns).Create(deployment) - defer func() { - By(fmt.Sprintf("Delete a compliant deployment: %s", deployment.Name)) - defer GinkgoRecover() - err := cs.Extensions().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) - Expect(err).NotTo(HaveOccurred()) - }() + _, err := cs.AppsV1().Deployments(ns).Create(deployment) + defer deleteDeployment(cs, ns, deployment) Expect(err).NotTo(HaveOccurred()) label := map[string]string{ "app": podname, @@ -79,12 +74,12 @@ var _ = framework.KubeDescribe("API Server webhook tests", func() { By("Creating deployment " + nameprefix + " in namespace " + ns) deployment := createImagePolicyWebhookTestDeployment(nameprefix+"-", ns, tag, podname, replicas) - _, err := cs.ExtensionsV1beta1().Deployments(ns).Create(deployment) + _, err := cs.AppsV1().Deployments(ns).Create(deployment) Expect(err).NotTo(HaveOccurred()) defer func() { By(fmt.Sprintf("Delete a compliant deployment: %s", deployment.Name)) defer GinkgoRecover() - err := cs.Extensions().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) + err := cs.AppsV1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) Expect(err).NotTo(HaveOccurred()) }() err = framework.WaitForDeploymentWithCondition(cs, ns, deployment.Name, "FailedCreate", appsv1.DeploymentReplicaFailure) diff --git a/test/e2e/audit.go b/test/e2e/audit.go index 6dc6e1bb59..520053c5e0 100644 --- a/test/e2e/audit.go +++ b/test/e2e/audit.go @@ -118,10 +118,10 @@ func expectEvents(f *framework.Framework, expectedEvents []utils.AuditEvent) { missingReport, err := utils.CheckAuditLines(stream, expectedEvents, auditv1.SchemeGroupVersion) if err != nil { framework.Logf("Failed to observe audit events: %v", err) - } else if len(missingReport) > 0 { + } else if len(missingReport.MissingEvents) > 0 { framework.Logf("Events %#v not found!", missingReport) } - return len(missingReport) == 0, nil + return len(missingReport.MissingEvents) == 0, nil }) framework.ExpectNoError(err, "after %v failed to observe audit events", pollingTimeout) } diff --git a/test/e2e/cluster_config.sh b/test/e2e/cluster_config.sh index 28965a7b14..20f5ffbee0 100755 --- a/test/e2e/cluster_config.sh +++ b/test/e2e/cluster_config.sh @@ -68,6 +68,8 @@ clusters: profile: ${WORKER_PROFILE}-splitaz min_size: 3 max_size: 21 + config_items: + cpu_manager_policy: static - discount_strategy: spot_max_price instance_types: ["m4.large", "m5.large", "m5.xlarge", "m4.xlarge"] name: default-worker diff --git a/test/e2e/external_dns.go b/test/e2e/external_dns.go index 2333a2e8ef..29e0544b7b 100644 --- a/test/e2e/external_dns.go +++ b/test/e2e/external_dns.go @@ -50,14 +50,14 @@ var _ = framework.KubeDescribe("External DNS creation", func() { By("Creating service " + serviceName + " in namespace " + ns) defer func() { - err := cs.Core().Services(ns).Delete(serviceName, nil) + err := cs.CoreV1().Services(ns).Delete(serviceName, nil) Expect(err).NotTo(HaveOccurred()) }() hostName := fmt.Sprintf("%s-%d.%s", serviceName, time.Now().UTC().Unix(), E2EHostedZone()) service := createServiceTypeLoadbalancer(serviceName, hostName, labels, port) - _, err := cs.Core().Services(ns).Create(service) + _, err := cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) By("Submitting the pod to kubernetes") @@ -65,11 +65,11 @@ var _ = framework.KubeDescribe("External DNS creation", func() { defer func() { By("deleting the pod") defer GinkgoRecover() - err2 := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - _, err = cs.Core().Pods(ns).Create(pod) + _, err = cs.CoreV1().Pods(ns).Create(pod) Expect(err).NotTo(HaveOccurred()) framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) diff --git a/test/e2e/go.mod b/test/e2e/go.mod index d198e6b2ff..2b490a512a 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,11 +1,10 @@ module github.com/zalando-incubator/kubernetes-on-aws/tests/e2e require ( - bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c // indirect - github.com/Azure/azure-sdk-for-go v21.3.0+incompatible // indirect + github.com/Azure/azure-sdk-for-go v21.4.0+incompatible // indirect github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Azure/go-autorest v11.1.0+incompatible // indirect - github.com/BurntSushi/toml v0.3.1 // indirect + github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190423194502-f026ec2b358e // indirect github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect github.com/Microsoft/go-winio v0.4.11 // indirect github.com/Microsoft/hcsshim v0.8.2 // indirect @@ -14,9 +13,8 @@ require ( github.com/Rican7/retry v0.1.0 // indirect github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e // indirect github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 // indirect - github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect - github.com/blang/semver v3.5.0+incompatible // indirect github.com/boltdb/bolt v1.3.1 // indirect + github.com/cloudflare/cfssl v0.0.0-20190616170404-1bf3e59ec1cf // indirect github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 // indirect github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 // indirect github.com/codedellemc/goscaleio v0.0.0-20170830184815-20e2ce2cf885 // indirect @@ -29,7 +27,7 @@ require ( github.com/coreos/bbolt v1.3.1-coreos.6 // indirect github.com/coreos/etcd v3.2.13+incompatible // indirect github.com/coreos/go-semver v0.0.0-20150304020126-568e959cd898 // indirect - github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b // indirect + github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 // indirect github.com/coreos/pkg v0.0.0-20160620232715-fa29b1d70f0b // indirect github.com/coreos/rkt v1.25.0 // indirect github.com/cyphar/filepath-securejoin v0.2.2 // indirect @@ -43,32 +41,27 @@ require ( github.com/docker/go-units v0.3.3 // indirect github.com/docker/libnetwork v0.8.0-dev.2.0.20180830151422-a9cd636e3789 // indirect github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect - github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e // indirect github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 // indirect - github.com/emicklei/go-restful-swagger12 v0.0.0-20170208215640-dcef7f557305 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+incompatible github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96 // indirect - github.com/ghodss/yaml v1.0.0 // indirect github.com/go-openapi/strfmt v0.17.2 // indirect github.com/go-openapi/validate v0.17.2 // indirect github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 // indirect github.com/gogo/protobuf v1.2.1 // indirect + github.com/golang/protobuf v1.3.1 // indirect github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect github.com/google/cadvisor v0.32.0 // indirect - github.com/google/go-cmp v0.2.0 // indirect - github.com/google/gofuzz v1.0.0 // indirect - github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc // indirect + github.com/google/certificate-transparency-go v1.0.21 // indirect + github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8 // indirect github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect - github.com/gorilla/context v1.1.1 // indirect - github.com/gorilla/mux v1.6.2 // indirect github.com/gorilla/websocket v1.4.0 // indirect github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.5.1 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.8.5 // indirect github.com/heketi/heketi v8.0.0+incompatible // indirect github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect @@ -76,25 +69,23 @@ require ( github.com/imdario/mergo v0.3.6 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jonboulle/clockwork v0.1.0 // indirect - github.com/json-iterator/go v1.1.5 // indirect - github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible // indirect github.com/jtolds/gls v4.2.1+incompatible // indirect github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect github.com/karrick/godirwalk v1.8.0 // indirect - github.com/kr/pretty v0.1.0 // indirect github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/lithammer/dedent v1.1.0 // indirect github.com/lpabon/godbc v0.1.1 // indirect github.com/marstr/guid v1.1.0 // indirect github.com/mattn/go-shellwords v1.0.3 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/mesos/mesos-go v0.0.8 // indirect github.com/miekg/dns v1.1.1 // indirect github.com/mikkeloscar/kube-aws-iam-controller v0.1.0 github.com/mindprince/gonvml v0.0.0-20180514031326-b364b296c732 // indirect github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77 // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 // indirect + github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/natefinch/lumberjack v2.0.0+incompatible // indirect github.com/onsi/ginkgo v1.8.0 @@ -104,62 +95,56 @@ require ( github.com/opencontainers/runc v1.0.0-rc2.0.20180424185634-871ba2e58e24 // indirect github.com/opencontainers/runtime-spec v1.0.1 // indirect github.com/opencontainers/selinux v1.0.0-rc1 // indirect - github.com/pkg/errors v0.8.0 // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7 // indirect - github.com/prometheus/client_golang v0.8.1-0.20170401103446-08fd2e12372a // indirect - github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect - github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 // indirect - github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect github.com/quobyte/api v0.1.2 // indirect github.com/rancher/go-rancher v0.1.1-0.20160922212217-09693a8743ba // indirect - github.com/renstrom/dedent v0.0.0-20150819195903-020d11c3b9c0 // indirect github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c // indirect github.com/satori/go.uuid v1.2.0 // indirect github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect github.com/sigma/go-inotify v0.0.0-20181102212354-c87b6cf5033d // indirect - github.com/sirupsen/logrus v1.2.0 // indirect github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect github.com/spf13/cobra v0.0.3 // indirect - github.com/spf13/pflag v1.0.3 // indirect github.com/spf13/viper v1.2.1 // indirect - github.com/storageos/go-api v0.0.0-20180126153955-3a4032328d99 // indirect + github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc // indirect github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 // indirect github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7 // indirect github.com/urfave/negroni v1.0.0 // indirect github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e // indirect github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect - github.com/vmware/govmomi v0.19.0 // indirect + github.com/vmware/govmomi v0.20.0 // indirect github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc // indirect github.com/xanzy/go-cloudstack v2.3.3+incompatible // indirect github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect + go.opencensus.io v0.20.2 // indirect golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect - google.golang.org/api v0.0.0-20181129220737-af4fc4062c26 // indirect - google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e // indirect - google.golang.org/grpc v1.15.0 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + google.golang.org/grpc v1.19.1 // indirect gopkg.in/gcfg.v1 v1.2.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7 // indirect gopkg.in/square/go-jose.v2 v2.2.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 // indirect gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20181221193117-173ce66c1e39 + k8s.io/api v0.0.0-20190515023547-db5a9d1c40eb k8s.io/apiextensions-apiserver v0.0.0-20170616221715-abd4538a1176 // indirect - k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b + k8s.io/apimachinery v0.0.0-20190715170309-6171873045ff k8s.io/apiserver v0.0.0-20170616221227-b1c85a6c288c k8s.io/cli-runtime v0.0.0-20190301175653-0c2382d2cffa // indirect - k8s.io/client-go v10.0.0+incompatible - k8s.io/cloud-provider v0.0.0-20190323031113-9c9d72d1bf90 // indirect + k8s.io/client-go v11.0.0+incompatible k8s.io/cluster-bootstrap v0.0.0-20190313124217-0fa624df11e9 // indirect - k8s.io/csi-api v0.0.0-20190301175547-a37926bd2215 // indirect + k8s.io/component-base v0.0.0-20190515024022-2354f2393ad4 // indirect + k8s.io/csi-translation-lib v0.0.0-20190515064806-e1b42b89656a // indirect k8s.io/kube-aggregator v0.0.0-20181126193524-9aab01d6c77d // indirect + k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect k8s.io/kube-proxy v0.0.0-20190301175851-ddc76f82d22d // indirect k8s.io/kubelet v0.0.0-20190301175949-303923139e95 // indirect - k8s.io/kubernetes v1.13.5 + k8s.io/kubernetes v1.14.6 k8s.io/metrics v0.0.0-20170703180439-8efbc8e22d00 // indirect k8s.io/sample-apiserver v0.0.0-20181121072341-dbb2709fc5ec // indirect - k8s.io/utils v0.0.0-20180726175726-66066c83e385 // indirect + k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0 // indirect + sigs.k8s.io/kustomize v2.0.3+incompatible // indirect + sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 // indirect ) replace k8s.io/kubernetes => ../e2e_modules/kubernetes @@ -176,6 +161,8 @@ replace k8s.io/cli-runtime => ../e2e_modules/kubernetes/staging/src/k8s.io/cli-r replace k8s.io/client-go => ../e2e_modules/kubernetes/staging/src/k8s.io/client-go +replace k8s.io/cloud-provider => ../e2e_modules/kubernetes/staging/src/k8s.io/cloud-provider + replace k8s.io/code-generator => ../e2e_modules/kubernetes/staging/src/k8s.io/code-generator replace k8s.io/csi-api => ../e2e_modules/kubernetes/staging/src/k8s.io/csi-api diff --git a/test/e2e/go.sum b/test/e2e/go.sum index f29ff50315..f33aa03eb2 100644 --- a/test/e2e/go.sum +++ b/test/e2e/go.sum @@ -1,17 +1,16 @@ -bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c h1:t+Ra932MCC0eeyD/vigXqMbZTzgZjd4JOfBJWC6VSMI= -bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c/go.mod h1:1vhO7Mn/FZMgOgDVGLy5X1mE6rq1HbkBdkF/yj8zkcg= -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/Azure/azure-sdk-for-go v21.3.0+incompatible h1:YFvAka2WKAl2xnJkYV1e1b7E2z88AgFszDzWU18ejMY= -github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v21.4.0+incompatible h1:rsdM2HqR64WhJv7YqMAjWOLAebbx4c9/gzcLC7yoDDE= +github.com/Azure/azure-sdk-for-go v21.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest v11.1.0+incompatible h1:9DfMsQdUMEtg1jKRTjtkNZsvOuZXJOMl4dN1kiQwAc8= github.com/Azure/go-autorest v11.1.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190423194502-f026ec2b358e h1:UQe1isloJDsnWPeFp9+GClvHT0J/YYgzjLlH4XUnEYI= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190423194502-f026ec2b358e/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab h1:UKkYhof1njT1/xq4SEg5z+VpTgjmNeHwPGRQl7takDI= github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q= @@ -28,8 +27,11 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.0 h1:FqK94z34ly8Baa6K+G8Mmza9rYWTKOJk+yckIBB5qVk= github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco= @@ -45,6 +47,8 @@ github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cfssl v0.0.0-20190616170404-1bf3e59ec1cf h1:0/1jvWAjicn0BZTNnv5KLnf29+B01Yh1O0BMLrgOCb0= +github.com/cloudflare/cfssl v0.0.0-20190616170404-1bf3e59ec1cf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 h1:eIHD9GNM3Hp7kcRW5mvcz7WTR3ETeoYYKwpgA04kaXE= github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 h1:dzj1/xcivGjNPwwifh/dWTczkwcuqsXXFHY1X/TZMtw= @@ -69,8 +73,8 @@ github.com/coreos/etcd v3.2.13+incompatible h1:W9/v2r/Q29fLoHOUzsTpyK+aDKA3pIcjx github.com/coreos/etcd v3.2.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.0.0-20150304020126-568e959cd898 h1:aH57ZU07rz3akeLiJiivM9kKhAfKKcMWmLY4Kq4nTGg= github.com/coreos/go-semver v0.0.0-20150304020126-568e959cd898/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b h1:+mtZ0WjVZwTX0RVrXMXDwuYVaNeHGvWBW1UwJeMR+2M= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160620232715-fa29b1d70f0b h1:IqgHacj6F3QnV+0H9PXFWAmML5HdxkZakBQgZgfD+FU= github.com/coreos/pkg v0.0.0-20160620232715-fa29b1d70f0b/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/rkt v1.25.0 h1:4rDjbXDtLwReumvn9/fH0D4aTXWXk2kpUcpjJNH2F/g= @@ -81,6 +85,7 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c h1:Xo2rK1pzOm0jO6abTPIQw github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0 h1:suYBsYZIkSlUMEz4TAYCczKf62IA2UWC+O8+KtdOhCo= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= @@ -99,14 +104,13 @@ github.com/docker/libnetwork v0.8.0-dev.2.0.20180830151422-a9cd636e3789 h1:RKzEj github.com/docker/libnetwork v0.8.0-dev.2.0.20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= -github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful-swagger12 v0.0.0-20170208215640-dcef7f557305 h1:2vAWk0wMCWb/pYiyat2rRZp5I5ZM+efPlagySNZ3JeM= -github.com/emicklei/go-restful-swagger12 v0.0.0-20170208215640-dcef7f557305/go.mod h1:qr0VowGBT4CS4Q8vFF8BSeKz34PuqKGxs/L0IAQA9DQ= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -120,6 +124,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb h1:D4uzjWwKYQ5XnAvUbuvHW93esHg7F8N/OYeBBcJoTr0= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0 h1:8JV+dzJJiK46XqGLqqLav8ZfEiJECp8jlOFhpiCdZ+0= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -144,8 +150,10 @@ github.com/go-openapi/validate v0.17.2 h1:lwFfiS4sv5DvOrsYDsYq4N7UU8ghXiYtPJ+VcQ github.com/go-openapi/validate v0.17.2/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -153,27 +161,29 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 h1:u4bArs140e9+AfE52mFHOXVFnOSBJBRlzTHrOPLOIhE= github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/cadvisor v0.32.0 h1:eMoAOoZmuRMZ/yryNW1Fyu4wUsUWyp3UQ59s+A+qrPI= github.com/google/cadvisor v0.32.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= +github.com/google/certificate-transparency-go v1.0.21 h1:Yf1aXowfZ2nuboBsg7iYGLmwsOARdV86pfH3g95wXmE= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc h1:gY650H029SkC+1BKNFjWCVb/TjZG1pPM0CpCksqpE/4= -github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8 h1:L9JPKrtsHMQ4VCRQfHvbbHBfB2Urn8xf6QZeXZ+OrN4= +github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= @@ -189,8 +199,8 @@ github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f h1:ShTPMJQes6t github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611 h1:f5vL2EW5pL274ztMNnizZAEa457nKyKPEaN/sm/kdBk= github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20170330212424-2500245aa611/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.5.1 h1:3scN4iuXkNOyP98jF55Lv8a9j1o/IwvnDIZ0LHJK1nk= -github.com/grpc-ecosystem/grpc-gateway v1.5.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.8.5 h1:2+KSC78XiO6Qy0hIjfc1OD9H+hsaJdJlb8Kqsd41CTE= +github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -213,13 +223,11 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5i github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 h1:/UewZcckqhvnnS0C6r3Sher2hSEbVmM6Ogpcjen08+Y= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE= -github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible h1:eX6cWzw+KSwhN430wwbdWPgqnlbnK5ux76/q5ko+Qu8= -github.com/jteeuwen/go-bindata v3.0.8-0.20180305030458-6025e8de665b+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs= github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.8.0 h1:ycpSqVon/QJJoaT1t8sae0tp1Stg21j+dyuS7OoagcA= @@ -228,6 +236,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -235,6 +244,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875 h1:s+gZ8/rkYrWgN7xTMUISDw6nspgWyju2OCKmpFBrviQ= github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lpabon/godbc v0.1.1 h1:ilqjArN1UOENJJdM34I2YHKmF/B0gGq4VLoSGy9iAao= github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= @@ -262,18 +275,21 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180228065516-1df9eeb2bb81 h1:ImOHKpmdLPXWX5KSYquUWXKaopEPuY7TPPUo18u9aOI= github.com/modern-go/reflect2 v0.0.0-20180228065516-1df9eeb2bb81/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 h1:7InQ7/zrOh6SlFjaXFubv0xX0HsuC9qJsdqm7bNQpYM= github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= +github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 h1:10VrZWOtDSvWhgViCi2J6VUp4p/B3pOA/efiMH3KjjI= +github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM= github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -289,32 +305,41 @@ github.com/opencontainers/runtime-spec v1.0.1 h1:wY4pOY8fBdSIvs9+IDHC55thBuEulhz github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.0.0-rc1 h1:Q70KvmpJSrYzryl/d0tC3vWUiTn23cSdStKodlokEPs= github.com/opencontainers/selinux v1.0.0-rc1/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7 h1:gGBSHPOU7g8YjTbhwn+lvFm2VDEhhA+PwDIlstkgSxE= github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= -github.com/prometheus/client_golang v0.8.1-0.20170401103446-08fd2e12372a h1:MWM+gikGy0rjS7lraiVRSbaukzcDX+RGUGkwSFefiG4= -github.com/prometheus/client_golang v0.8.1-0.20170401103446-08fd2e12372a/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 h1:D+CiwcpGTW6pL6bv6KI3KbyEyCKyS+1JWS2h8PNDnGA= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 h1:Cto4X6SVMWRPBkJ/3YHn1iDGDGc/Z+sW+AEMKHMVvN4= -github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFdaDqxJVlbOQ1DtGmZWs/Qau0hIlk+WQ= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f h1:BVwpUVJDADN2ufcGik7W992pyps0wZ888b/y9GXcLTU= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ7X0A1AwNEK7CRkVK3YwfOU/QAL4WGg= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/quobyte/api v0.1.2 h1:lPHLsuvtjFyk8WhC4uHoHRkScijIHcffTWBBP+YpzYo= github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= github.com/rancher/go-rancher v0.1.1-0.20160922212217-09693a8743ba h1:J14jeWznqiNVfqmbDtS8RidNr5MnBTUA/Gl6mc4WQ6o= github.com/rancher/go-rancher v0.1.1-0.20160922212217-09693a8743ba/go.mod h1:7oQvGNiJsGvrUgB+7AH8bmdzuR0uhULfwKb43Ht0hUk= -github.com/renstrom/dedent v0.0.0-20150819195903-020d11c3b9c0 h1:diX4PaokPYvWZJS7/NVqAgyWxeV3E+/74l3+ev5WqbI= -github.com/renstrom/dedent v0.0.0-20150819195903-020d11c3b9c0/go.mod h1:M3t8jnE/HlAaLf3m0P158lCmrc8ZErlRB4/cN6V5TXY= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c h1:ht7N4d/B7Ezf58nvMNVF3OlvDlz9pp+WHVcRNS0nink= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= @@ -330,27 +355,28 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykE github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= -github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= -github.com/storageos/go-api v0.0.0-20180126153955-3a4032328d99 h1:FRurKqd9bRx8aOnMBWRtfqvCYYulMAhBqLTCdH7+8Mw= -github.com/storageos/go-api v0.0.0-20180126153955-3a4032328d99/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= +github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc h1:n+WYaU0kQ6WIiuEyWSgbXqkBx16irO69kYCtwVYoO5s= +github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 h1:w58e6FAOMd+rUgOfhaBb+ZVOQIOfUkpv5AAQVmf6hsI= github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7 h1:BPPUhSq7uU6E9lFzyb81vjwVOhiWwMXp0EpKL75NX+8= @@ -361,41 +387,53 @@ github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e h1:f1yevOHP+Su github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -github.com/vmware/govmomi v0.19.0 h1:CR6tEByWCPOnRoRyhLzuHaU+6o2ybF3qufNRWS/MGrY= -github.com/vmware/govmomi v0.19.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/vmware/govmomi v0.20.0 h1:+1IyhvoVb5JET2Wvgw9J3ZDv6CK4sxzUunpH8LhQqm4= +github.com/vmware/govmomi v0.20.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc h1:uyYiBHCUWsifUdIWrBzUUq9B3FSZKFTAuUyMQczS1q8= github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc/go.mod h1:e6humHha1ekIwTCm+A5Qed5mG8V4JL+ChHcUOJ+L/8U= github.com/xanzy/go-cloudstack v2.3.3+incompatible h1:bvQueLtgVICiSHLJyGbqYTcH5vdFgsZoItxgd+tAyK8= github.com/xanzy/go-cloudstack v2.3.3+incompatible/go.mod h1:s3eL3z5pNXF5FVybcT+LIVdId8pYn709yv6v5mrkrQE= github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 h1:MPPkRncZLN9Kh4MEFmbnK4h3BD7AUmskWv2+EeZJCCs= github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk= +go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c h1:pcBdqVcrlT+A3i+tWsOROFONQyey9tisIQHI4xqVGLg= golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= @@ -405,20 +443,23 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuA golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -google.golang.org/api v0.0.0-20181129220737-af4fc4062c26 h1:RPZDMF+4oXwRE3YH8oxQXeORJvVzSLPusZrxbwgpVVg= -google.golang.org/api v0.0.0-20181129220737-af4fc4062c26/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= -google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +google.golang.org/api v0.3.1 h1:oJra/lMfmtm13/rgY/8i3MzjFWYXvQIAKjQ3HqofMk8= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e h1:I5s8aUkxqPjgAssfOv+dVr+4/7BC40WV6JhcVoORltI= -google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.15.0 h1:Az/KuahOM4NAidTEuJCv/RonAA7rYsTPkqXVjr+8OOw= -google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -431,6 +472,7 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7 h1:986b60BAz5vO2Vaf48yQaq+wb2bU4JsXxKu1+itW6x8= gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.0 h1:0kdiskBe/uJirf0T5GGmZlS8bWRYUszavQpx91WycKs= gopkg.in/square/go-jose.v2 v2.2.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= @@ -439,20 +481,31 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU= gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/cloud-provider v0.0.0-20190323031113-9c9d72d1bf90 h1:FI7cwUSbHsDhcpEI8f9YYZinBEEJio7TSfI7BBIQ89g= -k8s.io/cloud-provider v0.0.0-20190323031113-9c9d72d1bf90/go.mod h1:LlIffnLBu+GG7d4ppPzC8UnA1Ex8S+ntmSRVsnr7Xy4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/cluster-bootstrap v0.0.0-20190313124217-0fa624df11e9 h1:hPWWe1j4gCWjccNTvQBXXTrMV0Y7aHf777ofYVxpZx8= k8s.io/cluster-bootstrap v0.0.0-20190313124217-0fa624df11e9/go.mod h1:iBSm2nwo3OaiuW8VDvc3ySDXK5SKfUrxwPvBloKG7zg= -k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c= +k8s.io/component-base v0.0.0-20190515024022-2354f2393ad4 h1:TOebDR8jh/AcqOEWnotJ+DYVUNcMA1GT86TR4Bg70KQ= +k8s.io/component-base v0.0.0-20190515024022-2354f2393ad4/go.mod h1:pKRi1i5IQdJDpK1LItot8oy27Bc3zL/hQiy9T171rvE= +k8s.io/csi-translation-lib v0.0.0-20190515064806-e1b42b89656a h1:UhI3XNGod4b5f9MyH5Cw3Wsao+gJxfEJFxM0Ztbv3GE= +k8s.io/csi-translation-lib v0.0.0-20190515064806-e1b42b89656a/go.mod h1:jyHRu8whRGy/pvowI32B2SI3BoQzyPnM91EYpgh6QHQ= k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be h1:aWEq4nbj7HRJ0mtKYjNSk/7X28Tl6TI6FeG8gKF+r7Q= +k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/utils v0.0.0-20180726175726-66066c83e385 h1:q6/yuHLLw/uZczdu8EHklikYXSpvKeoqLlt2k99lUUU= -k8s.io/utils v0.0.0-20180726175726-66066c83e385/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= +k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI= +k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= +k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0 h1:wXWxhjjZAWaJLV/TVwdT1mDZraXjgzHxvtHEPz5qnpY= +k8s.io/utils v0.0.0-20190520173318-324c5df7d3f0/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= +sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= +sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 h1:9r5DY45ef9LtcA6BnkhW8MPV7OKAfbf2AUwUhq3LeRk= +sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 30c0cd5e02..4afa7c8510 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/api/extensions/v1beta1" + "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes" @@ -33,7 +33,7 @@ var _ = framework.KubeDescribe("Ingress ALB creation", func() { f := framework.NewDefaultFramework("ingress") var ( cs kubernetes.Interface - jig *ingress.IngressTestJig + jig *ingress.TestJig ) BeforeEach(func() { jig = ingress.NewIngressTestJig(f.ClientSet) @@ -57,10 +57,10 @@ var _ = framework.KubeDescribe("Ingress ALB creation", func() { defer func() { By("deleting the service") defer GinkgoRecover() - err2 := cs.Core().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Services(ns).Delete(service.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - _, err := cs.Core().Services(ns).Create(service) + _, err := cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) // POD @@ -69,11 +69,11 @@ var _ = framework.KubeDescribe("Ingress ALB creation", func() { defer func() { By("deleting the pod") defer GinkgoRecover() - err2 := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) + err2 := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - _, err = cs.Core().Pods(ns).Create(pod) + _, err = cs.CoreV1().Pods(ns).Create(pod) Expect(err).NotTo(HaveOccurred()) framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) @@ -83,14 +83,14 @@ var _ = framework.KubeDescribe("Ingress ALB creation", func() { defer func() { By("deleting the ingress") defer GinkgoRecover() - err2 := cs.Extensions().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0)) + err2 := cs.NetworkingV1beta1().Ingresses(ns).Delete(ing.Name, metav1.NewDeleteOptions(0)) Expect(err2).NotTo(HaveOccurred()) }() - ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing) + ingressCreate, err := cs.NetworkingV1beta1().Ingresses(ns).Create(ing) Expect(err).NotTo(HaveOccurred()) addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, 10*time.Minute) Expect(err).NotTo(HaveOccurred()) - ingress, err := cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) + ingress, err := cs.NetworkingV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("ALB endpoint from ingress status: %s", ingress.Status.LoadBalancer.Ingress[0].Hostname)) @@ -115,7 +115,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { f := framework.NewDefaultFramework("skipper-ingress-simple") var ( cs kubernetes.Interface - jig *ingress.IngressTestJig + jig *ingress.TestJig ) It("Should create simple ingress [Ingress] [Zalando]", func() { @@ -138,29 +138,29 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { // backend deployment By("Creating a deployment with " + serviceName + " in namespace " + ns) depl := createSkipperBackendDeployment(serviceName, ns, route, labels, int32(targetPort), replicas) - _, err := cs.Apps().Deployments(ns).Create(depl) - //deployment, err := cs.Apps().Deployments(ns).Create(depl) + _, err := cs.AppsV1().Deployments(ns).Create(depl) + //deployment, err := cs.AppsV1().Deployments(ns).Create(depl) // defer func() { // By("deleting the deployment") // defer GinkgoRecover() - // err2 := cs.Apps().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) + // err2 := cs.AppsV1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) // Expect(err2).NotTo(HaveOccurred()) // }() Expect(err).NotTo(HaveOccurred()) By("Creating service " + serviceName + " in namespace " + ns) service := createServiceTypeClusterIP(serviceName, labels, port, targetPort) - _, err = cs.Core().Services(ns).Create(service) + _, err = cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) ing := createIngress(serviceName, hostName, ns, labels, port) - ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing) + ingressCreate, err := cs.NetworkingV1beta1().Ingresses(ns).Create(ing) Expect(err).NotTo(HaveOccurred()) addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, waitTime) Expect(err).NotTo(HaveOccurred()) - _, err = cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) + _, err = cs.NetworkingV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) Expect(err).NotTo(HaveOccurred()) // skipper http -> https redirect @@ -207,7 +207,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { }, port, ) - ingressUpdate, err := cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err := cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Waiting for ingress %s/%s we wait to get a 200 with the right content for the next request", ingressUpdate.Namespace, ingressUpdate.Name)) resp, err = getAndWaitResponse(rt, req, 10*time.Second, http.StatusOK) @@ -230,7 +230,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { }, port, ) - ingressUpdate, err = cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err = cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Waiting for ingress %s/%s we wait to get a 404 for the next request", ingressUpdate.Namespace, ingressUpdate.Name)) resp, err = getAndWaitResponse(rt, req, 10*time.Second, http.StatusNotFound) @@ -252,7 +252,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { }, port, ) - ingressUpdate, err = cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err = cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Waiting for ingress %s/%s we wait to get a 200 with %s header set to %s for the next request", ingressUpdate.Namespace, ingressUpdate.Name, headerKey, headerVal)) time.Sleep(10 * time.Second) // wait for routing change propagation @@ -267,7 +267,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { // Test additional hostname additionalHostname := fmt.Sprintf("foo-%d.%s", time.Now().UTC().Unix(), E2EHostedZone()) addHostIng := addHostIngress(updatedIng, additionalHostname) - ingressUpdate, err = cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(addHostIng) + ingressUpdate, err = cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(addHostIng) Expect(err).NotTo(HaveOccurred()) By("Waiting for new DNS hostname to be resolvable " + additionalHostname) err = waitForResponse(additionalHostname, "https", waitTime, isSuccess, false) @@ -293,7 +293,7 @@ var __ = framework.KubeDescribe("Ingress tests simple", func() { // Test changed path newPath := "/foo" changePathIng := changePathIngress(updatedIng, newPath) - ingressUpdate, err = cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(changePathIng) + ingressUpdate, err = cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(changePathIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Waiting for ingress %s/%s we wait to get a 404 for the old request, because of the path route", ingressUpdate.Namespace, ingressUpdate.Name)) @@ -317,7 +317,7 @@ var ___ = framework.KubeDescribe("Ingress tests paths", func() { f := framework.NewDefaultFramework("skipper-ingress-paths") var ( cs kubernetes.Interface - jig *ingress.IngressTestJig + jig *ingress.TestJig ) It("Should create path routes ingress [Ingress] [Zalando]", func() { @@ -346,46 +346,46 @@ var ___ = framework.KubeDescribe("Ingress tests paths", func() { // backend deployment By("Creating a deployment with " + serviceName + " in namespace " + ns) depl := createSkipperBackendDeployment(serviceName, ns, route, labels, int32(targetPort), replicas) - _, err := cs.Apps().Deployments(ns).Create(depl) - //deployment, err := cs.Apps().Deployments(ns).Create(depl) + _, err := cs.AppsV1().Deployments(ns).Create(depl) + //deployment, err := cs.AppsV1().Deployments(ns).Create(depl) // defer func() { // By("deleting the deployment") // defer GinkgoRecover() - // err2 := cs.Apps().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) + // err2 := cs.AppsV1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) // Expect(err2).NotTo(HaveOccurred()) // }() Expect(err).NotTo(HaveOccurred()) By("Creating a 2nd deployment with " + serviceName2 + " in namespace " + ns) depl2 := createSkipperBackendDeployment(serviceName2, ns, route2, labels2, int32(targetPort), replicas) - _, err = cs.Apps().Deployments(ns).Create(depl2) - //deployment2, err := cs.Apps().Deployments(ns).Create(depl2) + _, err = cs.AppsV1().Deployments(ns).Create(depl2) + //deployment2, err := cs.AppsV1().Deployments(ns).Create(depl2) // defer func() { // By("deleting the deployment") // defer GinkgoRecover() - // err2 := cs.Apps().Deployments(ns).Delete(deployment2.Name, metav1.NewDeleteOptions(0)) + // err2 := cs.AppsV1().Deployments(ns).Delete(deployment2.Name, metav1.NewDeleteOptions(0)) // Expect(err2).NotTo(HaveOccurred()) // }() Expect(err).NotTo(HaveOccurred()) By("Creating service " + serviceName + " in namespace " + ns) service := createServiceTypeClusterIP(serviceName, labels, port, targetPort) - _, err = cs.Core().Services(ns).Create(service) + _, err = cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) By("Creating service " + serviceName2 + " in namespace " + ns) service2 := createServiceTypeClusterIP(serviceName2, labels2, port, targetPort) - _, err = cs.Core().Services(ns).Create(service2) + _, err = cs.CoreV1().Services(ns).Create(service2) Expect(err).NotTo(HaveOccurred()) By("Creating ingress " + serviceName + " in namespace " + ns + "with hostname " + hostName) ing := createIngress(serviceName, hostName, ns, labels, port) - ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing) + ingressCreate, err := cs.NetworkingV1beta1().Ingresses(ns).Create(ing) Expect(err).NotTo(HaveOccurred()) addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, waitTime) Expect(err).NotTo(HaveOccurred()) - _, err = cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) + _, err = cs.NetworkingV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) Expect(err).NotTo(HaveOccurred()) // skipper http -> https redirect @@ -430,7 +430,7 @@ var ___ = framework.KubeDescribe("Ingress tests paths", func() { ingressCreate.ObjectMeta.Annotations, port, ) - ingressUpdate, err := cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err := cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Testing for ingress %s/%s we want to get a 404 for path /", ingressUpdate.Namespace, ingressUpdate.Name)) @@ -464,7 +464,7 @@ var ___ = framework.KubeDescribe("Ingress tests paths", func() { ServicePort: intstr.FromInt(port), }, ) - ingressUpdate, err = cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err = cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) resp, err = getAndWaitResponse(rt, bereq2, 10*time.Second, http.StatusOK) Expect(err).NotTo(HaveOccurred()) @@ -489,7 +489,7 @@ var ____ = framework.KubeDescribe("Ingress tests custom routes", func() { f := framework.NewDefaultFramework("skipper-ingress-custom") var ( cs kubernetes.Interface - jig *ingress.IngressTestJig + jig *ingress.TestJig ) It("Should create custom routes ingress [Ingress] [Zalando]", func() { @@ -512,30 +512,30 @@ var ____ = framework.KubeDescribe("Ingress tests custom routes", func() { // backend deployment By("Creating a deployment with " + serviceName + " in namespace " + ns) depl := createSkipperBackendDeployment(serviceName, ns, route, labels, int32(targetPort), replicas) - _, err := cs.Apps().Deployments(ns).Create(depl) - //deployment, err := cs.Apps().Deployments(ns).Create(depl) + _, err := cs.AppsV1().Deployments(ns).Create(depl) + //deployment, err := cs.AppsV1().Deployments(ns).Create(depl) // defer func() { // By("deleting the deployment") // defer GinkgoRecover() - // err2 := cs.Apps().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) + // err2 := cs.AppsV1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) // Expect(err2).NotTo(HaveOccurred()) // }() Expect(err).NotTo(HaveOccurred()) By("Creating service " + serviceName + " in namespace " + ns) service := createServiceTypeClusterIP(serviceName, labels, port, targetPort) - _, err = cs.Core().Services(ns).Create(service) + _, err = cs.CoreV1().Services(ns).Create(service) Expect(err).NotTo(HaveOccurred()) By("Creating ingress " + serviceName + " in namespace " + ns + "with hostname " + hostName) ing := createIngress(serviceName, hostName, ns, labels, port) - ingressCreate, err := cs.Extensions().Ingresses(ns).Create(ing) + ingressCreate, err := cs.NetworkingV1beta1().Ingresses(ns).Create(ing) Expect(err).NotTo(HaveOccurred()) addr, err := jig.WaitForIngressAddress(cs, ns, ingressCreate.Name, waitTime) Expect(err).NotTo(HaveOccurred()) - _, err = cs.Extensions().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) + _, err = cs.NetworkingV1beta1().Ingresses(ns).Get(ing.Name, metav1.GetOptions{ResourceVersion: "0"}) Expect(err).NotTo(HaveOccurred()) // skipper http -> https redirect @@ -587,7 +587,7 @@ var ____ = framework.KubeDescribe("Ingress tests custom routes", func() { }, port, ) - ingressUpdate, err := cs.Extensions().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) + ingressUpdate, err := cs.NetworkingV1beta1().Ingresses(ingressCreate.ObjectMeta.Namespace).Update(updatedIng) Expect(err).NotTo(HaveOccurred()) By(fmt.Sprintf("Testing for ingress %s/%s we want to get a 307 for path %s", ingressUpdate.Namespace, ingressUpdate.Name, redirectPath)) diff --git a/test/e2e/kube_metrics_adapter_test.go b/test/e2e/kube_metrics_adapter_test.go index b31101f68c..150eff90ce 100644 --- a/test/e2e/kube_metrics_adapter_test.go +++ b/test/e2e/kube_metrics_adapter_test.go @@ -11,7 +11,7 @@ import ( appsv1 "k8s.io/api/apps/v1" autoscaling "k8s.io/api/autoscaling/v2beta1" corev1 "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + "k8s.io/api/networking/v1beta1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -26,7 +26,7 @@ import ( var _ = framework.KubeDescribe("[HPA] Horizontal pod autoscaling (scale resource: Custom Metrics from kube-metrics-adapter)", func() { f := framework.NewDefaultFramework("zalando-kube-metrics-adapter") var cs kubernetes.Interface - var jig *ingress.IngressTestJig + var jig *ingress.TestJig const ( DeploymentName = "sample-custom-metrics-autoscaling-e2e" @@ -92,7 +92,7 @@ type CustomMetricTestCase struct { framework *framework.Framework hpa *autoscaling.HorizontalPodAutoscaler kubeClient kubernetes.Interface - jig *ingress.IngressTestJig + jig *ingress.TestJig deployment *appsv1.Deployment pod *corev1.Pod initialReplicas int @@ -127,7 +127,7 @@ func (tc *CustomMetricTestCase) Run() { Expect(err).NotTo(HaveOccurred()) // Create an Ingress since RPS based scaling relies on it - ingressCreate, err := tc.kubeClient.ExtensionsV1beta1().Ingresses(ns).Create(tc.ingress) + ingressCreate, err := tc.kubeClient.NetworkingV1beta1().Ingresses(ns).Create(tc.ingress) Expect(err).NotTo(HaveOccurred()) _, err = tc.jig.WaitForIngressAddress(tc.kubeClient, ns, ingressCreate.Name, 10*time.Minute) diff --git a/test/e2e/psp.go b/test/e2e/psp.go index 32d2c4a6d9..b049db75fd 100644 --- a/test/e2e/psp.go +++ b/test/e2e/psp.go @@ -36,7 +36,7 @@ var _ = framework.KubeDescribe("PSP use", func() { BeforeEach(func() { cs = f.ClientSet saObj := createServiceAccount(f.Namespace.Name, operatorSA) - _, err := cs.Core().ServiceAccounts(f.Namespace.Name).Create(saObj) + _, err := cs.CoreV1().ServiceAccounts(f.Namespace.Name).Create(saObj) if err != nil { log.Fatalf("could not create service account: %s", err) @@ -59,10 +59,10 @@ var _ = framework.KubeDescribe("PSP use", func() { // defer func() { // By(msg) // defer GinkgoRecover() - // err := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) + // err := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) // Expect(err).To(HaveOccurred()) // }() - // _, err := cs.Core().Pods(ns).Create(pod) + // _, err := cs.CoreV1().Pods(ns).Create(pod) // Expect(err).To(HaveOccurred()) // framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) // }) @@ -81,11 +81,11 @@ var _ = framework.KubeDescribe("PSP use", func() { defer func() { By(msg) defer GinkgoRecover() - err := cs.Core().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) + err := cs.CoreV1().Pods(ns).Delete(pod.Name, metav1.NewDeleteOptions(0)) Expect(err).NotTo(HaveOccurred()) }() - _, err := cs.Core().Pods(ns).Create(pod) + _, err := cs.CoreV1().Pods(ns).Create(pod) Expect(err).NotTo(HaveOccurred()) framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) @@ -108,7 +108,7 @@ var _ = framework.KubeDescribe("PSP use", func() { defer func() { By(fmt.Sprintf("Delete a deployment that creates a privileged POD as %s", operatorSA)) defer GinkgoRecover() - err := cs.Extensions().Deployments(ns).Delete(d.Name, metav1.NewDeleteOptions(0)) + err := cs.ExtensionsV1beta1().Deployments(ns).Delete(d.Name, metav1.NewDeleteOptions(0)) Expect(err).NotTo(HaveOccurred()) }() diff --git a/test/e2e/run_e2e.sh b/test/e2e/run_e2e.sh index 2379645cf2..9a069d5f2c 100755 --- a/test/e2e/run_e2e.sh +++ b/test/e2e/run_e2e.sh @@ -119,27 +119,18 @@ export AWS_IAM_ROLE="${LOCAL_ID}-e2e-aws-iam-test" # * statefulset tests # * custom 'zalando' tests # -# Broken e2e tests are disabled +# Disable DNS tests covering DNS names of format: ..svc which +# we don't support with the ndots:2 configuration: # -# * "should provide DNS for the cluster [DNS] [Conformance]" -# https://github.com/kubernetes/kubernetes/blob/release-1.13/test/e2e/network/dns.go#L48-L49 -# Fixed in v1.14.0 +# * "should resolve DNS of partial qualified names for the cluster [DNS] [Conformance]" +# https://github.com/kubernetes/kubernetes/blob/66049e3b21efe110454d67df4fa62b08ea79a19b/test/e2e/network/dns.go#L71-L98 # -# * "should provide DNS for services [DNS] [Conformance]" -# https://github.com/kubernetes/kubernetes/blob/release-1.13/test/e2e/network/dns.go#L105-L109 -# Fixed in v1.14.0 -# -# * "should support remote command execution over websockets [NodeConformance] [Conformance]" -# https://github.com/kubernetes/kubernetes/pull/73046 -# Fixed in v1.14.0 -# -# * "should support retrieving logs from the container over websockets [NodeConformance] [Conformance]" -# https://github.com/kubernetes/kubernetes/pull/73046 -# Fixed in v1.14.0 +# * "should resolve DNS of partial qualified names for services" +# https://github.com/kubernetes/kubernetes/blob/66049e3b21efe110454d67df4fa62b08ea79a19b/test/e2e/network/dns.go#L173-L220 ginkgo -nodes=25 -flakeAttempts=2 \ -focus="(\[Conformance\]|\[StatefulSetBasic\]|\[Feature:StatefulSet\]\s\[Slow\].*mysql|\[Zalando\])" \ -skip="(\[Serial\])" \ - -skip="(should.provide.DNS.for.the.cluster|should.provide.DNS.for.services|should.support.retrieving.logs.from.the.container.over.websockets|should.support.remote.command.execution.over.websockets|\[Serial\])" \ + -skip="(should.resolve.DNS.of.partial.qualified.names.for.the.cluster|should.provide.DNS.for.services|\[Serial\])" \ "e2e.test" -- -delete-namespace-on-failure=false # delete cluster diff --git a/test/e2e/setup_modules.sh b/test/e2e/setup_modules.sh index bef5c27abf..84770c7d53 100755 --- a/test/e2e/setup_modules.sh +++ b/test/e2e/setup_modules.sh @@ -4,7 +4,7 @@ MOD_PATH="${MOD_PATH:-"../e2e_modules"}" mkdir -p "$MOD_PATH" -git clone --branch v1.13.5 --depth=1 \ +git clone --branch release-1.14 --depth=1 \ https://github.com/kubernetes/kubernetes.git "$MOD_PATH/kubernetes" # setup go.mod @@ -19,6 +19,7 @@ apimachinery apiserver cli-runtime client-go +cloud-provider code-generator csi-api kube-aggregator diff --git a/test/e2e/util.go b/test/e2e/util.go index 27d9dc157c..6247655839 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -11,6 +11,9 @@ import ( "net/url" "time" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" @@ -20,7 +23,7 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" + "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" @@ -590,16 +593,21 @@ func waitForReplicas(deploymentName, namespace string, kubeClient kubernetes.Int /** needed for image webhook policy tests: */ -func createImagePolicyWebhookTestDeployment(nameprefix, namespace, tag, podname string, replicas int32) *v1beta1.Deployment { +func createImagePolicyWebhookTestDeployment(nameprefix, namespace, tag, podname string, replicas int32) *appsv1.Deployment { zero := int64(0) - return &v1beta1.Deployment{ + return &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: nameprefix + string(uuid.NewUUID()), Namespace: namespace, Labels: map[string]string{}, }, - Spec: v1beta1.DeploymentSpec{ + Spec: appsv1.DeploymentSpec{ Replicas: &replicas, + Selector: &metav1.LabelSelector{ + MatchLabels: map[string]string{ + "app": podname, + }, + }, Template: v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ @@ -666,6 +674,13 @@ func createVegetaDeployment(hostPath string, rate int) *appsv1.Deployment { } } +func deleteDeployment(cs kubernetes.Interface, ns string, deployment *appsv1.Deployment) { + By(fmt.Sprintf("Delete a compliant deployment: %s", deployment.Name)) + defer GinkgoRecover() + err := cs.AppsV1().Deployments(ns).Delete(deployment.Name, metav1.NewDeleteOptions(0)) + Expect(err).NotTo(HaveOccurred()) +} + func createHTTPRoundTripper() (http.RoundTripper, chan<- struct{}) { tr := &http.Transport{ DialContext: (&net.Dialer{