未验证 提交 91bca3cf 编写于 作者: R runzexia

fix comment

Signed-off-by: Nrunzexia <runzexia@yunify.com>
上级 3156362f
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"github.com/emicklei/go-restful-openapi" "github.com/emicklei/go-restful-openapi"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
v1alpha1devops "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1" devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1"
devopsapi "kubesphere.io/kubesphere/pkg/apiserver/devops" devopsapi "kubesphere.io/kubesphere/pkg/apiserver/devops"
"kubesphere.io/kubesphere/pkg/apiserver/runtime" "kubesphere.io/kubesphere/pkg/apiserver/runtime"
"kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/constants"
...@@ -622,7 +622,7 @@ The last one is encrypted info, such as the password of the username-password ty ...@@ -622,7 +622,7 @@ The last one is encrypted info, such as the password of the username-password ty
Param(webservice.PathParameter("s2ibinary", "the name of s2ibinary")). Param(webservice.PathParameter("s2ibinary", "the name of s2ibinary")).
Param(webservice.FormParameter("s2ibinary", "file to upload")). Param(webservice.FormParameter("s2ibinary", "file to upload")).
Param(webservice.FormParameter("md5", "md5 of file")). Param(webservice.FormParameter("md5", "md5 of file")).
Returns(http.StatusOK, RespOK, v1alpha1devops.S2iBinary{})) Returns(http.StatusOK, RespOK, devopsv1alpha1.S2iBinary{}))
webservice.Route(webservice.GET("/namespaces/{namespace}/s2ibinaries/{s2ibinary}/file/{file}"). webservice.Route(webservice.GET("/namespaces/{namespace}/s2ibinaries/{s2ibinary}/file/{file}").
To(devopsapi.DownloadS2iBinary). To(devopsapi.DownloadS2iBinary).
...@@ -630,6 +630,7 @@ The last one is encrypted info, such as the password of the username-password ty ...@@ -630,6 +630,7 @@ The last one is encrypted info, such as the password of the username-password ty
Doc("Download S2iBinary file"). Doc("Download S2iBinary file").
Param(webservice.PathParameter("namespace", "the name of namespaces")). Param(webservice.PathParameter("namespace", "the name of namespaces")).
Param(webservice.PathParameter("s2ibinary", "the name of s2ibinary")). Param(webservice.PathParameter("s2ibinary", "the name of s2ibinary")).
Param(webservice.PathParameter("file","the name of binary file")).
Returns(http.StatusOK, RespOK, nil)) Returns(http.StatusOK, RespOK, nil))
// TODO are not used in this version. will be added in 2.1.0 // TODO are not used in this version. will be added in 2.1.0
......
...@@ -119,7 +119,7 @@ func (c *S2iBinaryController) processNextWorkItem() bool { ...@@ -119,7 +119,7 @@ func (c *S2iBinaryController) processNextWorkItem() bool {
return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error()) return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error())
} }
c.workqueue.Forget(obj) c.workqueue.Forget(obj)
klog.Infof("Successfully synced '%s'", key) klog.V(5).Infof("Successfully synced '%s'", key)
return nil return nil
}(obj) }(obj)
...@@ -191,7 +191,7 @@ func (c *S2iBinaryController) syncHandler(key string) error { ...@@ -191,7 +191,7 @@ func (c *S2iBinaryController) syncHandler(key string) error {
} else { } else {
if sliceutil.HasString(s2ibin.ObjectMeta.Finalizers, devopsv1alpha1.S2iBinaryFinalizerName) { if sliceutil.HasString(s2ibin.ObjectMeta.Finalizers, devopsv1alpha1.S2iBinaryFinalizerName) {
if err := c.DeleteBinaryInS3(s2ibin); err != nil { if err := c.deleteBinaryInS3(s2ibin); err != nil {
klog.Error(err, fmt.Sprintf("failed to delete resource %s in s3", key)) klog.Error(err, fmt.Sprintf("failed to delete resource %s in s3", key))
return err return err
} }
...@@ -209,7 +209,7 @@ func (c *S2iBinaryController) syncHandler(key string) error { ...@@ -209,7 +209,7 @@ func (c *S2iBinaryController) syncHandler(key string) error {
return nil return nil
} }
func (c *S2iBinaryController) DeleteBinaryInS3(s2ibin *devopsv1alpha1.S2iBinary) error { func (c *S2iBinaryController) deleteBinaryInS3(s2ibin *devopsv1alpha1.S2iBinary) error {
s3client := s2is3.Client() s3client := s2is3.Client()
input := &s3.DeleteObjectInput{ input := &s3.DeleteObjectInput{
Bucket: s2is3.Bucket(), Bucket: s2is3.Bucket(),
......
...@@ -126,7 +126,7 @@ func (c *S2iRunController) processNextWorkItem() bool { ...@@ -126,7 +126,7 @@ func (c *S2iRunController) processNextWorkItem() bool {
return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error()) return fmt.Errorf("error syncing '%s': %s, requeuing", key, err.Error())
} }
c.workqueue.Forget(obj) c.workqueue.Forget(obj)
klog.Infof("Successfully synced '%s'", key) klog.V(5).Infof("Successfully synced '%s'", key)
return nil return nil
}(obj) }(obj)
......
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
) )
const ( const (
GetS2iBinaryURL = "http://ks-apiserver.kubesphere-system.svc/kapis/devops.kubesphere.io/v1alpha2/namespaces/%s/s2ibinaries/%s/file/%s" GetS2iBinaryURL = "kapis/devops.kubesphere.io/v1alpha2/namespaces/%s/s2ibinaries/%s/file/%s"
) )
func UploadS2iBinary(namespace, name, md5 string, fileHeader *multipart.FileHeader) (*v1alpha1.S2iBinary, error) { func UploadS2iBinary(namespace, name, md5 string, fileHeader *multipart.FileHeader) (*v1alpha1.S2iBinary, error) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册