Some cleanup.
This commit is contained in:
@@ -26,6 +26,8 @@ type Config struct {
|
|||||||
StorageContainerName string
|
StorageContainerName string
|
||||||
PrepullImageServiceName string
|
PrepullImageServiceName string
|
||||||
ServiceScaleTimeout time.Duration
|
ServiceScaleTimeout time.Duration
|
||||||
|
SSHClientPKConfigName string
|
||||||
|
SSHHostSKSecretName string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,6 +50,8 @@ func GetConfig()(Config, error){
|
|||||||
cfg.Constants.StorageContainerName = "blazenaStorage";
|
cfg.Constants.StorageContainerName = "blazenaStorage";
|
||||||
cfg.Constants.PrepullImageServiceName = "blazenaPrepull";
|
cfg.Constants.PrepullImageServiceName = "blazenaPrepull";
|
||||||
cfg.Constants.ServiceScaleTimeout = time.Second * 15;
|
cfg.Constants.ServiceScaleTimeout = time.Second * 15;
|
||||||
|
cfg.Constants.SSHClientPKConfigName = "blazenaSSHClientPublicKey";
|
||||||
|
cfg.Constants.SSHHostSKSecretName = "blazenaSSHHostPrivateKey";
|
||||||
|
|
||||||
err = json.Unmarshal(rawConfig, &cfg);
|
err = json.Unmarshal(rawConfig, &cfg);
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,10 @@ package docker
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
@@ -20,44 +20,40 @@ func cleanup(w http.ResponseWriter, r *http.Request){
|
|||||||
|
|
||||||
if !bearerAuth(w, r) {return;}
|
if !bearerAuth(w, r) {return;}
|
||||||
|
|
||||||
rawBody, err := io.ReadAll(r.Body);
|
|
||||||
if err != nil {
|
|
||||||
panic("Failed to read body!");
|
|
||||||
}
|
|
||||||
|
|
||||||
var bodyDecoded struct{
|
|
||||||
ServiceId string `json:"serviceId"`
|
|
||||||
};
|
|
||||||
|
|
||||||
err = json.Unmarshal(rawBody, &bodyDecoded);
|
|
||||||
if err != nil {
|
|
||||||
panic("Failed to unmarshal json."+ err.Error());
|
|
||||||
}
|
|
||||||
|
|
||||||
listResoult, err := ApiClient.ServiceList(context.Background(), swarm.ServiceListOptions{});
|
listResoult, err := ApiClient.ServiceList(context.Background(), swarm.ServiceListOptions{});
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Failed to list services."+ err.Error());
|
slog.Error("Failed to list services", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
var helperServiceId string;
|
var helperServiceId string;
|
||||||
|
var helperServices int;
|
||||||
|
|
||||||
for _, service := range listResoult{
|
for _, service := range listResoult{
|
||||||
if service.Spec.Labels["blazena.helper"] != "true" {
|
if service.Spec.Labels["blazena.helper"] != "true" {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
helperServiceId = service.ID;
|
helperServiceId = service.ID;
|
||||||
break;
|
helperServices ++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if helperServiceId == ""{
|
if helperServiceId == ""{
|
||||||
panic("Helper service not found!");
|
slog.Warn("Helper service wasn't found");
|
||||||
|
http.Error(w, "Internal Server Error", http.StatusInternalServerError);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if helperServices > 1{
|
||||||
|
slog.Error("There are more than 1 helper service.");
|
||||||
|
os.Exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
err = ApiClient.ServiceRemove(context.Background(), helperServiceId);
|
err = ApiClient.ServiceRemove(context.Background(), helperServiceId);
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Failed to remove helper service."+ err.Error());
|
panic("Failed to remove helper service."+ err.Error());
|
||||||
}
|
}
|
||||||
|
//TODO: add proper wait system
|
||||||
time.Sleep(7*time.Second);
|
time.Sleep(7*time.Second);
|
||||||
|
|
||||||
fmt.Fprint(w, bodyDecoded.ServiceId);
|
fmt.Fprint(w, helperServiceId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
package docker
|
package docker
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"context"
|
"os"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types/swarm"
|
"github.com/docker/docker/api/types/swarm"
|
||||||
|
|
||||||
"github.com/rony5394/blazena/shared"
|
"github.com/rony5394/blazena/shared"
|
||||||
@@ -32,23 +35,35 @@ func exchangeKeys(w http.ResponseWriter, r *http.Request){
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Failed to unmarshal json."+ err.Error());
|
panic("Failed to unmarshal json."+ err.Error());
|
||||||
}
|
}
|
||||||
sshPkPem := bodyDecoded.SshPkPem;
|
sshClientPkPem := bodyDecoded.SshPkPem;
|
||||||
hostKeypair := shared.GenerateSSHKeypair();
|
hostKeypair := shared.GenerateSSHKeypair();
|
||||||
|
|
||||||
encoded, err := json.Marshal(struct{HostPkPem string `json:"hostPkPem"`}{HostPkPem: hostKeypair.Public});
|
encoded, err := json.Marshal(struct{HostPkPem string `json:"hostPkPem"`}{HostPkPem: hostKeypair.Public});
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("I wonder how. I wonder why?"+err.Error());
|
slog.Error("Failed to marshal host pk into response.", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(42);
|
||||||
}
|
}
|
||||||
|
|
||||||
ApiClient.ConfigCreate(context.Background(), swarm.ConfigSpec{
|
_, err = ApiClient.ConfigCreate(context.Background(), swarm.ConfigSpec{
|
||||||
Data: []byte(sshPkPem),
|
Data: []byte(sshClientPkPem),
|
||||||
Annotations: swarm.Annotations{Name: "blazenaSSHPublicKey"},
|
Annotations: swarm.Annotations{Name: theConfig.Constants.SSHClientPKConfigName},
|
||||||
});
|
});
|
||||||
|
|
||||||
ApiClient.SecretCreate(context.Background(), swarm.SecretSpec{
|
if err != nil {
|
||||||
|
slog.Error("Failed to create a config.", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = ApiClient.SecretCreate(context.Background(), swarm.SecretSpec{
|
||||||
Data: []byte(hostKeypair.Private),
|
Data: []byte(hostKeypair.Private),
|
||||||
Annotations: swarm.Annotations{Name: "blazenaSSHHostPrivateKey"},
|
Annotations: swarm.Annotations{Name: theConfig.Constants.SSHHostSKSecretName},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("Failed to create a secret.", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
fmt.Fprint(w, string(encoded));
|
fmt.Fprint(w, string(encoded));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ func prepare(w http.ResponseWriter, r *http.Request){
|
|||||||
pullBlazenaImage();
|
pullBlazenaImage();
|
||||||
createHelper(theConfig, labels["blazena.node"], bodyDecoded.VolumeId);
|
createHelper(theConfig, labels["blazena.node"], bodyDecoded.VolumeId);
|
||||||
|
|
||||||
|
//TODO: add proper waiting system.
|
||||||
time.Sleep(7*time.Second);
|
time.Sleep(7*time.Second);
|
||||||
|
|
||||||
fmt.Fprint(w, bodyDecoded.ServiceId);
|
fmt.Fprint(w, bodyDecoded.ServiceId);
|
||||||
@@ -129,7 +130,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
|
|||||||
stopGracePeriod := time.Second * 5;
|
stopGracePeriod := time.Second * 5;
|
||||||
helperCommand := `/usr/sbin/sshd -h /host-key -p 2222 -D`;
|
helperCommand := `/usr/sbin/sshd -h /host-key -p 2222 -D`;
|
||||||
|
|
||||||
sshKeyConfigId, err := getConfigIDByName(ApiClient, "blazenaSSHPublicKey");
|
sshKeyConfigId, err := getConfigIDByName(ApiClient, theConfig.Constants.SSHClientPKConfigName);
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("Docker needs both id and name to mount config for some reason and getting id of it failed!"+err.Error());
|
panic("Docker needs both id and name to mount config for some reason and getting id of it failed!"+err.Error());
|
||||||
@@ -163,7 +164,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
|
|||||||
Configs: []*swarm.ConfigReference{
|
Configs: []*swarm.ConfigReference{
|
||||||
&swarm.ConfigReference{
|
&swarm.ConfigReference{
|
||||||
ConfigID: sshKeyConfigId,
|
ConfigID: sshKeyConfigId,
|
||||||
ConfigName: "blazenaSSHPublicKey",
|
ConfigName: theConfig.Constants.SSHClientPKConfigName,
|
||||||
File: &swarm.ConfigReferenceFileTarget{
|
File: &swarm.ConfigReferenceFileTarget{
|
||||||
Name: "/root/.ssh/authorized_keys",
|
Name: "/root/.ssh/authorized_keys",
|
||||||
Mode: 0600,
|
Mode: 0600,
|
||||||
@@ -175,7 +176,7 @@ func createHelper(Config cfg.Config, targetNode string, targetVolume string){
|
|||||||
Secrets: []*swarm.SecretReference{
|
Secrets: []*swarm.SecretReference{
|
||||||
&swarm.SecretReference{
|
&swarm.SecretReference{
|
||||||
SecretID: sshHostKeySecretId,
|
SecretID: sshHostKeySecretId,
|
||||||
SecretName: "blazenaSSHHostPrivateKey",
|
SecretName: theConfig.Constants.SSHHostSKSecretName,
|
||||||
File: &swarm.SecretReferenceFileTarget{
|
File: &swarm.SecretReferenceFileTarget{
|
||||||
Name: "/host-key",
|
Name: "/host-key",
|
||||||
Mode: 0600,
|
Mode: 0600,
|
||||||
|
|||||||
@@ -118,7 +118,12 @@ func scaleUp(w http.ResponseWriter, r *http.Request){
|
|||||||
delete(updatedSpec.Labels, "blazena.scaledDown");
|
delete(updatedSpec.Labels, "blazena.scaledDown");
|
||||||
delete(updatedSpec.Labels, "blazena.originalScale");
|
delete(updatedSpec.Labels, "blazena.originalScale");
|
||||||
|
|
||||||
ApiClient.ServiceUpdate(context.Background(), serviceId, inspectresoult.Version, updatedSpec, swarm.ServiceUpdateOptions{});
|
_, err = ApiClient.ServiceUpdate(context.Background(), serviceId, inspectresoult.Version, updatedSpec, swarm.ServiceUpdateOptions{});
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("Failed to update/scale a service.", slog.Any("propagatedError", err), slog.String("serviceId", serviceId));
|
||||||
|
os.Exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), theConfig.Constants.ServiceScaleTimeout);
|
ctx, cancel := context.WithTimeout(context.Background(), theConfig.Constants.ServiceScaleTimeout);
|
||||||
defer cancel();
|
defer cancel();
|
||||||
|
|||||||
2
main.go
2
main.go
@@ -10,6 +10,8 @@ import (
|
|||||||
"github.com/rony5394/blazena/host"
|
"github.com/rony5394/blazena/host"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
//TODO: consider adding blazena.doNotTouch
|
||||||
|
|
||||||
/*
|
/*
|
||||||
If the exit code is X then it means Y:
|
If the exit code is X then it means Y:
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import (
|
|||||||
"crypto/ed25519"
|
"crypto/ed25519"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
"golang.org/x/crypto/ssh"
|
"golang.org/x/crypto/ssh"
|
||||||
)
|
)
|
||||||
@@ -16,19 +18,22 @@ type Keypair struct {
|
|||||||
func GenerateSSHKeypair() Keypair {
|
func GenerateSSHKeypair() Keypair {
|
||||||
publicKey, privateKey, err := ed25519.GenerateKey(rand.Reader)
|
publicKey, privateKey, err := ed25519.GenerateKey(rand.Reader)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
slog.Error("Failed to generate an ssh keypair.", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(42);
|
||||||
}
|
}
|
||||||
|
|
||||||
privBlock, err := ssh.MarshalPrivateKey(privateKey, "")
|
privBlock, err := ssh.MarshalPrivateKey(privateKey, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
slog.Error("Failed to marshal private key", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(42);
|
||||||
}
|
}
|
||||||
|
|
||||||
privPem := pem.EncodeToMemory(privBlock)
|
privPem := pem.EncodeToMemory(privBlock)
|
||||||
|
|
||||||
sshPubKey, err := ssh.NewPublicKey(publicKey)
|
sshPubKey, err := ssh.NewPublicKey(publicKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
slog.Error("Failed deriving public ssh key from a private one.", slog.Any("propagatedError", err));
|
||||||
|
os.Exit(42);
|
||||||
}
|
}
|
||||||
|
|
||||||
pubBytes := ssh.MarshalAuthorizedKey(sshPubKey)
|
pubBytes := ssh.MarshalAuthorizedKey(sshPubKey)
|
||||||
|
|||||||
Reference in New Issue
Block a user