rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-12 14:18:01 +00:00
Code Issues Releases Wiki Activity

Support instance/attributes/block-project-ssh-keys for gce metadata

Browse Source
This commit is contained in:
niusmallnan 2018-12-27 14:14:58 +08:00 committed by niusmallnan
parent 4cab9c9caf
commit 7a0d3a8fa2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/cloudinit/datasource/metadata/gce/metadata.go
View File

@ -65,6 +65,11 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
if err != nil { if err != nil {
return datasource.Metadata{}, err return datasource.Metadata{}, err
} }
blockProjectSSHKeys, err := ms.fetchString("instance/attributes/block-project-ssh-keys")
if err != nil {
return datasource.Metadata{}, err
}
md := datasource.Metadata{ md := datasource.Metadata{
PublicIPv4: public, PublicIPv4: public,
PrivateIPv4: local, PrivateIPv4: local,
@ -89,8 +94,10 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
md.NetworkConfig.Interfaces["eth0"] = network md.NetworkConfig.Interfaces["eth0"] = network
} }
*/ */
keyStrings := strings.Split(instanceSSHKeys, "\n")
keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n") if blockProjectSSHKeys != "true" {
keyStrings = append(keyStrings, strings.Split(projectSSHKeys, "\n")...)
}
i := 0 i := 0
for _, keyString := range keyStrings { for _, keyString := range keyStrings {