Commit 3375a2f2 authored by galal-hussein's avatar galal-hussein Committed by Alena Prokharchyk
Browse files

vendor update

parent cb506720
Showing with 118 additions and 4 deletions
+118 -4
......@@ -20,8 +20,8 @@ github.com/gorilla/websocket v1.2.0
golang.org/x/sync fd80eb99c8f653c847d294a001bdf2a3a6f768f5
github.com/coreos/etcd 52f73c5a6cb0d1d196ffd6eced406c9d8502078a transitive=true
github.com/coreos/go-semver e214231b295a8ea9479f11b70b35d5acf3556d9b
github.com/ugorji/go/codec ccfe18359b55b97855cee1d3f74e5efbda4869dc
github.com/ugorji/go ccfe18359b55b97855cee1d3f74e5efbda4869dc
github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b175
github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5
github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa
github.com/rancher/types eb5a4fd55a4ada9d64713530f02cbaf3f1b8c2ea
github.com/rancher/types fdaf972f5264c2863c2d93cc8f8bc970bf9bf6a6
......@@ -210,6 +210,10 @@ type AzureKubernetesServiceConfig struct {
Subnet string `json:"subnet,omitempty"`
// The resource group that the virtual network is in. If omited it is assumed to match the resource group of the cluster
VirtualNetworkResourceGroup string `json:"virtualNetworkResourceGroup,omitempty"`
// Additional options for setting a custom virtual network
ServiceCIDR string `json:"serviceCidr,omitempty"`
DNSServiceIP string `json:"dnsServiceIp,omitempty"`
DockerBridgeCIDR string `json:"dockerBridgeCidr,omitempty"`
}
type AmazonElasticContainerServiceConfig struct {
......
......@@ -167,7 +167,7 @@ type CustomConfig struct {
// Optional - Docker socket on the node that will be used in tunneling
DockerSocket string `yaml:"docker_socket" json:"dockerSocket,omitempty"`
// SSH Private Key
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"`
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"`
Label map[string]string `yaml:"label" json:"label,omitempty"`
}
......
......@@ -53,7 +53,7 @@ type BastionHost struct {
// SSH Agent Auth enable
SSHAgentAuth bool `yaml:"ssh_agent_auth,omitempty" json:"sshAgentAuth,omitempty"`
// SSH Private Key
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty"`
SSHKey string `yaml:"ssh_key" json:"sshKey,omitempty" norman:"type=password"`
// SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"`
}
......@@ -65,6 +65,8 @@ type PrivateRegistry struct {
User string `yaml:"user" json:"user,omitempty"`
// Password for registry access
Password string `yaml:"password" json:"password,omitempty"`
// Default registry
IsDefault bool `yaml:"is_default" json:"isDefault,omitempty"`
}
type RKESystemImages struct {
......
......@@ -29,6 +29,7 @@ type AppSpec struct {
var (
AppConditionInstalled condition.Cond = "Installed"
AppConditionMigrated condition.Cond = "Migrated"
)
type AppStatus struct {
......
language: go
sudo: false
go:
- 1.7.x # go testing suite support, which we use, was introduced in go 1.7
- 1.8.x
- 1.9.x
- tip
script:
- go test -tags "alltests" -run Suite -coverprofile coverage.txt github.com/ugorji/go/codec
after_success:
- bash <(curl -s https://codecov.io/bash)
The MIT License (MIT)
Copyright (c) 2012-2015 Ugorji Nwoke.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
[![Sourcegraph](https://sourcegraph.com/github.com/ugorji/go/-/badge.svg)](https://sourcegraph.com/github.com/ugorji/go/-/blob/codec)
[![Build Status](https://travis-ci.org/ugorji/go.svg?branch=master)](https://travis-ci.org/ugorji/go)
[![codecov](https://codecov.io/gh/ugorji/go/branch/master/graph/badge.svg)](https://codecov.io/gh/ugorji/go)
[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/ugorji/go/codec)
[![rcard](https://goreportcard.com/badge/github.com/ugorji/go/codec?v=2)](https://goreportcard.com/report/github.com/ugorji/go/codec)
[![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/ugorji/go/master/LICENSE)
# go/codec
This repository contains the `go-codec` library,
a High Performance and Feature-Rich Idiomatic encode/decode and rpc library for
- msgpack: https://github.com/msgpack/msgpack
- binc: http://github.com/ugorji/binc
- cbor: http://cbor.io http://tools.ietf.org/html/rfc7049
- json: http://json.org http://tools.ietf.org/html/rfc7159
For more information:
- [see the codec/Readme for quick usage information](https://github.com/ugorji/go/tree/master/codec#readme)
- [view the API on godoc](http://godoc.org/github.com/ugorji/go/codec)
- [read the detailed usage/how-to primer](http://ugorji.net/blog/go-codec-primer)
Install using:
go get github.com/ugorji/go/codec
**MessagePack and [Binc](http://github.com/ugorji/binc) Codec for [Go](http://golang.org) Language.**
*A High Performance, Feature-Rich, Idiomatic encode/decode and rpc library*.
To install:
go get github.com/ugorji/go/codec
Source: [http://github.com/ugorji/go]
Online documentation: [http://godoc.org/github.com/ugorji/go/codec]
Typical usage:
```go
// create and use decoder/encoder
var (
v interface{} // value to decode/encode into
r io.Reader
w io.Writer
b []byte
mh codec.MsgpackHandle
)
dec = codec.NewDecoder(r, &mh)
dec = codec.NewDecoderBytes(b, &mh)
err = dec.Decode(&v)
enc = codec.NewEncoder(w, &mh)
enc = codec.NewEncoderBytes(&b, &mh)
err = enc.Encode(v)
//RPC Server
go func() {
for {
conn, err := listener.Accept()
rpcCodec := codec.GoRpc.ServerCodec(conn, h)
//OR rpcCodec := codec.MsgpackSpecRpc.ServerCodec(conn, h)
rpc.ServeCodec(rpcCodec)
}
}()
//RPC Communication (client side)
conn, err = net.Dial("tcp", "localhost:5555")
rpcCodec := codec.GoRpc.ClientCodec(conn, h)
//OR rpcCodec := codec.MsgpackSpecRpc.ClientCodec(conn, h)
client := rpc.NewClientWithCodec(rpcCodec)
```
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment