Merge branch 'main' into local-ss

# Conflicts:
#	agent-common/real_project/CmiiImageListConfig.go
#	agent-operator/CmiiK8sOperator_test.go
#	agent-operator/ImageSyncOperator_test.go
This commit is contained in:
zeaslity
2024-11-11 17:23:56 +08:00
53 changed files with 45813 additions and 15745 deletions

View File

@@ -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 = `