From a9f25712ebc6f248f466c6b44b54c3301f7bf413 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Sun, 7 Apr 2024 15:59:53 +0800 Subject: [PATCH] [ Cmii ] [ Octopus ] - Image Function fix bugs --- agent-go/a_executor/ImageFunction.go | 22 +- agent-go/a_executor/K8sFunction.go | 708 +++++++++--------- agent-go/a_init/AgentInitialization.go | 92 ++- agent-go/g/global.go | 5 +- agent-go/go.mod | 26 +- agent-go/go.sum | 76 +- agent-go/shell/update-app-tag.sh | 25 + .../func/auto/service/ImageFuncScheduler.java | 4 +- .../java/io/wdd/rpc/config/RedisConfig.java | 16 + .../io/wdd/rpc/config/RedisConfiguration.java | 2 + .../rpc/message/handler/OMessageHandler.java | 6 +- .../message/sender/OMessageToAgentSender.java | 10 +- server/src/main/resources/application.yml | 1 - .../server/func/TestImageSyncScheduler.java | 9 +- 14 files changed, 492 insertions(+), 510 deletions(-) create mode 100644 agent-go/shell/update-app-tag.sh create mode 100644 server/src/main/java/io/wdd/rpc/config/RedisConfig.java diff --git a/agent-go/a_executor/ImageFunction.go b/agent-go/a_executor/ImageFunction.go index c92a6ef..0a34325 100644 --- a/agent-go/a_executor/ImageFunction.go +++ b/agent-go/a_executor/ImageFunction.go @@ -270,6 +270,7 @@ func (op *AgentOsOperator) pushImageToTargetHarbor(funcArgs []string) (bool, []s func (op *AgentOsOperator) updateImageTag(funcArgs []string) (bool, []string) { namespace := funcArgs[6] targetImageFullName := funcArgs[7] + proxyUrl := funcArgs[4] if !BasicCommandExistByPath("kubectl") { return false, []string{ "kubectl not exits !", @@ -281,9 +282,28 @@ func (op *AgentOsOperator) updateImageTag(funcArgs []string) (bool, []string) { "cant update this image !", } } - appName := image.ImageFullNameToAppName(imageFullName) + // 2024年4月7日 修改为 exec file的模式 + folderPrefix := "/root/wdd/update/" + BasicCreateFolder(folderPrefix) + + updateFileName := "update-app-tag.sh" + if !BasicFileExistAndNotNull(folderPrefix + updateFileName) { + // kubectl update tag file not exits! + var download bool + var downloadLog []string + if proxyUrl == "" { + download, downloadLog = BasicDownloadFile(AgentOsOperatorCache.OssOfflinePrefix+updateFileName, folderPrefix+updateFileName) + } else { + download, downloadLog = BasicDownloadFileWithProxy(AgentOsOperatorCache.OssOfflinePrefix+updateFileName, proxyUrl, folderPrefix+updateFileName) + } + + if !download { + return false, downloadLog + } + } + updateCommand := "kubectl -n " + namespace + " patch deployment " + appName + "-p \"{\"spec\":{\"template\":{\"spec\":{\"containers\":[{\"name\": " + appName + ",\"image\": " + targetImageFullName + "}]}}}}" executor, i := HardCodeCommandExecutor(updateCommand) if !executor { diff --git a/agent-go/a_executor/K8sFunction.go b/agent-go/a_executor/K8sFunction.go index 14dc749..4b4e12d 100644 --- a/agent-go/a_executor/K8sFunction.go +++ b/agent-go/a_executor/K8sFunction.go @@ -1,365 +1,349 @@ package a_executor -import ( - "fmt" - "k8s.io/apimachinery/pkg/api/errors" - "os" - "strings" - "sync" - "time" +//var k8sConfigFilePath = "/root/wdd/kube_config_cluster.yml" +//var k8sClient = newK8sClientInstance() - "context" - - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/clientcmd" -) - -var k8sConfigFilePath = "/root/wdd/kube_config_cluster.yml" -var k8sClient = newK8sClientInstance() - -func newK8sClientInstance() *kubernetes.Clientset { - once := sync.Once{} - - if !BasicFileExistAndNotNull(k8sConfigFilePath) { - log.WarnF("[newK8sClientInstance] - k8s config %s does not exist ! ", k8sConfigFilePath) - return nil - } - - var client *kubernetes.Clientset - once.Do(func() { - // 使用kubeconfig文件初始化客户端 - config, err := clientcmd.BuildConfigFromFlags("", k8sConfigFilePath) - if err != nil { - log.ErrorF("[newK8sClientInstance] - load from %s error !", k8sConfigFilePath) - - } - - client, err = kubernetes.NewForConfig(config) - if err != nil { - log.Error("[newK8sClientInstance] - create k8s client error !") - } - }) - - return client -} - -func K8sCheckPodStatusTimeout(specificPod string, supreme string, waitTimeOut int) bool { - - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false - } - } - - // 设置超时时间和时间间隔 - timeout := time.After(time.Duration(waitTimeOut) * time.Second) - tick := time.Tick(5 * time.Second) - - // 监控Pod状态 - for { - select { - case <-timeout: - log.ErrorF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: 失败!", supreme, specificPod) - return false - case <-tick: - pod, err := k8sClient.CoreV1().Pods(supreme).Get(context.TODO(), specificPod, metav1.GetOptions{}) - if err != nil { - log.ErrorF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 获取Pod信息失败 ！", supreme, err.Error()) - } else { - log.DebugF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: [%s]", supreme, pod.Name, pod.Status.Phase) - if pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded { - return true - } - } - } - } -} - -func K8sCheckDeploymentStatusTimeout(specificDeployment string, supreme string, waitTimeOut int) bool { - - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false - } - } - - // 设置超时时间和时间间隔 - timeout := time.After(time.Duration(waitTimeOut) * time.Second) - tick := time.Tick(5 * time.Second) - - // 监控Pod状态 - for { - select { - case <-timeout: - log.ErrorF("[K8sCheckDeploymentStatusTimeout] - 命名空间: %s, Deployment名称: %s, 状态: 失败!\n", supreme, specificDeployment) - return false - case <-tick: - deployment, err := k8sClient.AppsV1().Deployments(supreme).Get(context.TODO(), specificDeployment, metav1.GetOptions{}) - if err != nil { - log.ErrorF("[K8sCheckDeploymentStatusTimeout] - 命名空间: [%s], Deployment 名称: [%s], 获取Deployment信息失败 ！", supreme, err.Error()) - } else { - log.DebugF("[K8sCheckDeploymentStatusTimeout] - 命名空间: [ %s ], Deployment: [ %s ] 还有Pods未处于Running状态 (Ready: %d, Total: %d)\n", supreme, deployment.Name, deployment.Status.ReadyReplicas, deployment.Status.Replicas) - - if deployment.Status.ReadyReplicas == deployment.Status.Replicas { - return true - } - - } - } - } -} - -func K8sListPVCInNamespace(supreme string) (bool, []string) { - - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false, []string{ - "[K8sListPVCInNamespace] - k8s client not exits !", - } - } - } - - pvcs, err := k8sClient.CoreV1().PersistentVolumeClaims(supreme).List(context.TODO(), metav1.ListOptions{}) - if err != nil { - log.ErrorF("[K8sListPVCInNamespace] - error list pvc list in namespace %s", supreme) - return false, nil - } - - var pvcList []string - for _, pvc := range pvcs.Items { - pvcList = append(pvcList, pvc.Name) - } - - log.DebugF("K8sListPVCInNamespace - all pvc in namespace of [ %s ] are %v", supreme, pvcList) - return true, pvcList -} - -func K8sCheckPVCStatusTimeOut(specificPvcName string, supreme string, waitTimeOut int) bool { - - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false - } - } - - // 设置超时时间和时间间隔 - timeout := time.After(time.Duration(waitTimeOut) * time.Second) - tick := time.Tick(5 * time.Second) - - // 监控Pod状态 - for { - select { - case <-timeout: - log.ErrorF("[K8sCheckPVCStatusTimeOut] - 命名空间: %s, PVC 名称: %s, 状态: 失败! ", supreme, specificPvcName) - return false - case <-tick: - pvc, err := k8sClient.CoreV1().PersistentVolumeClaims(supreme).Get(context.TODO(), specificPvcName, metav1.GetOptions{}) - if err != nil { - log.ErrorF("[K8sCheckPVCStatusTimeOut] - 命名空间: [ %s ], 获取 PVC [%s] 信息失败: %s ", supreme, specificPvcName, err.Error()) - } - - if pvc.Status.Phase == corev1.ClaimBound { - log.DebugF("[K8sCheckPVCStatusTimeOut] - PVC %s in namespace %s is running", specificPvcName, supreme) - return true - } else { - log.WarnF("[K8sCheckPVCStatusTimeOut] - PVC %s in namespace %s run failed !", specificPvcName, supreme) - return false - } - } - } -} - -func KubectlCheckPodStatus(specific string, supreme string) bool { - - if !BasicCommandExists("kubectl") { - log.Error("kubectl命令不存在，无法查看Pod状态，请查看！") - } - - ok, resultLog := AllCommandExecutor([]string{ - "kubectl", "-n", supreme, "get", "pod", specific, "-o", "jsonpath='{.status.phase}'", - }) - if !ok { - return false - } - - for _, resultLine := range resultLog { - if strings.HasPrefix(resultLine, "Running") { - return true - } - } - - return false -} - -func KubectlApplyExec(resourcesYamlFile string) (bool, []string) { - - // check kubectl - if !BasicCommandExistByPath("kubectl") { - return false, []string{ - "[KubectlApplyExec] - kubectl command not exist !", - } - } - - // check resourcesYamlFile - if !BasicFileExistAndNotNull(resourcesYamlFile) { - return false, []string{ - fmt.Sprintf("[KubectlApplyExec] - wrong resourcesYamlFile %s not exist !", resourcesYamlFile), - } - } - - // apply -f - ok, resultLog := AllCommandExecutor([]string{ - "/usr/local/bin/kubectl", - "apply", - "-f", - resourcesYamlFile, - }) - if !ok { - return false, resultLog - } - - return true, append(resultLog, - fmt.Sprintf("[KubectlApplyExec] - %s apply success!", resourcesYamlFile)) -} - -func KubectlDeleteExec(resourcesYamlFile string) (bool, []string) { - - // check kubectl - if !BasicCommandExistByPath("kubectl") { - return false, []string{ - "[KubectlDeleteExec] - kubectl command not exist !", - } - } - - // check resourcesYamlFile - if !BasicFileExistAndNotNull(resourcesYamlFile) { - return false, []string{ - fmt.Sprintf("[KubectlDeleteExec] - wrong resourcesYamlFile %s not exist !", resourcesYamlFile), - } - } - - // apply -f - ok, resultLog := AllCommandExecutor([]string{ - "/usr/local/bin/kubectl", - "delete", - "-f", - resourcesYamlFile, - }) - if !ok { - return false, resultLog - } - - return true, append(resultLog, - fmt.Sprintf("[KubectlDeleteExec] - %s delete success!", resourcesYamlFile)) -} - -func K8sCreateNamespace(namespaceName string) bool { - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false - } - } - - namespace, err := k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) - if err == nil { - log.InfoF("[K8sCreateNamespace] - namespace of [%s] already exists!", namespaceName) - return true - } - - // create namespace - // 创建命名空间对象 - namespace = &corev1.Namespace{ - ObjectMeta: metav1.ObjectMeta{ - Name: namespaceName, - }, - } - // 使用客户端创建命名空间 - namespace, err = k8sClient.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{}) - if err != nil { - log.ErrorF("Error getting namespace: %s ", err.Error()) - return false - } - - // check namespace exists - // 尝试获取名为 "xxg" 的命名空间 - namespace, err = k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) - // 如果返回错误，需要判断是因为命名空间不存在还是其他错误 - if err != nil { - if errors.IsNotFound(err) { - log.ErrorF("Namespace %s cant be got !", namespaceName) - return false - } else { - log.ErrorF("Error retrieving namespace: %s\n", err.Error()) - } - return false - } - - log.DebugF("Namespace %s create successful !", namespaceName) - return true -} - -func K8sGetDashBoardAuthKey() bool { - - if k8sClient == nil { - // this should be the first call of k8s function - k8sClient = newK8sClientInstance() - if k8sClient == nil { - log.ErrorF("k8s client is nil, run k8s function error !") - return false - } - } - - // 获取 kube-system 命名空间的 secrets 列表 - secrets, err := k8sClient.CoreV1().Secrets("kube-system").List(context.TODO(), metav1.ListOptions{}) - if err != nil { - fmt.Printf("Error retrieving secrets from kube-system namespace: %s\n", err.Error()) - os.Exit(1) - } - - // 过滤出名为 admin-user 的 secret - var adminUserSecretName string - for _, secret := range secrets.Items { - if strings.Contains(secret.Name, "admin-user") { - adminUserSecretName = secret.Name - break - } - } - - if adminUserSecretName == "" { - fmt.Println("No admin-user secret found") - os.Exit(1) - } - - // 获取并打印特定的 secret 描述信息 - secret, err := k8sClient.CoreV1().Secrets("kube-system").Get(context.TODO(), adminUserSecretName, metav1.GetOptions{}) - if err != nil { - fmt.Printf("Error retrieving secret %s: %s\n", adminUserSecretName, err.Error()) - os.Exit(1) - } - - // 打印 secret 的详细信息，根据需要格式化输出 - fmt.Printf("Name: %s\nNamespace: %s\nData:\n", secret.Name, secret.Namespace) - for key, value := range secret.Data { - fmt.Printf("%s: %s\n", key, value) - } - - return false - -} +//func newK8sClientInstance() *kubernetes.Clientset { +// once := sync.Once{} +// +// if !BasicFileExistAndNotNull(k8sConfigFilePath) { +// log.WarnF("[newK8sClientInstance] - k8s config %s does not exist ! ", k8sConfigFilePath) +// return nil +// } +// +// var client *kubernetes.Clientset +// once.Do(func() { +// // 使用kubeconfig文件初始化客户端 +// config, err := clientcmd.BuildConfigFromFlags("", k8sConfigFilePath) +// if err != nil { +// log.ErrorF("[newK8sClientInstance] - load from %s error !", k8sConfigFilePath) +// +// } +// +// client, err = kubernetes.NewForConfig(config) +// if err != nil { +// log.Error("[newK8sClientInstance] - create k8s client error !") +// } +// }) +// +// return client +//} +// +//func K8sCheckPodStatusTimeout(specificPod string, supreme string, waitTimeOut int) bool { +// +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false +// } +// } +// +// // 设置超时时间和时间间隔 +// timeout := time.After(time.Duration(waitTimeOut) * time.Second) +// tick := time.Tick(5 * time.Second) +// +// // 监控Pod状态 +// for { +// select { +// case <-timeout: +// log.ErrorF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: 失败!", supreme, specificPod) +// return false +// case <-tick: +// pod, err := k8sClient.CoreV1().Pods(supreme).Get(context.TODO(), specificPod, metav1.GetOptions{}) +// if err != nil { +// log.ErrorF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 获取Pod信息失败 ！", supreme, err.Error()) +// } else { +// log.DebugF("[K8sCheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: [%s]", supreme, pod.Name, pod.Status.Phase) +// if pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded { +// return true +// } +// } +// } +// } +//} +// +//func K8sCheckDeploymentStatusTimeout(specificDeployment string, supreme string, waitTimeOut int) bool { +// +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false +// } +// } +// +// // 设置超时时间和时间间隔 +// timeout := time.After(time.Duration(waitTimeOut) * time.Second) +// tick := time.Tick(5 * time.Second) +// +// // 监控Pod状态 +// for { +// select { +// case <-timeout: +// log.ErrorF("[K8sCheckDeploymentStatusTimeout] - 命名空间: %s, Deployment名称: %s, 状态: 失败!\n", supreme, specificDeployment) +// return false +// case <-tick: +// deployment, err := k8sClient.AppsV1().Deployments(supreme).Get(context.TODO(), specificDeployment, metav1.GetOptions{}) +// if err != nil { +// log.ErrorF("[K8sCheckDeploymentStatusTimeout] - 命名空间: [%s], Deployment 名称: [%s], 获取Deployment信息失败 ！", supreme, err.Error()) +// } else { +// log.DebugF("[K8sCheckDeploymentStatusTimeout] - 命名空间: [ %s ], Deployment: [ %s ] 还有Pods未处于Running状态 (Ready: %d, Total: %d)\n", supreme, deployment.Name, deployment.Status.ReadyReplicas, deployment.Status.Replicas) +// +// if deployment.Status.ReadyReplicas == deployment.Status.Replicas { +// return true +// } +// +// } +// } +// } +//} +// +//func K8sListPVCInNamespace(supreme string) (bool, []string) { +// +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false, []string{ +// "[K8sListPVCInNamespace] - k8s client not exits !", +// } +// } +// } +// +// pvcs, err := k8sClient.CoreV1().PersistentVolumeClaims(supreme).List(context.TODO(), metav1.ListOptions{}) +// if err != nil { +// log.ErrorF("[K8sListPVCInNamespace] - error list pvc list in namespace %s", supreme) +// return false, nil +// } +// +// var pvcList []string +// for _, pvc := range pvcs.Items { +// pvcList = append(pvcList, pvc.Name) +// } +// +// log.DebugF("K8sListPVCInNamespace - all pvc in namespace of [ %s ] are %v", supreme, pvcList) +// return true, pvcList +//} +// +//func K8sCheckPVCStatusTimeOut(specificPvcName string, supreme string, waitTimeOut int) bool { +// +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false +// } +// } +// +// // 设置超时时间和时间间隔 +// timeout := time.After(time.Duration(waitTimeOut) * time.Second) +// tick := time.Tick(5 * time.Second) +// +// // 监控Pod状态 +// for { +// select { +// case <-timeout: +// log.ErrorF("[K8sCheckPVCStatusTimeOut] - 命名空间: %s, PVC 名称: %s, 状态: 失败! ", supreme, specificPvcName) +// return false +// case <-tick: +// pvc, err := k8sClient.CoreV1().PersistentVolumeClaims(supreme).Get(context.TODO(), specificPvcName, metav1.GetOptions{}) +// if err != nil { +// log.ErrorF("[K8sCheckPVCStatusTimeOut] - 命名空间: [ %s ], 获取 PVC [%s] 信息失败: %s ", supreme, specificPvcName, err.Error()) +// } +// +// if pvc.Status.Phase == corev1.ClaimBound { +// log.DebugF("[K8sCheckPVCStatusTimeOut] - PVC %s in namespace %s is running", specificPvcName, supreme) +// return true +// } else { +// log.WarnF("[K8sCheckPVCStatusTimeOut] - PVC %s in namespace %s run failed !", specificPvcName, supreme) +// return false +// } +// } +// } +//} +// +//func KubectlCheckPodStatus(specific string, supreme string) bool { +// +// if !BasicCommandExists("kubectl") { +// log.Error("kubectl命令不存在，无法查看Pod状态，请查看！") +// } +// +// ok, resultLog := AllCommandExecutor([]string{ +// "kubectl", "-n", supreme, "get", "pod", specific, "-o", "jsonpath='{.status.phase}'", +// }) +// if !ok { +// return false +// } +// +// for _, resultLine := range resultLog { +// if strings.HasPrefix(resultLine, "Running") { +// return true +// } +// } +// +// return false +//} +// +//func KubectlApplyExec(resourcesYamlFile string) (bool, []string) { +// +// // check kubectl +// if !BasicCommandExistByPath("kubectl") { +// return false, []string{ +// "[KubectlApplyExec] - kubectl command not exist !", +// } +// } +// +// // check resourcesYamlFile +// if !BasicFileExistAndNotNull(resourcesYamlFile) { +// return false, []string{ +// fmt.Sprintf("[KubectlApplyExec] - wrong resourcesYamlFile %s not exist !", resourcesYamlFile), +// } +// } +// +// // apply -f +// ok, resultLog := AllCommandExecutor([]string{ +// "/usr/local/bin/kubectl", +// "apply", +// "-f", +// resourcesYamlFile, +// }) +// if !ok { +// return false, resultLog +// } +// +// return true, append(resultLog, +// fmt.Sprintf("[KubectlApplyExec] - %s apply success!", resourcesYamlFile)) +//} +// +//func KubectlDeleteExec(resourcesYamlFile string) (bool, []string) { +// +// // check kubectl +// if !BasicCommandExistByPath("kubectl") { +// return false, []string{ +// "[KubectlDeleteExec] - kubectl command not exist !", +// } +// } +// +// // check resourcesYamlFile +// if !BasicFileExistAndNotNull(resourcesYamlFile) { +// return false, []string{ +// fmt.Sprintf("[KubectlDeleteExec] - wrong resourcesYamlFile %s not exist !", resourcesYamlFile), +// } +// } +// +// // apply -f +// ok, resultLog := AllCommandExecutor([]string{ +// "/usr/local/bin/kubectl", +// "delete", +// "-f", +// resourcesYamlFile, +// }) +// if !ok { +// return false, resultLog +// } +// +// return true, append(resultLog, +// fmt.Sprintf("[KubectlDeleteExec] - %s delete success!", resourcesYamlFile)) +//} +// +//func K8sCreateNamespace(namespaceName string) bool { +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false +// } +// } +// +// namespace, err := k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) +// if err == nil { +// log.InfoF("[K8sCreateNamespace] - namespace of [%s] already exists!", namespaceName) +// return true +// } +// +// // create namespace +// // 创建命名空间对象 +// namespace = &corev1.Namespace{ +// ObjectMeta: metav1.ObjectMeta{ +// Name: namespaceName, +// }, +// } +// // 使用客户端创建命名空间 +// namespace, err = k8sClient.CoreV1().Namespaces().Create(context.TODO(), namespace, metav1.CreateOptions{}) +// if err != nil { +// log.ErrorF("Error getting namespace: %s ", err.Error()) +// return false +// } +// +// // check namespace exists +// // 尝试获取名为 "xxg" 的命名空间 +// namespace, err = k8sClient.CoreV1().Namespaces().Get(context.TODO(), namespaceName, metav1.GetOptions{}) +// // 如果返回错误，需要判断是因为命名空间不存在还是其他错误 +// if err != nil { +// if errors.IsNotFound(err) { +// log.ErrorF("Namespace %s cant be got !", namespaceName) +// return false +// } else { +// log.ErrorF("Error retrieving namespace: %s\n", err.Error()) +// } +// return false +// } +// +// log.DebugF("Namespace %s create successful !", namespaceName) +// return true +//} +// +//func K8sGetDashBoardAuthKey() bool { +// +// if k8sClient == nil { +// // this should be the first call of k8s function +// k8sClient = newK8sClientInstance() +// if k8sClient == nil { +// log.ErrorF("k8s client is nil, run k8s function error !") +// return false +// } +// } +// +// // 获取 kube-system 命名空间的 secrets 列表 +// secrets, err := k8sClient.CoreV1().Secrets("kube-system").List(context.TODO(), metav1.ListOptions{}) +// if err != nil { +// fmt.Printf("Error retrieving secrets from kube-system namespace: %s\n", err.Error()) +// os.Exit(1) +// } +// +// // 过滤出名为 admin-user 的 secret +// var adminUserSecretName string +// for _, secret := range secrets.Items { +// if strings.Contains(secret.Name, "admin-user") { +// adminUserSecretName = secret.Name +// break +// } +// } +// +// if adminUserSecretName == "" { +// fmt.Println("No admin-user secret found") +// os.Exit(1) +// } +// +// // 获取并打印特定的 secret 描述信息 +// secret, err := k8sClient.CoreV1().Secrets("kube-system").Get(context.TODO(), adminUserSecretName, metav1.GetOptions{}) +// if err != nil { +// fmt.Printf("Error retrieving secret %s: %s\n", adminUserSecretName, err.Error()) +// os.Exit(1) +// } +// +// // 打印 secret 的详细信息，根据需要格式化输出 +// fmt.Printf("Name: %s\nNamespace: %s\nData:\n", secret.Name, secret.Namespace) +// for key, value := range secret.Data { +// fmt.Printf("%s: %s\n", key, value) +// } +// +// return false +// +//} diff --git a/agent-go/a_init/AgentInitialization.go b/agent-go/a_init/AgentInitialization.go index cd61ce7..316ffde 100644 --- a/agent-go/a_init/AgentInitialization.go +++ b/agent-go/a_init/AgentInitialization.go @@ -43,51 +43,29 @@ func INIT(octopusAgentConfigFileName string, agentServerInfoConf string) chan bo a_agent.AgentServerInfoCache = agentServerInfo // build for octopus tcp connect info struct - rabbitTCPConnectInfo := BuildOctopusTCPConnect(agentConfig) + rabbitTCPConnectInfo := buildOctopusTCPConnect(agentConfig) - initToServerProp := &rabbitmq.ConnectProperty{ - ExchangeName: agentConfig.GetString("octopus.message.init_exchange"), - QueueName: agentConfig.GetString("octopus.message.init_to_server"), - ExchangeType: g.QueueDirect, - TopicKey: agentConfig.GetString("octopus.message.init_to_server_key"), - } - - initFromServerProp := &rabbitmq.ConnectProperty{ - ExchangeName: agentConfig.GetString("octopus.message.init_exchange"), - QueueName: agentConfig.GetString("octopus.message.init_from_server"), - ExchangeType: g.QueueDirect, - TopicKey: agentConfig.GetString("octopus.message.init_from_server_key"), - } - - // 建立RabbitMQ的连接 - initToServerQueue := &rabbitmq.RabbitQueue{ - RabbitProp: initToServerProp, - RabbitConnectInfo: rabbitTCPConnectInfo, - } - //defer initToServerQueue.Close() + initToServerQueue, initFromServerQueue := buildOctopusInitQueue(rabbitTCPConnectInfo) + defer initToServerQueue.Close() + defer initFromServerQueue.Close() // 建立连接 initToServerQueue.Connect() - // 监听初始化连接中的信息 - initFromServerQueue := &rabbitmq.RabbitQueue{ - RabbitProp: initFromServerProp, - RabbitConnectInfo: rabbitTCPConnectInfo, - } - //defer initFromServerQueue.Close() - // 建立连接 initFromServerQueue.Connect() - initFromServerQueue.Handle() - buildAndSendInitMsgToServer(agentServerInfo, initToServerQueue) + // rabbit queue handle message from server + initFromServerQueue.Handle() + // receive from server for g.G.AgentHasRegister == false { select { case initFromServerMsg := <-initFromServerQueue.ReceiveChan.InitRChan: if handleInitMsgFromServer(initFromServerMsg, initToServerQueue, agentServerInfo) { + log.InfoF("[INIT] - agent has registered !") break } default: @@ -105,6 +83,36 @@ func INIT(octopusAgentConfigFileName string, agentServerInfoConf string) chan bo return runtimeConnectorQueue } +func buildOctopusInitQueue(rabbitTCPConnectInfo *rabbitmq.RabbitTCPConnectInfo) (*rabbitmq.RabbitQueue, *rabbitmq.RabbitQueue) { + + initToServerProp := &rabbitmq.ConnectProperty{ + ExchangeName: a_agent.AgentConfig.GetString("octopus.message.init_exchange"), + QueueName: a_agent.AgentConfig.GetString("octopus.message.init_to_server"), + ExchangeType: g.QueueDirect, + TopicKey: a_agent.AgentConfig.GetString("octopus.message.init_to_server_key"), + } + + initFromServerProp := &rabbitmq.ConnectProperty{ + ExchangeName: a_agent.AgentConfig.GetString("octopus.message.init_exchange"), + QueueName: a_agent.AgentConfig.GetString("octopus.message.init_from_server"), + ExchangeType: g.QueueDirect, + TopicKey: a_agent.AgentConfig.GetString("octopus.message.init_from_server_key"), + } + + // 建立RabbitMQ的连接 + initToServerQueue := &rabbitmq.RabbitQueue{ + RabbitProp: initToServerProp, + RabbitConnectInfo: rabbitTCPConnectInfo, + } + + initFromServerQueue := &rabbitmq.RabbitQueue{ + RabbitProp: initFromServerProp, + RabbitConnectInfo: rabbitTCPConnectInfo, + } + + return initToServerQueue, initFromServerQueue +} + func buildAndStartBusinessRuntimeQueue(agentTopicName string) chan bool { // 建立 业务消息 接收队列 @@ -183,19 +191,23 @@ func buildAndSendInitMsgToServer(agentServerInfo *a_agent.AgentServerInfo, initT // 发送OM至MQ中 _ = P.Submit( func() { - for g.G.AgentHasRegister == false { + agentRegisterCount := 0 + for g.G.AgentHasRegister == false && agentRegisterCount < g.AgentRegisterFailedCount { - log.InfoF("Send init message to server! ==> %s", octopusMsg) + log.InfoF("[INIT] - Send init message to server! ==> %s", octopusMsg) //如果agent存活 而Server不存活 那么需要持续不断的向Server中发送消息 initToServerQueue.SendOMsg(octopusMsg) + agentRegisterCount += 1 + // 休眠 time.Sleep(5 * time.Minute) } }) } -func BuildOctopusTCPConnect(agentConfig *viper.Viper) *rabbitmq.RabbitTCPConnectInfo { +func buildOctopusTCPConnect(agentConfig *viper.Viper) *rabbitmq.RabbitTCPConnectInfo { + host := agentConfig.GetString("spring.rabbitmq.host") port := agentConfig.GetString("spring.rabbitmq.port") username := agentConfig.GetString("spring.rabbitmq.username") @@ -226,15 +238,13 @@ func refreshAgentInfoByStatusInfo(agentInfo *a_status.AgentInfo, agentServerInfo // handleInitMsgFromServer 处理从Server接收的 注册信息 func handleInitMsgFromServer(initFromServerMsg *rabbitmq.OctopusMessage, initToServerQueue *rabbitmq.RabbitQueue, agentServerInfo *a_agent.AgentServerInfo) bool { - //initOctopusMessageDeliveries := initFromServerQueue.Read(false) - log.DebugF("message received from server is %s", initFromServerMsg) var serverInfo a_agent.AgentServerInfo s, er := initFromServerMsg.Content.(string) if !er { - log.ErrorF("convet to string error! => %v", er) + log.ErrorF("convert to string error! => %v", er) } cc := json.Unmarshal([]byte(s), &serverInfo) if cc != nil { @@ -247,9 +257,6 @@ func handleInitMsgFromServer(initFromServerMsg *rabbitmq.OctopusMessage, initToS // 是本机的注册回复信息 log.InfoF("OctopusMessage INIT from server is this agent !") - // 手动确认信息 - //delivery.Ack(false) - // 修改系统参数 g.G.AgentHasRegister = true @@ -261,13 +268,16 @@ func handleInitMsgFromServer(initFromServerMsg *rabbitmq.OctopusMessage, initToS } else { // 不是自身的 注册回复信息 -- 拒绝 2023年6月19日 此处存在错误！ 会死循环Nack 导致异常 - log.Warn(fmt.Sprintf("OctopusMessage INIT from server not this agent ! => %v, ", &initFromServerMsg)) + log.WarnF("OctopusMessage INIT from server not this agent ! => %v ", &initFromServerMsg) // 需要休眠等待不再获取相应的信息 - P.Submit(func() { + _ = P.Submit(func() { + time.Sleep(time.Second * 5) + initToServerQueue.SendOMsg(initFromServerMsg) }) + } return g.G.AgentHasRegister diff --git a/agent-go/g/global.go b/agent-go/g/global.go index 69294fd..eaa2f13 100644 --- a/agent-go/g/global.go +++ b/agent-go/g/global.go @@ -7,7 +7,8 @@ import ( type Global struct { AgentHasRegister bool - P *ants.Pool + + P *ants.Pool } const ( @@ -19,6 +20,8 @@ const ( AgentOmType = "AGENT" BaseFuncOssUrlPrefix = "https://b2.107421.xyz/" + + AgentRegisterFailedCount = 10 ) // 创建协程池子 diff --git a/agent-go/go.mod b/agent-go/go.mod index 7cd4806..ee969db 100644 --- a/agent-go/go.mod +++ b/agent-go/go.mod @@ -9,9 +9,6 @@ require ( github.com/spf13/viper v1.15.0 github.com/streadway/amqp v1.1.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.29.1 - k8s.io/apimachinery v0.29.1 - k8s.io/client-go v0.29.1 wdd.io/agent-common v0.0.0 ) @@ -19,8 +16,6 @@ replace wdd.io/agent-common => ../agent-common require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -37,21 +32,13 @@ require ( github.com/go-openapi/validate v0.22.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/goharbor/harbor/src v0.0.0-20230220075213-6015b3efa7d0 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect @@ -71,21 +58,10 @@ require ( go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/multierr v1.10.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.3.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.31.0 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/apimachinery v0.26.2 // indirect k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/agent-go/go.sum b/agent-go/go.sum index 7e4cdc3..2b3bb3a 100644 --- a/agent-go/go.sum +++ b/agent-go/go.sum @@ -55,8 +55,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -114,8 +112,6 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU= github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= @@ -169,14 +165,9 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -186,12 +177,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -207,8 +195,6 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -223,14 +209,10 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= @@ -243,8 +225,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -266,21 +248,10 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mittwald/goharbor-client/v5 v5.5.3 h1:AClQeSVjO7ThTjBWGso1j9szueTxdb8LthRBuOpibyQ= github.com/mittwald/goharbor-client/v5 v5.5.3/go.mod h1:P83UsJz83Ku8eB/Kg+d4+sA1E8rKQ0ScWDkbnQDSElA= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= -github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/panjf2000/ants/v2 v2.7.2 h1:2NUt9BaZFO5kQzrieOmK/wdb/tQ/K+QHaxN8sOgD63U= @@ -301,8 +272,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/shirou/gopsutil/v3 v3.23.3 h1:Syt5vVZXUDXPEXpIBt5ziWsJ4LdSAAxF4l/xZeQgSEE= github.com/shirou/gopsutil/v3 v3.23.3/go.mod h1:lSBNN6t3+D6W5e5nXTxc8KIMMVxAcS+6IJlffjRRlMU= github.com/shoenig/go-m1cpu v0.1.4 h1:SZPIgRM2sEF9NJy50mRHu9PKGwxyyTTJIWvCtgVbozs= @@ -340,9 +311,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -468,8 +438,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -479,8 +447,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= -golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -548,8 +514,6 @@ golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -566,8 +530,6 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -622,8 +584,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= -golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -653,7 +613,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -717,23 +676,16 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -749,24 +701,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= -k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= -k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= -k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= -k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks= +k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ= +k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/agent-go/shell/update-app-tag.sh b/agent-go/shell/update-app-tag.sh new file mode 100644 index 0000000..2b4c38e --- /dev/null +++ b/agent-go/shell/update-app-tag.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Check if the correct number of arguments are provided +if [ "$#" -ne 3 ]; then + echo "Usage: $0 " + exit 1 +fi + +# Assign the arguments to variables +name_space=$1 +new_tag=$2 +deployment_name=$3 + +echo "Name Space: $name_space Deployment Name: $deployment_name New Tag: $new_tag" +echo "" + +deployment_image=$(kubectl -n "${name_space}" get deployment "${deployment_name}" -o=jsonpath='{.spec.template.spec.containers[*].image}') +image_prefix=$(echo "${deployment_image}" | cut -d":" -f1) +old_tag=$(echo "${deployment_image}" | cut -d":" -f2) + +echo "image prefix is => ${image_prefix}" + +echo "old_tag is ${old_tag}" + +kubectl -n "${name_space}" patch deployment "${deployment_name}" -p "{\"spec\":{\"template\":{\"spec\":{\"containers\":[{\"name\":\"${deployment_name}\",\"image\": \"${image_prefix}:${new_tag}\"}]}}}}" diff --git a/server/src/main/java/io/wdd/func/auto/service/ImageFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/ImageFuncScheduler.java index 7c5d617..c70071b 100644 --- a/server/src/main/java/io/wdd/func/auto/service/ImageFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/ImageFuncScheduler.java @@ -49,7 +49,7 @@ public class ImageFuncScheduler { arrayList.add(""); //imageFullName arrayList.add("/var/lib/docker/octopus_image/"); //gzipFolderPrefix arrayList.add(""); //gzipFileName - arrayList.add("https://oss.demo.uavcmlc.com:18000/cmlc-installation/tmp/");//ossUrlPrefix + arrayList.add("https://oss.demo.uavcmlc.com/cmlc-installation/tmp/");//ossUrlPrefix arrayList.add("");//proxyUrl arrayList.add(imageSyncContext.getProjectMasterNode().getServerIpInV4());//targetHarborHost arrayList.add(imageSyncContext.getProjectInfoPO().getProjectNamespace());//namespace @@ -96,6 +96,8 @@ public class ImageFuncScheduler { return; } + log.info("prepare to update {} {} \n{}", imageSyncContext.getProjectInfoPO().getProjectNamespace(), imageSyncContext.getProjectMasterNode().getServerIpInV4(), realFullNameList); + String innerWorkerAgentName = imageSyncContext.getInnerWorkerAgentName(); Assert.notNull(innerWorkerAgentName, "inner worker agent name cant not be null !"); diff --git a/server/src/main/java/io/wdd/rpc/config/RedisConfig.java b/server/src/main/java/io/wdd/rpc/config/RedisConfig.java new file mode 100644 index 0000000..7c9ba81 --- /dev/null +++ b/server/src/main/java/io/wdd/rpc/config/RedisConfig.java @@ -0,0 +1,16 @@ +package io.wdd.rpc.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; + +@Configuration +public class RedisConfig { + + @Bean + @ConfigurationProperties(prefix = "spring.redis") + JedisConnectionFactory jedisConnectionFactory() { + return new JedisConnectionFactory(); + } +} diff --git a/server/src/main/java/io/wdd/rpc/config/RedisConfiguration.java b/server/src/main/java/io/wdd/rpc/config/RedisConfiguration.java index 9fb5417..0b9b2d7 100644 --- a/server/src/main/java/io/wdd/rpc/config/RedisConfiguration.java +++ b/server/src/main/java/io/wdd/rpc/config/RedisConfiguration.java @@ -15,6 +15,8 @@ public class RedisConfiguration { RedisTemplate redisTemplate = new RedisTemplate<>(); + // 2024年4月7日 + redisTemplate.setConnectionFactory(redisConnectionFactory); GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(); diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandler.java b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandler.java index 5f0733c..8d1585b 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandler.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandler.java @@ -118,9 +118,10 @@ public class OMessageHandler { ); log.info( - "接收到的 matchKey为 {}, 内容为 {}", + "接收到的 matchKey为 {}\n, 结果为 [{}] \n内容为: {}\n ", matchKey, - replayOMessage + replayOMessage.getResultCode(), + replayOMessage.getResult() ); if (!FROM_AGENT_MATCH_TO_AGENT_MAP.containsKey(matchKey)) { @@ -141,6 +142,7 @@ public class OMessageHandler { originOMessage.setResultCode(replayOMessage.getResultCode()); originOMessage.setResult(replayOMessage.getResult()); + // 通知等待线程 oMessageReplayContent .getCountDownLatch() diff --git a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java index 1048976..1f660f9 100644 --- a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java +++ b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java @@ -60,10 +60,12 @@ public class OMessageToAgentSender { public void send(OctopusMessage octopusMessage) { - log.debug( - "OctopusMessage {} send to agent {}", - octopusMessage, - octopusMessage.getUuid() + log.info( + "OM Sender to {} Time {} \n OctopusMessageType为 {}\nFunctionContent为 {}", + octopusMessage.getUuid(), + octopusMessage.getInit_time(), + octopusMessage.getOctopusMessageType(), + octopusMessage.getContent() ); // 统一处理Content diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index df1b570..780e185 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -44,7 +44,6 @@ spring: time-between-eviction-runs: 50000 - datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java index 74c0b83..6bce544 100644 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -38,16 +38,17 @@ public class TestImageSyncScheduler { public void runImageSync() { ArrayList CmiiAppNameList = new ArrayList<>(List.of( -// "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.3.0-cqly-032802" + "cmii-uav-process:5.4.0-040701" )); ArrayList ImageFullNameList = new ArrayList<>(List.of( - "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802" +// "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-032802" )); - Boolean downloadAndCompressOnly = true; + Boolean downloadAndCompressOnly = false; - String projectNamespace = "wdd"; +// String projectNamespace = "wdd"; // wdd + String projectNamespace = "cqlyj"; // cqlyj // String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod