admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies

Browse Source 
Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-12-22 16:48:26 +08:00
parent 4a11a50544
commit fe6c5de00f
2857 changed files with 252134 additions and 115656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/models/devops/devops.go
View File

@@ -18,6 +18,7 @@ package devops
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
@@ -176,7 +177,7 @@ func (d devopsOperator) CreateDevOpsProject(workspace string, project *v1alpha3.
project.Labels[tenantv1alpha1.WorkspaceLabel] = workspace
project.Annotations[devopsv1alpha3.DevOpeProjectSyncStatusAnnoKey] = StatusPending
project.Annotations[devopsv1alpha3.DevOpeProjectSyncTimeAnnoKey] = GetSyncNowTime()
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Create(project)
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Create(context.Background(), project, metav1.CreateOptions{})
}
func (d devopsOperator) GetDevOpsProject(workspace string, projectName string) (*v1alpha3.DevOpsProject, error) {
@@ -184,7 +185,7 @@ func (d devopsOperator) GetDevOpsProject(workspace string, projectName string) (
}
func (d devopsOperator) DeleteDevOpsProject(workspace string, projectName string) error {
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Delete(projectName, metav1.NewDeleteOptions(0))
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Delete(context.Background(), projectName, *metav1.NewDeleteOptions(0))
}
func (d devopsOperator) UpdateDevOpsProject(workspace string, project *v1alpha3.DevOpsProject) (*v1alpha3.DevOpsProject, error) {
@@ -194,7 +195,7 @@ func (d devopsOperator) UpdateDevOpsProject(workspace string, project *v1alpha3.
project.Labels[tenantv1alpha1.WorkspaceLabel] = workspace
project.Annotations[devopsv1alpha3.DevOpeProjectSyncStatusAnnoKey] = StatusPending
project.Annotations[devopsv1alpha3.DevOpeProjectSyncTimeAnnoKey] = GetSyncNowTime()
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Update(project)
return d.ksclient.DevopsV1alpha3().DevOpsProjects().Update(context.Background(), project, metav1.UpdateOptions{})
}
func (d devopsOperator) ListDevOpsProject(workspace string, limit, offset int) (api.ListResult, error) {
@@ -226,7 +227,7 @@ func (d devopsOperator) CreatePipelineObj(projectName string, pipeline *v1alpha3
}
projectObj.Annotations[devopsv1alpha3.PipelineSyncStatusAnnoKey] = StatusPending
projectObj.Annotations[devopsv1alpha3.PipelineSyncTimeAnnoKey] = GetSyncNowTime()
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Create(pipeline)
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Create(context.Background(), pipeline, metav1.CreateOptions{})
}
func (d devopsOperator) GetPipelineObj(projectName string, pipelineName string) (*v1alpha3.Pipeline, error) {
@@ -242,7 +243,7 @@ func (d devopsOperator) DeletePipelineObj(projectName string, pipelineName strin
if err != nil {
return err
}
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Delete(pipelineName, metav1.NewDeleteOptions(0))
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Delete(context.Background(), pipelineName, *metav1.NewDeleteOptions(0))
}
func (d devopsOperator) UpdatePipelineObj(projectName string, pipeline *v1alpha3.Pipeline) (*v1alpha3.Pipeline, error) {
@@ -252,7 +253,7 @@ func (d devopsOperator) UpdatePipelineObj(projectName string, pipeline *v1alpha3
}
projectObj.Annotations[devopsv1alpha3.PipelineSyncStatusAnnoKey] = StatusPending
projectObj.Annotations[devopsv1alpha3.PipelineSyncTimeAnnoKey] = GetSyncNowTime()
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Update(pipeline)
return d.ksclient.DevopsV1alpha3().Pipelines(projectObj.Status.AdminNamespace).Update(context.Background(), pipeline, metav1.UpdateOptions{})
}
func (d devopsOperator) ListPipelineObj(projectName string, sortFunc func([]*v1alpha3.Pipeline, int, int) bool, limit, offset int) (api.ListResult, error) {
@@ -297,7 +298,7 @@ func (d devopsOperator) CreateCredentialObj(projectName string, secret *v1.Secre
secret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey] = "true"
secret.Annotations[devopsv1alpha3.CredentialSyncStatusAnnoKey] = StatusPending
secret.Annotations[devopsv1alpha3.CredentialSyncTimeAnnoKey] = GetSyncNowTime()
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Create(secret)
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Create(context.Background(), secret, metav1.CreateOptions{})
}
func (d devopsOperator) GetCredentialObj(projectName string, secretName string) (*v1.Secret, error) {
@@ -313,7 +314,7 @@ func (d devopsOperator) DeleteCredentialObj(projectName string, secret string) e
if err != nil {
return err
}
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Delete(secret, metav1.NewDeleteOptions(0))
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Delete(context.Background(), secret, *metav1.NewDeleteOptions(0))
}
func (d devopsOperator) UpdateCredentialObj(projectName string, secret *v1.Secret) (*v1.Secret, error) {
@@ -324,7 +325,7 @@ func (d devopsOperator) UpdateCredentialObj(projectName string, secret *v1.Secre
secret.Annotations[devopsv1alpha3.CredentialAutoSyncAnnoKey] = "true"
secret.Annotations[devopsv1alpha3.CredentialSyncStatusAnnoKey] = StatusPending
secret.Annotations[devopsv1alpha3.CredentialSyncTimeAnnoKey] = GetSyncNowTime()
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Update(secret)
return d.k8sclient.CoreV1().Secrets(projectObj.Status.AdminNamespace).Update(context.Background(), secret, metav1.UpdateOptions{})
}
func (d devopsOperator) ListCredentialObj(projectName string, query *query.Query) (api.ListResult, error) {

9
pkg/models/devops/s2ibinary_handler.go
View File

@@ -18,6 +18,7 @@ package devops
import (
"code.cloudfoundry.org/bytefmt"
"context"
"fmt"
"github.com/aws/aws-sdk-go/aws/awserr"
awsS3 "github.com/aws/aws-sdk-go/service/s3"
@@ -128,7 +129,7 @@ func (s *s2iBinaryUploader) UploadS2iBinary(namespace, name, md5 string, fileHea
copy.Spec.UploadTimeStamp = new(metav1.Time)
}
*copy.Spec.UploadTimeStamp = metav1.Now()
copy, err = s.client.DevopsV1alpha1().S2iBinaries(namespace).Update(copy)
copy, err = s.client.DevopsV1alpha1().S2iBinaries(namespace).Update(context.Background(), copy, metav1.UpdateOptions{})
if err != nil {
klog.Error(err)
return nil, err
@@ -167,7 +168,7 @@ func (s *s2iBinaryUploader) DownloadS2iBinary(namespace, name, fileName string)
func (s *s2iBinaryUploader) SetS2iBinaryStatus(s2ibin *v1alpha1.S2iBinary, status string) (*v1alpha1.S2iBinary, error) {
copy := s2ibin.DeepCopy()
copy.Status.Phase = status
copy, err := s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Update(copy)
copy, err := s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Update(context.Background(), copy, metav1.UpdateOptions{})
if err != nil {
klog.Error(err)
return nil, err
@@ -180,13 +181,13 @@ func (s *s2iBinaryUploader) SetS2iBinaryStatusWithRetry(s2ibin *v1alpha1.S2iBina
var bin *v1alpha1.S2iBinary
var err error
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
bin, err = s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Get(s2ibin.Name, metav1.GetOptions{})
bin, err = s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Get(context.Background(), s2ibin.Name, metav1.GetOptions{})
if err != nil {
klog.Error(err)
return err
}
bin.Status.Phase = status
bin, err = s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Update(bin)
bin, err = s.client.DevopsV1alpha1().S2iBinaries(s2ibin.Namespace).Update(context.Background(), bin, metav1.UpdateOptions{})
if err != nil {
klog.Error(err)
return err