opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-08-30 17:58:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

use user data to permit root login using ssh private key (#2136)

Browse Source 
Signed-off-by: fanux <fanux@sealos.io>

Signed-off-by: fanux <fanux@sealos.io>
This commit is contained in:
中弈
2022-11-22 21:59:16 +08:00
committed by GitHub
parent 0208f11e71
commit 969b16491d
5 changed files with 119 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/cluster/controllers/cluster_controller.go
+1 -12
View File
@@ -63,13 +63,6 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
logger.Debug("ignore not found cluster error: %v", err)
return ctrl.Result{}, client.IgnoreNotFound(err)
}
if cluster.Status.Status == "" {
cluster.Status.Status = v1.Pending.String()
if err := r.Status().Update(ctx, cluster); err != nil {
logger.Error(cluster, "Error", "cluster CurrStatus update failed", "%v", err)
return ctrl.Result{}, err
}
}
infra := &infrav1.Infra{}
infra.Name = cluster.Spec.Infra
infra.Namespace = cluster.Namespace
@@ -94,11 +87,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
logger.Error("reconcile cluster error: %v", err)
return ctrl.Result{}, err
}
cluster.Status.Status = v1.Running.String()
if err = r.Status().Update(ctx, cluster); err != nil {
logger.Error("sealos update status failed", err)
return ctrl.Result{}, err
}
return ctrl.Result{}, nil
}
controllers/infra/drivers/aws/create_instance.go
+9
View File
@@ -18,6 +18,7 @@ package aws
import (
"context"
"encoding/base64"
"fmt"
"strconv"
"sync"
@@ -34,6 +35,11 @@ import (
var mutex sync.Mutex
var userData = `#!/bin/bash
sudo cp /home/ec2-user/.ssh/authorized_keys /root/.ssh/authorized_keys
sudo sed -i 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config
`
// EC2CreateInstanceAPI defines the interface for the RunInstances and CreateTags functions.
// We use this interface to test the functions using a mocked service.
type EC2CreateInstanceAPI interface {
@@ -146,6 +152,8 @@ func (d Driver) createInstances(hosts *v1.Hosts, infra *v1.Infra) error {
//todo use ami to search root device name
rootDeviceName := "/dev/xvda"
rootVolumeSize := int32(40)
// encode userdata to base64
userData := base64.StdEncoding.EncodeToString([]byte(userData))
input := &ec2.RunInstancesInput{
ImageId: &hosts.Image,
InstanceType: GetInstanceType(hosts),
@@ -167,6 +175,7 @@ func (d Driver) createInstances(hosts *v1.Hosts, infra *v1.Infra) error {
DeviceName: &rootDeviceName,
Ebs: &types.EbsBlockDevice{VolumeSize: &rootVolumeSize},
}},
UserData: &userData,
}
// assign to BlockDeviceMappings from host.Disk
pkg/ssh/ssh_test.go
+81
View File
@@ -0,0 +1,81 @@
// Copyright © 2022 sealos.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package ssh
import (
"testing"
v2 "github.com/labring/sealos/pkg/types/v1beta1"
)
const pk = `-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAq+vV7fBRIuw2aE/0QbebiZJhKXbvK8FeQeKLnj+eEs06xyQ5
9hbm4rzoduAzv5wiyD+fxiYfJ1hiHUvV+3bHyeevz3e8Tmzt3FWqL8uUYIX+kbJm
T0OAO8sviG32atvSNy7DhtYnlwVidzFukhsPltiSu84rANqmLcKwmDG+KXB3NR9W
je2hJw799UGnazf9Xn/I/027TjqJAs7OIs9a/jEVXAYLbDI3t3HuOM2kNbkPutyz
IKQoYAIxwIO5Wgws7blpt8+wWG6Z9vuRWJ47c53u631KP1XFe9yJMHf71JSk0jLb
d+DTZmVpkhY1ioyJMSxVxx+vEGmLQ7GgN/1ylQIDAQABAoIBAQCgVZFuFnGU4Dbd
kbN6loG4C4wR35mudOgzCdSsASiq4Duw/VgQ6crqKsOiGfYo/LRzjOK1KVhkmUjn
iZJGssAgzLJqCoDTo0Mx+bJ+YJ5AZrbDql1ADvPIz/XEhskJX3jtfe9cEN1bOupZ
vwAfwp0HUXOHMv9oDIJuquOHDN0MRw2Nnj4SiJc47YdrhlCUpwKLCM+ghqRHW7gU
lAVuOJ98hXIuepbOR6QkmcDXhIHebuyfTZDkvzLqeWiQqzMI2vkXye2SpwHa0JMp
...
MOCKDATA
...
RD+1isqrHOo012UTg8ZRPrNqbR8i+xgDcrIgW1ge/mxn5Q02OxFtnmqDq5MntiBg
Fm/gq+iUhN48b7Jm61d7LpEb1OWrNvKwb/mRm+4vp4e94ByKo28OboJHS+8JcQHX
7j63ID0RWfHmtN4FsHpLsKUCgYByPc5wQDUc1JmtsKBgMIAn8UTaCU7hxSp2/Io9
ITMSjoSS/hRDPSr5LVN4uAZG3mVJrJ8zwrPr5r4TZMsNvmq6KdMyJlzv895/8thM
QUPxW6c5EMoDMRhHwxhctYcU4UD/ognOegDRyiZo3OAHPz5rRIa9lYHplj64Qv3l
Vid8AQKBgEsW7rO/CktA3nEB832swsxJpB/8acMRvOoAXkYbH8rPkoDGw89kF8OS
nOQozpnxmjZJob4kuBEB1AbtBqFztTv0VuwsRpBnGuVJkpyL0t91D2o70QNIOjn2
gT3uouYke+NuMeAutesCanG9ZwNMiwHIZgcb8WgRso/M8EWiFBV2
-----END RSA PRIVATE KEY-----`
func TestWaitSSHReady(t *testing.T) {
s := &v2.SSH{
User: "ec2-user",
PkData: pk,
}
ssh := NewSSHClient(s, false)
type args struct {
ssh Interface
tryTimes int
hosts []string
}
tests := []struct {
name string
args args
wantErr bool
}{
{
name: "test wait ssh ready",
args: args{
ssh,
3,
[]string{"58.82.22.99"},
},
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if err := WaitSSHReady(tt.args.ssh, tt.args.tryTimes, tt.args.hosts...); (err != nil) != tt.wantErr {
t.Errorf("WaitSSHReady() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}
test/exec-cmd-in-mountpoint-dir/imageA/pod.yaml
+14
View File
@@ -1,3 +1,17 @@
# Copyright © 2022 sealos.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: v1
kind: Pod
metadata:
test/exec-cmd-in-mountpoint-dir/imageB/pod.yaml
+14
View File
@@ -1,3 +1,17 @@
# Copyright © 2022 sealos.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: v1
kind: Pod
metadata: