fix(logagent): use get to download log file

k8ssphere · Sep 10, 2020 · d7b2b86 · d7b2b86
1 parent 47ab08f
commit d7b2b86
Show file tree

Hide file tree

Showing 15 changed files with 243 additions and 725 deletions.
diff --git a/api/logagent/register.go b/api/logagent/register.go
@@ -65,7 +65,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
  &LogAgentProxyOptions{},
  &LogFileTree{},
  &LogFileContent{},
- &LogFileDownload{},
+ &LogFileProxyOptions{},
  &ConfigMap{},
  &ConfigMapList{},
  )

diff --git a/api/logagent/types.go b/api/logagent/types.go
@@ -152,26 +152,19 @@ type LogFileContentSpec struct {
  Filepath string `json:"filepath,omitempty"`
 }
 
-
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// LogFileDownload
-type LogFileDownload struct {
+// LogFileProxyOptions is the query options to a kube-apiserver proxy call for Logfile requests.
+type LogFileProxyOptions struct {
  metav1.TypeMeta `json:",inline"`
- Spec LogFileDownloadSpec `json:"spec"`
-}
 
-type LogFileDownloadSpec struct {
- ClusterId string `json:"clusterId,omitempty"`
  Namespace string `json:"namespace,omitempty"`
- Container string `json:"container,omitempty"`
  Pod string `json:"pod,omitempty"`
- Start int32 `json:"start,omitempty"`
- Length int32 `json:"length,omitempty"`
- Filepath string `json:"filepath,omitempty"`
+ Container string `json:"container,omitempty"`
 }
 
+
+
 // +genclient
 // +genclient:nonNamespaced
 // +genclient:skipVerbs=deleteCollection

diff --git a/api/logagent/v1/generated.pb.go b/api/logagent/v1/generated.pb.go
diff --git a/api/logagent/v1/generated.proto b/api/logagent/v1/generated.proto
diff --git a/api/logagent/v1/register.go b/api/logagent/v1/register.go
@@ -53,7 +53,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
  &LogAgentProxyOptions{},
  &LogFileTree{},
  &LogFileContent{},
- &LogFileDownload{},
+ &LogFileProxyOptions{},
  &ConfigMap{},
  &ConfigMapList{},
  )

diff --git a/api/logagent/v1/types.go b/api/logagent/v1/types.go
@@ -141,20 +141,13 @@ type LogFileContentSpec struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// LogFileDownload
-type LogFileDownload struct {
+// LogFileProxyOptions is the query options to a kube-apiserver proxy call for LogFile requests.
+type LogFileProxyOptions struct {
  metav1.TypeMeta `json:",inline"`
- Spec LogFileDownloadSpec `json:"spec" protobuf:"bytes,2,opt,name=spec"`
-}
 
-type LogFileDownloadSpec struct {
- ClusterId string `json:"clusterId,omitempty" protobuf:"bytes,1,opt,name=clusterId"`
- Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
+ Namespace string `json:"namespace,omitempty" protobuf:"bytes,1,opt,name=namespace"`
+ Pod string `json:"pod,omitempty" protobuf:"bytes,2,opt,name=pod"`
  Container string `json:"container,omitempty" protobuf:"bytes,3,opt,name=container"`
- Pod string `json:"pod,omitempty" protobuf:"bytes,4,opt,name=pod"`
- Start int32 `json:"start,omitempty" protobuf:"varint,5,opt,name=start"`
- Length int32 `json:"length,omitempty" protobuf:"varint,6,opt,name=length"`
- Filepath string `json:"filepath,omitempty" protobuf:"bytes,7,opt,name=filepath"`
 }
 
 // +genclient

diff --git a/api/logagent/v1/types_swagger_doc_generated.go b/api/logagent/v1/types_swagger_doc_generated.go
diff --git a/api/logagent/v1/zz_generated.conversion.go b/api/logagent/v1/zz_generated.conversion.go
diff --git a/api/logagent/v1/zz_generated.deepcopy.go b/api/logagent/v1/zz_generated.deepcopy.go
diff --git a/api/logagent/zz_generated.deepcopy.go b/api/logagent/zz_generated.deepcopy.go