github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-10-22 15:59:00 +00:00
Code Issues Projects Releases Wiki Activity

Update vendor file to fix #426

Browse Source
This commit is contained in:
Tomofumi Hayashi
2020-01-28 20:17:35 +09:00
committed by Tomofumi Hayashi
parent 5577822b36
commit eaf6ff6e20
30 changed files with 252 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/json-iterator/go/reflect_extension.go generated vendored
View File

@@ -341,7 +341,7 @@ func describeStruct(ctx *ctx, typ reflect2.Type) *StructDescriptor {
if ctx.onlyTaggedField && !hastag && !field.Anonymous() {
continue
}
if tag == "-" {
if tag == "-" || field.Name() == "_" {
continue
}
tagParts := strings.Split(tag, ",")

10
vendor/github.com/json-iterator/go/reflect_map.go generated vendored
View File

@@ -290,16 +290,17 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
stream.WriteObjectStart()
mapIter := encoder.mapType.UnsafeIterate(ptr)
subStream := stream.cfg.BorrowStream(nil)
subStream.Attachment = stream.Attachment
subIter := stream.cfg.BorrowIterator(nil)
keyValues := encodedKeyValues{}
for mapIter.HasNext() {
subStream.buf = make([]byte, 0, 64)
key, elem := mapIter.UnsafeNext()
subStreamIndex := subStream.Buffered()
encoder.keyEncoder.Encode(key, subStream)
if subStream.Error != nil && subStream.Error != io.EOF && stream.Error == nil {
stream.Error = subStream.Error
}
encodedKey := subStream.Buffer()
encodedKey := subStream.Buffer()[subStreamIndex:]
subIter.ResetBytes(encodedKey)
decodedKey := subIter.ReadString()
if stream.indention > 0 {
@@ -310,7 +311,7 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
encoder.elemEncoder.Encode(elem, subStream)
keyValues = append(keyValues, encodedKV{
key: decodedKey,
keyValue: subStream.Buffer(),
keyValue: subStream.Buffer()[subStreamIndex:],
})
}
sort.Sort(keyValues)
@@ -320,6 +321,9 @@ func (encoder *sortKeysMapEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
}
stream.Write(keyValue.keyValue)
}
if subStream.Error != nil && stream.Error == nil {
stream.Error = subStream.Error
}
stream.WriteObjectEnd()
stream.cfg.ReturnStream(subStream)
stream.cfg.ReturnIterator(subIter)

1
vendor/github.com/json-iterator/go/reflect_struct_encoder.go generated vendored
View File

@@ -200,6 +200,7 @@ type stringModeStringEncoder struct {
func (encoder *stringModeStringEncoder) Encode(ptr unsafe.Pointer, stream *Stream) {
tempStream := encoder.cfg.BorrowStream(nil)
tempStream.Attachment = stream.Attachment
defer encoder.cfg.ReturnStream(tempStream)
encoder.elemEncoder.Encode(ptr, tempStream)
stream.WriteString(string(tempStream.Buffer()))

6
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.go generated vendored
View File

@@ -1,8 +1,8 @@
package v1
import (
"net"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"net"
)
// +genclient
@@ -103,7 +103,9 @@ const (
// Pod annotation for network-attachment-definition
NetworkAttachmentAnnot = "k8s.v1.cni.cncf.io/networks"
// Pod annotation for network status
NetworkStatusAnnot = "k8s.v1.cni.cncf.io/networks-status"
NetworkStatusAnnot = "k8s.v1.cni.cncf.io/network-status"
// Old Pod annotation for network status (which is used before but it will be obsolated)
OldNetworkStatusAnnot = "k8s.v1.cni.cncf.io/networks-status"
)
// NoK8sNetworkError indicates error, no network in kubernetes

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/zz_generated.deepcopy.go generated vendored
View File

@@ -1,7 +1,7 @@
// +build !ignore_autogenerated
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/clientset.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/doc.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/clientset_generated.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/doc.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/register.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/doc.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/register.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/doc.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/doc.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_k8s.cni.cncf.io_client.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_networkattachmentdefinition.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/generated_expansion.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/k8s.cni.cncf.io_client.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/networkattachmentdefinition.go generated vendored
View File

@@ -1,5 +1,5 @@
/*
Copyright 2019 The Kubernetes Authors
Copyright 2020 The Kubernetes Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

1
vendor/github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils/net-attach-def.go generated vendored
View File

@@ -79,6 +79,7 @@ func setPodNetworkStatus(client kubernetes.Interface, pod *corev1.Pod, networkst
coreClient := client.CoreV1()
pod.Annotations[v1.NetworkStatusAnnot] = networkstatus
pod.Annotations[v1.OldNetworkStatusAnnot] = networkstatus
pod = pod.DeepCopy()
var err error