Merge branch 'master' into alicloud-eci

Gopkg.lock

@@ -2,13 +2,13 @@
 
 
 [[projects]]
-  digest = "1:ef14b1839bd43a923896a762b31d000c12f0d21506cde7251d9342bb6acb4c05"
+  digest = "1:6453651bd5fc38b3a07d133c295a881c1bce87d4be4ccefe61eee26d22d6b15c"
   name = "github.com/Azure/azure-sdk-for-go"
   packages = [
     "profiles/preview/preview/servicefabricmesh/mgmt/servicefabricmesh",
     "services/batch/2017-09-01.6.0/batch",
-    "services/preview/servicefabricmesh/mgmt/2018-07-01-preview/servicefabricmesh",
     "services/network/mgmt/2018-05-01/network",
+    "services/preview/servicefabricmesh/mgmt/2018-07-01-preview/servicefabricmesh",
     "version",
   ]
   pruneopts = "NUT"
@@ -169,6 +169,17 @@
   pruneopts = "NUT"
   revision = "a41693b7b7afb422c7ecb1028458ab27da047bbb"
 
+[[projects]]
+  digest = "1:7393d591b1707b6bd40171878d13aada2f7fa921cd0a500406d65fd3966ca2f4"
+  name = "github.com/cpuguy83/strongerrors"
+  packages = [
+    ".",
+    "status",
+  ]
+  pruneopts = "NUT"
+  revision = "d3f3ceac8165d8532efb6aa406399545de78d967"
+  version = "v0.2.0"
+
 [[projects]]
   digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
   name = "github.com/davecgh/go-spew"
@@ -1391,6 +1402,8 @@
     "github.com/aws/aws-sdk-go/service/ecs/ecsiface",
     "github.com/aws/aws-sdk-go/service/iam",
     "github.com/cenkalti/backoff",
+    "github.com/cpuguy83/strongerrors",
+    "github.com/cpuguy83/strongerrors/status",
     "github.com/dimchansky/utfbom",
     "github.com/docker/docker/api/types/strslice",
     "github.com/docker/go-connections/nat",

README.md

@@ -99,7 +99,7 @@ leveraging the portable Kubernetes API.
 Each provider may have its own configuration file, and required environmental variables.
 
 Providers must provide the following functionality to be considered a supported integration with Virtual Kubelet.
-1. Provides the back-end plumbing necessary to support the lifecycle management of pods, containers and supporting resources in the context of Kubernete.
+1. Provides the back-end plumbing necessary to support the lifecycle management of pods, containers and supporting resources in the context of Kubernetes.
 2. Conforms to the current API provided by Virtual Kubelet.
 3. Does not have access to the Kubernetes API Server and has a well-defined callback mechanism for getting data like secrets or configmaps.
 

charts/virtual-kubelet/Chart.yaml

@@ -1,6 +1,6 @@
 name: virtual-kubelet
-version: 0.3.0
+version: 0.4.0
-appVersion: 0.3
+appVersion: 0.4
 description: A Helm chart to install virtual kubelet inside a Kubernetes cluster.
 icon: https://avatars2.githubusercontent.com/u/34250142
 sources:

charts/virtual-kubelet/templates/deployment.yaml

@@ -39,6 +39,8 @@ spec:
 {{- if .loganalytics.enabled }}
         - name: LOG_ANALYTICS_AUTH_LOCATION
           value: /etc/virtual-kubelet/loganalytics.json
+        - name: CLUSTER_RESOURCE_ID
+          value:  {{ .loganalytics.clusterResourceId }}
 {{- end }}
 {{- if .targetAKS }}
         - name: ACS_CREDENTIAL_LOCATION
@@ -66,6 +68,21 @@ spec:
         - name: ACI_REGION
           value: {{ required "aciRegion is required" .aciRegion }}
 {{- end }}
+{{- if .vnet.enabled }}
+        - name: ACI_SUBNET_NAME
+          value: {{ required "subnetName is required" .vnet.subnetName }}
+        - name: ACI_SUBNET_CIDR
+          value: {{ .vnet.subnetCidr }}
+        - name: MASTER_URI
+          value: {{ required "masterUri is required" .masterUri }}
+        - name: CLUSTER_CIDR
+          value: {{ required "clusterCidr is required" .vnet.clusterCidr }}
+        - name: KUBE_DNS_IP
+          value: {{ required "kubeDnsIp is required" .vnet.kubeDnsIp }}
+{{- else }}
+        - name: MASTER_URI
+          value: {{ .masterUri }}
+{{- end }}          
 {{- end }}
 {{- end }}
         volumeMounts:

charts/virtual-kubelet/templates/secret.yaml

@@ -20,7 +20,7 @@ data:
 {{- if eq .Values.provider "azure" }}
 {{- with .Values.providers.azure }}
 {{- if .loganalytics.enabled }}
-  loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceID is required for loganalytics" .loganalytics.workspaceID ) (required "workspaceKey is required for loganalytics" .loganalytics.workspaceKey ) }}
+  loganalytics.json: {{ printf "{\"workspaceID\": \"%s\",\"workspaceKey\": \"%s\"}" (required "workspaceId is required for loganalytics" .loganalytics.workspaceId ) (required "workspaceKey is required for loganalytics" .loganalytics.workspaceKey ) | b64enc | quote }}
 {{- end }}
 {{- if .targetAKS }}
   clientSecret: {{ default "" .clientKey | b64enc | quote }}

charts/virtual-kubelet/values.yaml

@@ -30,10 +30,18 @@ providers:
     ## `aciResourceGroup` and `aciRegion` are required only for non-AKS deployments
     aciResourceGroup: 
     aciRegion: 
+    masterUri: 
     loganalytics:
       enabled: false
-      workspaceID: 
+      workspaceId: 
       workspaceKey: 
+      clusterResourceId: 
+    vnet:
+      enabled: false
+      subnetName: 
+      subnetCidr: 
+      clusterCidr: 
+      kubeDnsIp: 
 
 ## Install Default RBAC roles and bindings
 rbac:

vendor/github.com/cpuguy83/strongerrors/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

vendor/github.com/cpuguy83/strongerrors/defs.go

@@ -0,0 +1,84 @@
+package strongerrors
+
+// ErrNotFound signals that the requested object doesn't exist
+type ErrNotFound interface {
+	NotFound()
+}
+
+// ErrInvalidArgument signals that the user input is invalid
+type ErrInvalidArgument interface {
+	InvalidArgument()
+}
+
+// ErrConflict signals that some internal state conflicts with the requested action and can't be performed.
+// A change in state should be able to clear this error.
+type ErrConflict interface {
+	Conflict()
+}
+
+// ErrUnauthorized is used to signify that the user is not authorized to perform a specific action
+type ErrUnauthorized interface {
+	Unauthorized()
+}
+
+// ErrUnauthenticated is used to indicate that the caller cannot be identified.
+type ErrUnauthenticated interface {
+	Unauthenticated()
+}
+
+// ErrUnavailable signals that the requested action/subsystem is not available.
+type ErrUnavailable interface {
+	Unavailable()
+}
+
+// ErrForbidden signals that the requested action cannot be performed under any circumstances.
+// When a ErrForbidden is returned, the caller should never retry the action.
+type ErrForbidden interface {
+	Forbidden()
+}
+
+// ErrSystem signals that some internal error occurred.
+// An example of this would be a failed mount request.
+type ErrSystem interface {
+	System()
+}
+
+// ErrNotModified signals that an action can't be performed because it's already in the desired state
+type ErrNotModified interface {
+	NotModified()
+}
+
+// ErrAlreadyExists is a special case of ErrNotModified which signals that the desired object already exists
+type ErrAlreadyExists interface {
+	AlreadyExists()
+}
+
+// ErrNotImplemented signals that the requested action/feature is not implemented on the system as configured.
+type ErrNotImplemented interface {
+	NotImplemented()
+}
+
+// ErrUnknown signals that the kind of error that occurred is not known.
+type ErrUnknown interface {
+	Unknown()
+}
+
+// ErrCancelled signals that the action was cancelled.
+type ErrCancelled interface {
+	Cancelled()
+}
+
+// ErrDeadline signals that the deadline was reached before the action completed.
+type ErrDeadline interface {
+	DeadlineExceeded()
+}
+
+// ErrExhausted indicates that the action cannot be performed because some resource is exhausted.
+type ErrExhausted interface {
+	Exhausted()
+}
+
+// ErrDataLoss indicates that data was lost or there is data corruption.
+type ErrDataLoss interface {
+	DataLoss()
+}

vendor/github.com/cpuguy83/strongerrors/doc.go

@@ -0,0 +1,12 @@
+// Package strongerrors defines a set of error interfaces that packages should use for communicating classes of errors.
+// Errors that cross the package boundary should implement one (and only one) of these interfaces.
+//
+// Packages should not reference these interfaces directly, only implement them.
+// To check if a particular error implements one of these interfaces, there are helper
+// functions provided (e.g. `Is<SomeError>`) which can be used rather than asserting the interfaces directly.
+// If you must assert on these interfaces, be sure to check the causal chain (`err.Cause()`).
+//
+// A set of helper functions are provided to take any error and turn it into a specific error class.
+// This frees you from defining the same error classes all over your code. However, you can still
+// implement the error classes ony our own if you desire.
+package strongerrors

vendor/github.com/cpuguy83/strongerrors/helpers.go

@@ -0,0 +1,272 @@
+package strongerrors
+
+import "context"
+
+type errNotFound struct{ error }
+
+func (errNotFound) NotFound() {}
+
+func (e errNotFound) Cause() error {
+	return e.error
+}
+
+// NotFound is a helper to create an error of the class with the same name from any error type
+func NotFound(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errNotFound{err}
+}
+
+type errInvalidArg struct{ error }
+
+func (errInvalidArg) InvalidArgument() {}
+
+func (e errInvalidArg) Cause() error {
+	return e.error
+}
+
+// InvalidArgument is a helper to create an error of the class with the same name from any error type
+func InvalidArgument(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errInvalidArg{err}
+}
+
+type errConflict struct{ error }
+
+func (errConflict) Conflict() {}
+
+func (e errConflict) Cause() error {
+	return e.error
+}
+
+// Conflict is a helper to create an error of the class with the same name from any error type
+func Conflict(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errConflict{err}
+}
+
+type errUnauthorized struct{ error }
+
+func (errUnauthorized) Unauthorized() {}
+
+func (e errUnauthorized) Cause() error {
+	return e.error
+}
+
+// Unauthorized is a helper to create an error of the class with the same name from any error type
+func Unauthorized(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errUnauthorized{err}
+}
+
+type errUnauthenticated struct{ error }
+
+func (errUnauthenticated) Unauthenticated() {}
+
+func (e errUnauthenticated) Cause() error {
+	return e.error
+}
+
+// Unauthenticated is a helper to create an error of the class with the same name from any error type
+func Unauthenticated(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errUnauthenticated{err}
+}
+
+type errUnavailable struct{ error }
+
+func (errUnavailable) Unavailable() {}
+
+func (e errUnavailable) Cause() error {
+	return e.error
+}
+
+// Unavailable is a helper to create an error of the class with the same name from any error type
+func Unavailable(err error) error {
+	return errUnavailable{err}
+}
+
+type errForbidden struct{ error }
+
+func (errForbidden) Forbidden() {}
+
+func (e errForbidden) Cause() error {
+	return e.error
+}
+
+// Forbidden is a helper to create an error of the class with the same name from any error type
+func Forbidden(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errForbidden{err}
+}
+
+type errSystem struct{ error }
+
+func (errSystem) System() {}
+
+func (e errSystem) Cause() error {
+	return e.error
+}
+
+// System is a helper to create an error of the class with the same name from any error type
+func System(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errSystem{err}
+}
+
+type errNotModified struct{ error }
+
+func (errNotModified) NotModified() {}
+
+func (e errNotModified) Cause() error {
+	return e.error
+}
+
+// NotModified is a helper to create an error of the class with the same name from any error type
+func NotModified(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errNotModified{err}
+}
+
+type errAlreadyExists struct{ error }
+
+func (errAlreadyExists) AlreadyExists() {}
+
+func (e errAlreadyExists) Cause() error {
+	return e.error
+}
+
+// AlreadyExists is a helper to create an error of the class with the same name from any error type
+func AlreadyExists(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errAlreadyExists{err}
+}
+
+type errNotImplemented struct{ error }
+
+func (errNotImplemented) NotImplemented() {}
+
+func (e errNotImplemented) Cause() error {
+	return e.error
+}
+
+// NotImplemented is a helper to create an error of the class with the same name from any error type
+func NotImplemented(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errNotImplemented{err}
+}
+
+type errUnknown struct{ error }
+
+func (errUnknown) Unknown() {}
+
+func (e errUnknown) Cause() error {
+	return e.error
+}
+
+// Unknown is a helper to create an error of the class with the same name from any error type
+func Unknown(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errUnknown{err}
+}
+
+type errCancelled struct{ error }
+
+func (errCancelled) Cancelled() {}
+
+func (e errCancelled) Cause() error {
+	return e.error
+}
+
+// Cancelled is a helper to create an error of the class with the same name from any error type
+func Cancelled(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errCancelled{err}
+}
+
+type errDeadline struct{ error }
+
+func (errDeadline) DeadlineExceeded() {}
+
+func (e errDeadline) Cause() error {
+	return e.error
+}
+
+// Deadline is a helper to create an error of the class with the same name from any error type
+func Deadline(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errDeadline{err}
+}
+
+type errExhausted struct{ error }
+
+func (errExhausted) Exhausted() {}
+
+func (e errExhausted) Cause() error {
+	return e.error
+}
+
+// Exhausted is a helper to create an error of the class with the same name from any error type
+func Exhausted(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errExhausted{err}
+}
+
+type errDataLoss struct{ error }
+
+func (errDataLoss) DataLoss() {}
+
+func (e errDataLoss) Cause() error {
+	return e.error
+}
+
+// DataLoss is a helper to create an error of the class with the same name from any error type
+func DataLoss(err error) error {
+	if err == nil {
+		return nil
+	}
+	return errDataLoss{err}
+}
+
+// FromContext returns the error class from the passed in context
+func FromContext(ctx context.Context) error {
+	e := ctx.Err()
+	if e == nil {
+		return nil
+	}
+
+	if e == context.Canceled {
+		return Cancelled(e)
+	}
+	if e == context.DeadlineExceeded {
+		return Deadline(e)
+	}
+	return Unknown(e)
+}

vendor/github.com/cpuguy83/strongerrors/is.go

@@ -0,0 +1,128 @@
+package strongerrors
+
+type causer interface {
+	Cause() error
+}
+
+func getImplementer(err error) error {
+	switch e := err.(type) {
+	case
+		ErrNotFound,
+		ErrInvalidArgument,
+		ErrConflict,
+		ErrUnauthorized,
+		ErrUnauthenticated,
+		ErrUnavailable,
+		ErrForbidden,
+		ErrSystem,
+		ErrNotModified,
+		ErrAlreadyExists,
+		ErrNotImplemented,
+		ErrCancelled,
+		ErrDeadline,
+		ErrDataLoss,
+		ErrExhausted,
+		ErrUnknown:
+		return err
+	case causer:
+		return getImplementer(e.Cause())
+	default:
+		return err
+	}
+}
+
+// IsNotFound returns if the passed in error is an ErrNotFound
+func IsNotFound(err error) bool {
+	_, ok := getImplementer(err).(ErrNotFound)
+	return ok
+}
+
+// IsInvalidArgument returns if the passed in error is an ErrInvalidParameter
+func IsInvalidArgument(err error) bool {
+	_, ok := getImplementer(err).(ErrInvalidArgument)
+	return ok
+}
+
+// IsConflict returns if the passed in error is an ErrConflict
+func IsConflict(err error) bool {
+	_, ok := getImplementer(err).(ErrConflict)
+	return ok
+}
+
+// IsUnauthorized returns if the the passed in error is an ErrUnauthorized
+func IsUnauthorized(err error) bool {
+	_, ok := getImplementer(err).(ErrUnauthorized)
+	return ok
+}
+
+// IsUnauthenticated returns if the the passed in error is an ErrUnauthenticated
+func IsUnauthenticated(err error) bool {
+	_, ok := getImplementer(err).(ErrUnauthenticated)
+	return ok
+}
+
+// IsUnavailable returns if the passed in error is an ErrUnavailable
+func IsUnavailable(err error) bool {
+	_, ok := getImplementer(err).(ErrUnavailable)
+	return ok
+}
+
+// IsForbidden returns if the passed in error is an ErrForbidden
+func IsForbidden(err error) bool {
+	_, ok := getImplementer(err).(ErrForbidden)
+	return ok
+}
+
+// IsSystem returns if the passed in error is an ErrSystem
+func IsSystem(err error) bool {
+	_, ok := getImplementer(err).(ErrSystem)
+	return ok
+}
+
+// IsNotModified returns if the passed in error is a NotModified error
+func IsNotModified(err error) bool {
+	_, ok := getImplementer(err).(ErrNotModified)
+	return ok
+}
+
+// IsAlreadyExists returns if the passed in error is a AlreadyExists error
+func IsAlreadyExists(err error) bool {
+	_, ok := getImplementer(err).(ErrAlreadyExists)
+	return ok
+}
+
+// IsNotImplemented returns if the passed in error is an ErrNotImplemented
+func IsNotImplemented(err error) bool {
+	_, ok := getImplementer(err).(ErrNotImplemented)
+	return ok
+}
+
+// IsUnknown returns if the passed in error is an ErrUnknown
+func IsUnknown(err error) bool {
+	_, ok := getImplementer(err).(ErrUnknown)
+	return ok
+}
+
+// IsCancelled returns if the passed in error is an ErrCancelled
+func IsCancelled(err error) bool {
+	_, ok := getImplementer(err).(ErrCancelled)
+	return ok
+}
+
+// IsDeadline returns if the passed in error is an ErrDeadline
+func IsDeadline(err error) bool {
+	_, ok := getImplementer(err).(ErrDeadline)
+	return ok
+}
+
+// IsExhausted returns if the passed in error is an ErrDeadline
+func IsExhausted(err error) bool {
+	_, ok := getImplementer(err).(ErrExhausted)
+	return ok
+}
+
+// IsDataLoss returns if the passed in error is an ErrDataLoss
+func IsDataLoss(err error) bool {
+	_, ok := getImplementer(err).(ErrDataLoss)
+	return ok
+}

vendor/github.com/cpuguy83/strongerrors/status/grpc.go

@@ -0,0 +1,85 @@
+package status
+
+import (
+	"github.com/cpuguy83/strongerrors"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+// FromGRPC returns an error class from the provided GPRC status
+// If the status is nil or OK, this will return nil
+// nolint: gocyclo
+func FromGRPC(s *status.Status) error {
+	if s == nil || s.Code() == codes.OK {
+		return nil
+	}
+
+	switch s.Code() {
+	case codes.InvalidArgument:
+		return strongerrors.InvalidArgument(s.Err())
+	case codes.NotFound:
+		return strongerrors.NotFound(s.Err())
+	case codes.Unimplemented:
+		return strongerrors.NotImplemented(s.Err())
+	case codes.DeadlineExceeded:
+		return strongerrors.Deadline(s.Err())
+	case codes.Canceled:
+		return strongerrors.Cancelled(s.Err())
+	case codes.AlreadyExists:
+		return strongerrors.AlreadyExists(s.Err())
+	case codes.PermissionDenied:
+		return strongerrors.Unauthorized(s.Err())
+	case codes.Unauthenticated:
+		return strongerrors.Unauthenticated(s.Err())
+	// TODO(cpuguy83): consider more granular errors for these cases
+	case codes.FailedPrecondition, codes.Aborted, codes.Unavailable, codes.OutOfRange:
+		return strongerrors.Conflict(s.Err())
+	case codes.ResourceExhausted:
+		return strongerrors.Exhausted(s.Err())
+	case codes.DataLoss:
+		return strongerrors.DataLoss(s.Err())
+	default:
+		return strongerrors.Unknown(s.Err())
+	}
+}
+
+// ToGRPC takes the passed in error and converts it to a GRPC status error
+// If the passed in error is already a gprc status error, then it is returned unmodified
+// If the passed in error is nil, then a nil error is returned.
+// nolint: gocyclo
+func ToGRPC(err error) error {
+	if _, ok := status.FromError(err); ok {
+		return err
+	}
+
+	switch {
+	case strongerrors.IsNotFound(err):
+		return status.Error(codes.NotFound, err.Error())
+	case strongerrors.IsConflict(err), strongerrors.IsNotModified(err):
+		return status.Error(codes.FailedPrecondition, err.Error())
+	case strongerrors.IsInvalidArgument(err):
+		return status.Error(codes.InvalidArgument, err.Error())
+	case strongerrors.IsAlreadyExists(err):
+		return status.Error(codes.AlreadyExists, err.Error())
+	case strongerrors.IsCancelled(err):
+		return status.Error(codes.Canceled, err.Error())
+	case strongerrors.IsDeadline(err):
+		return status.Error(codes.DeadlineExceeded, err.Error())
+	case strongerrors.IsUnauthorized(err):
+		return status.Error(codes.PermissionDenied, err.Error())
+	case strongerrors.IsUnauthenticated(err):
+		return status.Error(codes.Unauthenticated, err.Error())
+	case strongerrors.IsForbidden(err), strongerrors.IsNotImplemented(err):
+		return status.Error(codes.Unimplemented, err.Error())
+	case strongerrors.IsExhausted(err):
+		return status.Error(codes.ResourceExhausted, err.Error())
+	case strongerrors.IsDataLoss(err):
+		return status.Error(codes.DataLoss, err.Error())
+	case strongerrors.IsSystem(err):
+		return status.Error(codes.Internal, err.Error())
+	case strongerrors.IsUnavailable(err):
+		return status.Error(codes.Unavailable, err.Error())
+	default:
+		return status.Error(codes.Unknown, err.Error())
+	}
+}

vendor/github.com/cpuguy83/strongerrors/status/http.go

@@ -0,0 +1,37 @@
+package status
+
+import (
+	"net/http"
+
+	"github.com/cpuguy83/strongerrors"
+)
+
+// HTTPCode takes an error and returns the HTTP status code for the given error
+// If a match is found then the second return argument will be true, otherwise it will be false.
+// nolint: gocyclo
+func HTTPCode(err error) (int, bool) {
+	switch {
+	case strongerrors.IsNotFound(err):
+		return http.StatusNotFound, true
+	case strongerrors.IsInvalidArgument(err):
+		return http.StatusBadRequest, true
+	case strongerrors.IsConflict(err):
+		return http.StatusConflict, true
+	case strongerrors.IsUnauthenticated(err), strongerrors.IsForbidden(err):
+		return http.StatusForbidden, true
+	case strongerrors.IsUnauthorized(err):
+		return http.StatusUnauthorized, true
+	case strongerrors.IsUnavailable(err):
+		return http.StatusServiceUnavailable, true
+	case strongerrors.IsForbidden(err):
+		return http.StatusForbidden, true
+	case strongerrors.IsAlreadyExists(err), strongerrors.IsNotModified(err):
+		return http.StatusNotModified, true
+	case strongerrors.IsNotImplemented(err):
+		return http.StatusNotImplemented, true
+	case strongerrors.IsSystem(err) || strongerrors.IsUnknown(err) || strongerrors.IsDataLoss(err) || strongerrors.IsExhausted(err):
+		return http.StatusInternalServerError, true
+	default:
+		return http.StatusInternalServerError, false
+	}
+}

vkubelet/api/exec.go

@@ -0,0 +1,42 @@
+package api
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/gorilla/mux"
+	"k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
+)
+
+// PodExecHandlerFunc makes an http handler func from a Provider which execs a command in a pod's container
+// Note that this handler currently depends on gorrilla/mux to get url parts as variables.
+// TODO(@cpuguy83): don't force gorilla/mux on consumers of this function
+func PodExecHandlerFunc(backend remotecommand.Executor) http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		vars := mux.Vars(req)
+
+		namespace := vars["namespace"]
+		pod := vars["pod"]
+		container := vars["container"]
+
+		supportedStreamProtocols := strings.Split(req.Header.Get("X-Stream-Protocol-Version"), ",")
+
+		q := req.URL.Query()
+		command := q["command"]
+
+		// TODO: tty flag causes remotecommand.createStreams to wait for the wrong number of streams
+		streamOpts := &remotecommand.Options{
+			Stdin:  true,
+			Stdout: true,
+			Stderr: true,
+			TTY:    false,
+		}
+
+		idleTimeout := time.Second * 30
+		streamCreationTimeout := time.Second * 30
+
+		remotecommand.ServeExec(w, req, backend, fmt.Sprintf("%s-%s", namespace, pod), "", container, command, streamOpts, idleTimeout, streamCreationTimeout, supportedStreamProtocols)
+	}
+}

vkubelet/api/helpers.go

@@ -0,0 +1,31 @@
+package api
+
+import (
+	"io"
+	"net/http"
+
+	"github.com/cpuguy83/strongerrors/status"
+	"github.com/virtual-kubelet/virtual-kubelet/log"
+)
+
+type handlerFunc func(http.ResponseWriter, *http.Request) error
+
+func handleError(f handlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, req *http.Request) {
+		err := f(w, req)
+		if err == nil {
+			return
+		}
+
+		code, _ := status.HTTPCode(err)
+		w.WriteHeader(code)
+		io.WriteString(w, err.Error())
+		logger := log.G(req.Context()).WithError(err).WithField("httpStatusCode", code)
+
+		if code >= 500 {
+			logger.Error("Internal server error on request")
+		} else {
+			log.Trace(logger, "Error on request")
+		}
+	}
+}

vkubelet/api/logs.go

@@ -0,0 +1,53 @@
+package api
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"strconv"
+
+	"github.com/cpuguy83/strongerrors"
+	"github.com/gorilla/mux"
+	"github.com/pkg/errors"
+)
+
+// ContainerLogsBackend is used in place of backend implementations for getting container logs
+type ContainerLogsBackend interface {
+	GetContainerLogs(ctx context.Context, namespace, podName, containerName string, tail int) (string, error)
+}
+
+// PodLogsHandlerFunc creates an http handler function from a provider to serve logs from a pod
+func PodLogsHandlerFunc(p ContainerLogsBackend) http.HandlerFunc {
+	return handleError(func(w http.ResponseWriter, req *http.Request) error {
+		vars := mux.Vars(req)
+		if len(vars) != 3 {
+			return strongerrors.NotFound(errors.New("not found"))
+		}
+
+		ctx := req.Context()
+
+		namespace := vars["namespace"]
+		pod := vars["pod"]
+		container := vars["container"]
+		tail := 10
+		q := req.URL.Query()
+
+		if queryTail := q.Get("tailLines"); queryTail != "" {
+			t, err := strconv.Atoi(queryTail)
+			if err != nil {
+				return strongerrors.InvalidArgument(errors.Wrap(err, "could not parse \"tailLines\""))
+			}
+			tail = t
+		}
+
+		podsLogs, err := p.GetContainerLogs(ctx, namespace, pod, container, tail)
+		if err != nil {
+			return errors.Wrap(err, "error getting container logs?)")
+		}
+
+		if _, err := io.WriteString(w, podsLogs); err != nil {
+			return strongerrors.Unknown(errors.Wrap(err, "error writing response to client"))
+		}
+		return nil
+	})
+}

vkubelet/api/stats.go

@@ -0,0 +1,39 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/cpuguy83/strongerrors"
+	"github.com/pkg/errors"
+	stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
+)
+
+// PodMetricsBackend is used in place of backend implementations to get k8s pod metrics.
+type PodMetricsBackend interface {
+	GetStatsSummary(context.Context) (*stats.Summary, error)
+}
+
+// PodMetricsHandlerFunc makes an HTTP handler for implementing the kubelet summary stats endpoint
+func PodMetricsHandlerFunc(b PodMetricsBackend) http.HandlerFunc {
+	return handleError(func(w http.ResponseWriter, req *http.Request) error {
+		stats, err := b.GetStatsSummary(req.Context())
+		if err != nil {
+			if errors.Cause(err) == context.Canceled {
+				return strongerrors.Cancelled(err)
+			}
+			return errors.Wrap(err, "error getting status from provider")
+		}
+
+		b, err := json.Marshal(stats)
+		if err != nil {
+			return strongerrors.Unknown(errors.Wrap(err, "error marshalling stats"))
+		}
+
+		if _, err := w.Write(b); err != nil {
+			return strongerrors.Unknown(errors.Wrap(err, "could not write to client"))
+		}
+		return nil
+	})
+}

vkubelet/apiserver.go

@@ -2,44 +2,17 @@ package vkubelet
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
 	"net/http"
 	"os"
-	"strconv"
-	"strings"
-	"time"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
-	"github.com/pkg/errors"
 	"github.com/virtual-kubelet/virtual-kubelet/log"
-	"k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
+	"github.com/virtual-kubelet/virtual-kubelet/vkubelet/api"
 )
 
-func loggingContext(r *http.Request) context.Context {
+// KubeletServerStart starts the virtual kubelet HTTP server.
-	ctx := r.Context()
-	logger := log.G(ctx).WithFields(logrus.Fields{
-		"uri":  r.RequestURI,
-		"vars": mux.Vars(r),
-	})
-	return log.WithLogger(ctx, logger)
-}
-
-// NotFound provides a handler for cases where the requested endpoint doesn't exist
-func NotFound(w http.ResponseWriter, r *http.Request) {
-	logger := log.G(loggingContext(r))
-	log.Trace(logger, "404 request not found")
-	http.Error(w, "404 request not found", http.StatusNotFound)
-}
-
-// KubeletServer implements HTTP endpoints for serving kubelet API's
-type KubeletServer struct {
-	p Provider
-}
-
-// KubeletServertStart starts the virtual kubelet HTTP server.
 func KubeletServerStart(p Provider) {
 	certFilePath := os.Getenv("APISERVER_CERT_LOCATION")
 	keyFilePath := os.Getenv("APISERVER_KEY_LOCATION")
@@ -47,12 +20,11 @@ func KubeletServerStart(p Provider) {
 	addr := fmt.Sprintf(":%s", port)
 
 	r := mux.NewRouter()
-	s := &KubeletServer{p: p}
+	r.HandleFunc("/containerLogs/{namespace}/{pod}/{container}", api.PodLogsHandlerFunc(p)).Methods("GET")
-	r.HandleFunc("/containerLogs/{namespace}/{pod}/{container}", s.ApiServerHandler).Methods("GET")
+	r.HandleFunc("/exec/{namespace}/{pod}/{container}", api.PodExecHandlerFunc(p)).Methods("POST")
-	r.HandleFunc("/exec/{namespace}/{pod}/{container}", s.ApiServerHandlerExec).Methods("POST")
 	r.NotFoundHandler = http.HandlerFunc(NotFound)
 
-	if err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, r); err != nil {
+	if err := http.ListenAndServeTLS(addr, certFilePath, keyFilePath, InstrumentHandler(r)); err != nil {
 		log.G(context.TODO()).WithError(err).Error("error setting up http server")
 	}
 }
@@ -61,120 +33,49 @@ func KubeletServerStart(p Provider) {
 // TLS is never enabled on this endpoint.
 func MetricsServerStart(p Provider, addr string) {
 	r := mux.NewRouter()
-	s := &MetricsServer{p: p}
+
-	r.HandleFunc("/stats/summary", s.MetricsSummaryHandler).Methods("GET")
+	mp, ok := p.(PodMetricsProvider)
-	r.HandleFunc("/stats/summary/", s.MetricsSummaryHandler).Methods("GET")
+	if !ok {
+		r.HandleFunc("/stats/summary", NotImplemented).Methods("GET")
+		r.HandleFunc("/stats/summary/", NotImplemented).Methods("GET")
+	} else {
+		r.HandleFunc("/stats/summary", api.PodMetricsHandlerFunc(mp)).Methods("GET")
+		r.HandleFunc("/stats/summary/", api.PodMetricsHandlerFunc(mp)).Methods("GET")
+	}
 	r.NotFoundHandler = http.HandlerFunc(NotFound)
-	if err := http.ListenAndServe(addr, r); err != nil {
+	if err := http.ListenAndServe(addr, InstrumentHandler(r)); err != nil {
 		log.G(context.TODO()).WithError(err).Error("Error starting http server")
 	}
 }
 
-// MetricsServer provides an HTTP endpopint for accessing pod metrics
+func instrumentRequest(r *http.Request) context.Context {
-type MetricsServer struct {
+	ctx := r.Context()
-	p Provider
+	logger := log.G(ctx).WithFields(logrus.Fields{
+		"uri":  r.RequestURI,
+		"vars": mux.Vars(r),
+	})
+	return log.WithLogger(ctx, logger)
 }
 
-// MetricsSummaryHandler is an HTTP handler for implementing the kubelet summary stats endpoint
+// InstrumentHandler wraps an http.Handler and injects instrumentation into the request context.
-func (s *MetricsServer) MetricsSummaryHandler(w http.ResponseWriter, req *http.Request) {
+func InstrumentHandler(h http.Handler) http.Handler {
-	ctx := loggingContext(req)
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-
+		ctx := instrumentRequest(req)
-	mp, ok := s.p.(MetricsProvider)
+		req = req.WithContext(ctx)
-	if !ok {
+		h.ServeHTTP(w, req)
-		log.G(ctx).Debug("stats not implemented for provider")
+	})
-		http.Error(w, "not implememnted", http.StatusNotImplemented)
-		return
-	}
-
-	stats, err := mp.GetStatsSummary(req.Context())
-	if err != nil {
-		if errors.Cause(err) == context.Canceled {
-			return
-		}
-		log.G(ctx).Error("Error getting stats from provider:", err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	b, err := json.Marshal(stats)
-	if err != nil {
-		log.G(ctx).WithError(err).Error("Could not marshal stats")
-		http.Error(w, "could not marshal stats: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	if _, err := w.Write(b); err != nil {
-		log.G(ctx).WithError(err).Debug("Could not write to client")
-	}
 }
 
-func (s *KubeletServer) ApiServerHandler(w http.ResponseWriter, req *http.Request) {
+// NotFound provides a handler for cases where the requested endpoint doesn't exist
-	vars := mux.Vars(req)
+func NotFound(w http.ResponseWriter, r *http.Request) {
-	if len(vars) != 3 {
+	logger := log.G(r.Context())
-		NotFound(w, req)
+	log.Trace(logger, "404 request not found")
-		return
+	http.Error(w, "404 request not found", http.StatusNotFound)
-	}
-
-	ctx := loggingContext(req)
-
-	namespace := vars["namespace"]
-	pod := vars["pod"]
-	container := vars["container"]
-	tail := 10
-	q := req.URL.Query()
-
-	if queryTail := q.Get("tailLines"); queryTail != "" {
-		t, err := strconv.Atoi(queryTail)
-		if err != nil {
-			logger := log.G(context.TODO()).WithError(err)
-			log.Trace(logger, "could not parse tailLines")
-			http.Error(w, fmt.Sprintf("could not parse \"tailLines\": %v", err), http.StatusBadRequest)
-			return
-		}
-		tail = t
-	}
-
-	podsLogs, err := s.p.GetContainerLogs(ctx, namespace, pod, container, tail)
-	if err != nil {
-		log.G(ctx).WithError(err).Error("error getting container logs")
-		http.Error(w, fmt.Sprintf("error while getting container logs: %v", err), http.StatusInternalServerError)
-		return
-	}
-
-	if _, err := io.WriteString(w, podsLogs); err != nil {
-		log.G(ctx).WithError(err).Warn("error writing response to client")
-	}
 }
 
-func (s *KubeletServer) ApiServerHandlerExec(w http.ResponseWriter, req *http.Request) {
+// NotImplemented provides a handler for cases where a provider does not implement a given API
-	vars := mux.Vars(req)
+func NotImplemented(w http.ResponseWriter, r *http.Request) {
-
+	logger := log.G(r.Context())
-	namespace := vars["namespace"]
+	log.Trace(logger, "501 not implemented")
-	pod := vars["pod"]
+	http.Error(w, "501 not implemented", http.StatusNotImplemented)
-	container := vars["container"]
-
-	supportedStreamProtocols := strings.Split(req.Header.Get("X-Stream-Protocol-Version"), ",")
-
-	q := req.URL.Query()
-	command := q["command"]
-
-	// streamOpts := &remotecommand.Options{
-	// 	Stdin:  (q.Get("input") == "1"),
-	// 	Stdout: (q.Get("output") == "1"),
-	// 	Stderr: (q.Get("error") == "1"),
-	// 	TTY:    (q.Get("tty") == "1"),
-	// }
-
-	// TODO: tty flag causes remotecommand.createStreams to wait for the wrong number of streams
-	streamOpts := &remotecommand.Options{
-		Stdin:  true,
-		Stdout: true,
-		Stderr: true,
-		TTY:    false,
-	}
-
-	idleTimeout := time.Second * 30
-	streamCreationTimeout := time.Second * 30
-
-	remotecommand.ServeExec(w, req, s.p, fmt.Sprintf("%s-%s", namespace, pod), "", container, command, streamOpts, idleTimeout, streamCreationTimeout, supportedStreamProtocols)
 }

vkubelet/provider.go

@@ -57,7 +57,7 @@ type Provider interface {
 	OperatingSystem() string
 }
 
-// MetricsProvider is an optional interface that providers can implement to expose pod stats
+// PodMetricsProvider is an optional interface that providers can implement to expose pod stats
-type MetricsProvider interface {
+type PodMetricsProvider interface {
 	GetStatsSummary(context.Context) (*stats.Summary, error)
 }