github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update vendor dir and Godeps.json with new Godep

Browse Source
This commit is contained in:
saadali
2016-05-11 16:59:55 -07:00
parent b83af3d481
commit c708e2cc82
2053 changed files with 955 additions and 140589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vendor/github.com/appc/spec/schema/lastditch/doc.go generated vendored
View File

@@ -1,28 +0,0 @@
// Copyright 2015 The appc Authors
//
// 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.
// Package lastditch provides fallback redefinitions of parts of
// schemas provided by schema package.
//
// Almost no validation of schemas is done (besides checking if data
// really is `JSON`-encoded and kind is either `ImageManifest` or
// `PodManifest`. This is to get as much data as possible from an
// invalid manifest. The main aim of the package is to be used for the
// better error reporting. The another aim might be to force some
// operation (like removing a pod), which would otherwise fail because
// of an invalid manifest.
//
// To avoid validation during deserialization, types provided by this
// package use plain strings.
package lastditch

45
vendor/github.com/appc/spec/schema/lastditch/image.go generated vendored
View File

@@ -1,45 +0,0 @@
// Copyright 2015 The appc Authors
//
// 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.
package lastditch
import (
"encoding/json"
"github.com/appc/spec/schema"
"github.com/appc/spec/schema/types"
)
type ImageManifest struct {
ACVersion string `json:"acVersion"`
ACKind string `json:"acKind"`
Name string `json:"name"`
Labels Labels `json:"labels,omitempty"`
}
// a type just to avoid a recursion during unmarshalling
type imageManifest ImageManifest
func (im *ImageManifest) UnmarshalJSON(data []byte) error {
i := imageManifest(*im)
err := json.Unmarshal(data, &i)
if err != nil {
return err
}
if i.ACKind != string(schema.ImageManifestKind) {
return types.InvalidACKindError(schema.ImageManifestKind)
}
*im = ImageManifest(i)
return nil
}

38
vendor/github.com/appc/spec/schema/lastditch/labels.go generated vendored
View File

@@ -1,38 +0,0 @@
// Copyright 2015 The appc Authors
//
// 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.
package lastditch
import (
"encoding/json"
)
type Labels []Label
// a type just to avoid a recursion during unmarshalling
type labels Labels
type Label struct {
Name string `json:"name"`
Value string `json:"value"`
}
func (l *Labels) UnmarshalJSON(data []byte) error {
var jl labels
if err := json.Unmarshal(data, &jl); err != nil {
return err
}
*l = Labels(jl)
return nil
}

57
vendor/github.com/appc/spec/schema/lastditch/pod.go generated vendored
View File

@@ -1,57 +0,0 @@
// Copyright 2015 The appc Authors
//
// 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.
package lastditch
import (
"encoding/json"
"github.com/appc/spec/schema"
"github.com/appc/spec/schema/types"
)
type PodManifest struct {
ACVersion string `json:"acVersion"`
ACKind string `json:"acKind"`
Apps AppList `json:"apps"`
}
type AppList []RuntimeApp
type RuntimeApp struct {
Name string `json:"name"`
Image RuntimeImage `json:"image"`
}
type RuntimeImage struct {
Name string `json:"name"`
ID string `json:"id"`
Labels Labels `json:"labels,omitempty"`
}
// a type just to avoid a recursion during unmarshalling
type podManifest PodManifest
func (pm *PodManifest) UnmarshalJSON(data []byte) error {
p := podManifest(*pm)
err := json.Unmarshal(data, &p)
if err != nil {
return err
}
if p.ACKind != string(schema.PodManifestKind) {
return types.InvalidACKindError(schema.PodManifestKind)
}
*pm = PodManifest(p)
return nil
}