From c079de65b520bd7690c7ac057a38b404947f3909 Mon Sep 17 00:00:00 2001 From: Michael Richmond Date: Mon, 8 Aug 2016 14:30:04 -0700 Subject: Adding `resyncperiod` to Corefile (#205) * Removing old unused inline k8s API code and tests. * Adding parsing implementation for `resyncperiod` keyword from Corefile. * Adding tests for parsing `resyncperiod` keyword from Corefile. 8 Updating README.md and conf/k8sCorefile. --- middleware/kubernetes/k8sclient/dataobjects.go | 113 ------------------------- 1 file changed, 113 deletions(-) delete mode 100644 middleware/kubernetes/k8sclient/dataobjects.go (limited to 'middleware/kubernetes/k8sclient/dataobjects.go') diff --git a/middleware/kubernetes/k8sclient/dataobjects.go b/middleware/kubernetes/k8sclient/dataobjects.go deleted file mode 100644 index b17adeba4..000000000 --- a/middleware/kubernetes/k8sclient/dataobjects.go +++ /dev/null @@ -1,113 +0,0 @@ -package k8sclient - -import ( - "encoding/json" - "net/http" -) - -// getK8sAPIResponse wraps the http.Get(url) function to provide dependency -// injection for unit testing. -var getK8sAPIResponse = func(url string) (resp *http.Response, err error) { - resp, err = http.Get(url) - return resp, err -} - -func parseJson(url string, target interface{}) error { - r, err := getK8sAPIResponse(url) - if err != nil { - return err - } - defer r.Body.Close() - - return json.NewDecoder(r.Body).Decode(target) -} - -// Kubernetes Resource List -type ResourceList struct { - Kind string `json:"kind"` - GroupVersion string `json:"groupVersion"` - Resources []resource `json:"resources"` -} - -type resource struct { - Name string `json:"name"` - Namespaced bool `json:"namespaced"` - Kind string `json:"kind"` -} - -// Kubernetes NamespaceList -type NamespaceList struct { - Kind string `json:"kind"` - APIVersion string `json:"apiVersion"` - Metadata apiListMetadata `json:"metadata"` - Items []nsItems `json:"items"` -} - -type apiListMetadata struct { - SelfLink string `json:"selfLink"` - ResourceVersion string `json:"resourceVersion"` -} - -type nsItems struct { - Metadata nsMetadata `json:"metadata"` - Spec nsSpec `json:"spec"` - Status nsStatus `json:"status"` -} - -type nsMetadata struct { - Name string `json:"name"` - SelfLink string `json:"selfLink"` - Uid string `json:"uid"` - ResourceVersion string `json:"resourceVersion"` - CreationTimestamp string `json:"creationTimestamp"` -} - -type nsSpec struct { - Finalizers []string `json:"finalizers"` -} - -type nsStatus struct { - Phase string `json:"phase"` -} - -// Kubernetes ServiceList -type ServiceList struct { - Kind string `json:"kind"` - APIVersion string `json:"apiVersion"` - Metadata apiListMetadata `json:"metadata"` - Items []ServiceItem `json:"items"` -} - -type ServiceItem struct { - Metadata serviceMetadata `json:"metadata"` - Spec serviceSpec `json:"spec"` - // Status serviceStatus `json:"status"` -} - -type serviceMetadata struct { - Name string `json:"name"` - Namespace string `json:"namespace"` - SelfLink string `json:"selfLink"` - Uid string `json:"uid"` - ResourceVersion string `json:"resourceVersion"` - CreationTimestamp string `json:"creationTimestamp"` - // labels -} - -type serviceSpec struct { - Ports []servicePort `json:"ports"` - ClusterIP string `json:"clusterIP"` - Type string `json:"type"` - SessionAffinity string `json:"sessionAffinity"` -} - -type servicePort struct { - Name string `json:"name"` - Protocol string `json:"protocol"` - Port int `json:"port"` - TargetPort int `json:"targetPort"` -} - -type serviceStatus struct { - LoadBalancer string `json:"loadBalancer"` -} -- cgit v1.2.3