Merge branch 'main' into local-ss

# Conflicts:
#	agent-common/real_project/CmiiImageListConfig.go
#	agent-operator/CmiiK8sOperator_test.go
#	agent-operator/ImageSyncOperator_test.go

agent-go/Makefile

@@ -0,0 +1,28 @@
+SHELL := /bin/bash
+BASEDIR = $(shell pwd)
+
+.PHONY: help
+help:
+		@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: install
+install: ## Install dependencies
+		@go mod download
+		@go mod vendor
+
+.PHONY: dev
+dev: ## Run with Dev
+		@test -f conf/config.local.yml || cp conf/config.local.yml.example conf/config.local.yml
+		@go run main.go
+
+.PHONY: build
+build: ## Build todomvc
+		@go build -o build/agent-go main.go
+
+		.PHONY: dev
+run: ## Run with Dev
+		@go build -o build/agent-go main.go
+		@go run build/agent-go
+
+clean: ### Remove build dir
+		@rm -fr build

agent-go/a_executor/beans/SshKeyConfig.go

@@ -1,7 +1,6 @@
 package beans
 
-var Ed25519PrivateKey = `
------BEGIN OPENSSH PRIVATE KEY-----
+var Ed25519PrivateKey = `-----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
 QyNTUxOQAAACDk8R4KXGgDa5H2r8HrqW1klShoSISV20sLiXZPZPfeLwAAAJCIan+LiGp/
 iwAAAAtzc2gtZWQyNTUxOQAAACDk8R4KXGgDa5H2r8HrqW1klShoSISV20sLiXZPZPfeLw
@@ -10,8 +9,7 @@ KGhIhJXbSwuJdk9k994vAAAADHdkZEBjbWlpLmNvbQE=
 -----END OPENSSH PRIVATE KEY-----
 `
 
-var Ed25519PublicKey = `
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTxHgpcaANrkfavweupbWSVKGhIhJXbSwuJdk9k994v wdd@cmii.com
+var Ed25519PublicKey = `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTxHgpcaANrkfavweupbWSVKGhIhJXbSwuJdk9k994v wdd@cmii.com
 `
 
 var SysctlConfig = `

agent-go/main.go

@@ -9,7 +9,7 @@ import (
 
 var log = logger.Log
 
-// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
+// C:\Users\wdd\go\bin\gox.exe -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
 // /root/go/bin/gox -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
 
 // bash <(curl -sL http://172.28.0.10:9000/octopus/init-script-wdd.sh) --offline --url http://172.28.0.10:9000 --agent-install