github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88856 from yaseenhamdulay/patch-1

Browse Source 
Create etcd user in cloud-init master.yaml rather than in configure-h…
This commit is contained in:
Kubernetes Prow Robot 2020-03-27 20:41:53 -07:00 committed by GitHub
commit c7abf44a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/gci/configure-helper.sh
View File

@ -445,9 +445,6 @@ function mount-master-pd {
mkdir -p "${mount_point}/srv/sshproxy" mkdir -p "${mount_point}/srv/sshproxy"
ln -s -f "${mount_point}/srv/sshproxy" /etc/srv/sshproxy ln -s -f "${mount_point}/srv/sshproxy" /etc/srv/sshproxy
if ! id etcd &>/dev/null; then
useradd -s /sbin/nologin -d /var/etcd etcd
fi
chown -R etcd "${mount_point}/var/etcd" chown -R etcd "${mount_point}/var/etcd"
chgrp -R etcd "${mount_point}/var/etcd" chgrp -R etcd "${mount_point}/var/etcd"
} }

6
cluster/gce/gci/master.yaml
View File

@ -1,5 +1,11 @@
#cloud-config #cloud-config
users:
- name: etcd
homedir: /var/etcd
lock_passwd: true
ssh_redirect_user: true
write_files: write_files:
- path: /etc/systemd/system/kube-master-installation.service - path: /etc/systemd/system/kube-master-installation.service
permissions: 0644 permissions: 0644