Merge pull request #663 from squeed/cri-annotations

CRI: Rename CRIAnnotations, CRILabels to UserAnnotations, UserLabels
appc · Oct 13, 2016 · 3fddc8f · 3fddc8f
2 parents c204336 + f8bc8a9
commit 3fddc8f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 30 deletions.
diff --git a/discovery/http.go b/discovery/http.go
@@ -68,8 +68,13 @@ func init() {
 	httpDo = Client
 
 	// copy for InsecureTLS
-	tInsecureTLS := *t
-	tInsecureTLS.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
+	tInsecureTLS := http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		Dial: func(n, a string) (net.Conn, error) {
+			return net.DialTimeout(n, a, defaultDialTimeout)
+		},
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
 	ClientInsecureTLS = &http.Client{
 		Transport: &tInsecureTLS,
 	}

diff --git a/schema/pod.go b/schema/pod.go
@@ -28,15 +28,15 @@ import (
 const PodManifestKind = types.ACKind("PodManifest")
 
 type PodManifest struct {
-	ACVersion      types.SemVer         `json:"acVersion"`
-	ACKind         types.ACKind         `json:"acKind"`
-	Apps           AppList              `json:"apps"`
-	Volumes        []types.Volume       `json:"volumes"`
-	Isolators      []types.Isolator     `json:"isolators"`
-	Annotations    types.Annotations    `json:"annotations"`
-	Ports          []types.ExposedPort  `json:"ports"`
-	CRIAnnotations types.CRIAnnotations `json:"criAnnotations,omitempty"`
-	CRILabels      types.CRILabels      `json:"criLabels,omitempty"`
+	ACVersion       types.SemVer          `json:"acVersion"`
+	ACKind          types.ACKind          `json:"acKind"`
+	Apps            AppList               `json:"apps"`
+	Volumes         []types.Volume        `json:"volumes"`
+	Isolators       []types.Isolator      `json:"isolators"`
+	Annotations     types.Annotations     `json:"annotations"`
+	Ports           []types.ExposedPort   `json:"ports"`
+	UserAnnotations types.UserAnnotations `json:"userAnnotations,omitempty"`
+	UserLabels      types.UserLabels      `json:"userLabels,omitempty"`
 }
 
 // podManifest is a model to facilitate extra validation during the

diff --git a/schema/types/app.go b/schema/types/app.go
@@ -22,18 +22,18 @@ import (
 )
 
 type App struct {
-	Exec              Exec           `json:"exec"`
-	EventHandlers     []EventHandler `json:"eventHandlers,omitempty"`
-	User              string         `json:"user"`
-	Group             string         `json:"group"`
-	SupplementaryGIDs []int          `json:"supplementaryGIDs,omitempty"`
-	WorkingDirectory  string         `json:"workingDirectory,omitempty"`
-	Environment       Environment    `json:"environment,omitempty"`
-	MountPoints       []MountPoint   `json:"mountPoints,omitempty"`
-	Ports             []Port         `json:"ports,omitempty"`
-	Isolators         Isolators      `json:"isolators,omitempty"`
-	CRIAnnotations    CRIAnnotations `json:"criAnnotations,omitempty"`
-	CRILabels         CRILabels      `json:"criLabels,omitempty"`
+	Exec              Exec            `json:"exec"`
+	EventHandlers     []EventHandler  `json:"eventHandlers,omitempty"`
+	User              string          `json:"user"`
+	Group             string          `json:"group"`
+	SupplementaryGIDs []int           `json:"supplementaryGIDs,omitempty"`
+	WorkingDirectory  string          `json:"workingDirectory,omitempty"`
+	Environment       Environment     `json:"environment,omitempty"`
+	MountPoints       []MountPoint    `json:"mountPoints,omitempty"`
+	Ports             []Port          `json:"ports,omitempty"`
+	Isolators         Isolators       `json:"isolators,omitempty"`
+	UserAnnotations   UserAnnotations `json:"userAnnotations,omitempty"`
+	UserLabels        UserLabels      `json:"userLabels,omitempty"`
 }
 
 // app is a model to facilitate extra validation during the

diff --git a/schema/types/app_test.go b/schema/types/app_test.go
@@ -212,18 +212,18 @@ func TestAppUnmarshal(t *testing.T) {
 			false,
 		},
 		{
-			`{"Exec":["/a"],"User":"0","Group":"0","CRIAnnotations":{"weird!":"normal?"},"CRILabels":{"one!":"two?"}}`,
+			`{"Exec":["/a"],"User":"0","Group":"0","UserAnnotations":{"weird!":"normal?"},"UserLabels":{"one!":"two?"}}`,
 			&App{
 				Exec: Exec{
 					"/a",
 				},
 				User:        "0",
 				Group:       "0",
 				Environment: make(Environment, 0),
-				CRIAnnotations: CRIAnnotations{
+				UserAnnotations: UserAnnotations{
 					"weird!": "normal?",
 				},
-				CRILabels: CRILabels{
+				UserLabels: UserLabels{
 					"one!": "two?",
 				},
 			},

diff --git a/schema/types/cri_annotations.go → schema/types/user_annotations.go b/schema/types/cri_annotations.go → schema/types/user_annotations.go
@@ -14,5 +14,5 @@
 
 package types
 
-// CRIAnnotations are arbitrary key-value pairs
-type CRIAnnotations map[string]string
+// UserAnnotations are arbitrary key-value pairs, to be supplied and interpreted by the user
+type UserAnnotations map[string]string
diff --git a/schema/types/cri_labels.go → schema/types/user_labels.go b/schema/types/cri_labels.go → schema/types/user_labels.go
@@ -14,5 +14,5 @@
 
 package types
 
-// CRILabels are arbitrary key-value pairs
-type CRILabels map[string]string
+// UserLabels are arbitrary key-value pairs, to be supplied and interpreted by the user
+type UserLabels map[string]string