mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	Update heketi dependency to release3.
commit hash#28b5cc4cc6d2b9bdfa91ed1b93efaab4931aa697 Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
		
							
								
								
									
										9
									
								
								Godeps/Godeps.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										9
									
								
								Godeps/Godeps.json
									
									
									
										generated
									
									
									
								
							@@ -1418,18 +1418,15 @@
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"ImportPath": "github.com/heketi/heketi/client/api/go-client",
 | 
			
		||||
			"Comment": "v2.1.0-dev-2-gcb07059",
 | 
			
		||||
			"Rev": "cb07059aed8760ef857a58d37598b9e51c36a9ae"
 | 
			
		||||
			"Rev": "28b5cc4cc6d2b9bdfa91ed1b93efaab4931aa697"
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"ImportPath": "github.com/heketi/heketi/pkg/glusterfs/api",
 | 
			
		||||
			"Comment": "v2.1.0-dev-2-gcb07059",
 | 
			
		||||
			"Rev": "cb07059aed8760ef857a58d37598b9e51c36a9ae"
 | 
			
		||||
			"Rev": "28b5cc4cc6d2b9bdfa91ed1b93efaab4931aa697"
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"ImportPath": "github.com/heketi/heketi/pkg/utils",
 | 
			
		||||
			"Comment": "v2.1.0-dev-2-gcb07059",
 | 
			
		||||
			"Rev": "cb07059aed8760ef857a58d37598b9e51c36a9ae"
 | 
			
		||||
			"Rev": "28b5cc4cc6d2b9bdfa91ed1b93efaab4931aa697"
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			"ImportPath": "github.com/howeyc/gopass",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								vendor/github.com/heketi/heketi/pkg/glusterfs/api/types.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/heketi/heketi/pkg/glusterfs/api/types.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -155,6 +155,7 @@ type VolumeCreateRequest struct {
 | 
			
		||||
	Clusters   []string             `json:"clusters,omitempty"`
 | 
			
		||||
	Name       string               `json:"name"`
 | 
			
		||||
	Durability VolumeDurabilityInfo `json:"durability,omitempty"`
 | 
			
		||||
	Gid        int64                `json:"gid,omitempty"`
 | 
			
		||||
	Snapshot   struct {
 | 
			
		||||
		Enable bool    `json:"enable"`
 | 
			
		||||
		Factor float32 `json:"factor"`
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										3
									
								
								vendor/github.com/heketi/heketi/pkg/utils/bodystring.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/heketi/heketi/pkg/utils/bodystring.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -21,6 +21,7 @@ import (
 | 
			
		||||
	"io"
 | 
			
		||||
	"io/ioutil"
 | 
			
		||||
	"net/http"
 | 
			
		||||
	"strings"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Return the body from a response as a string
 | 
			
		||||
@@ -39,5 +40,5 @@ func GetErrorFromResponse(r *http.Response) error {
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
	return errors.New(s)
 | 
			
		||||
	return errors.New(strings.TrimSpace(s))
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										13
									
								
								vendor/github.com/heketi/heketi/pkg/utils/log.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								vendor/github.com/heketi/heketi/pkg/utils/log.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -114,10 +114,12 @@ func (l *Logger) Critical(format string, v ...interface{}) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Log error string
 | 
			
		||||
func (l *Logger) LogError(format string, v ...interface{}) {
 | 
			
		||||
func (l *Logger) LogError(format string, v ...interface{}) error {
 | 
			
		||||
	if l.level >= LEVEL_ERROR {
 | 
			
		||||
		logWithLongFile(l.errorlog, format, v...)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return fmt.Errorf(format, v...)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Log error variable
 | 
			
		||||
@@ -136,6 +138,15 @@ func (l *Logger) Warning(format string, v ...interface{}) {
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Log error variable as a warning
 | 
			
		||||
func (l *Logger) WarnErr(err error) error {
 | 
			
		||||
	if l.level >= LEVEL_WARNING {
 | 
			
		||||
		logWithLongFile(l.warninglog, "%v", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return err
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Log string
 | 
			
		||||
func (l *Logger) Info(format string, v ...interface{}) {
 | 
			
		||||
	if l.level >= LEVEL_INFO {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user