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

rancher · Dec 27, 2018 · 7a0d3a8 · 7a0d3a8
1 parent 4cab9c9
commit 7a0d3a8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/config/cloudinit/datasource/metadata/gce/metadata.go b/config/cloudinit/datasource/metadata/gce/metadata.go
@@ -65,6 +65,11 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
 	if err != nil {
 		return datasource.Metadata{}, err
 	}
+	blockProjectSSHKeys, err := ms.fetchString("instance/attributes/block-project-ssh-keys")
+	if err != nil {
+		return datasource.Metadata{}, err
+	}
+
 	md := datasource.Metadata{
 		PublicIPv4:    public,
 		PrivateIPv4:   local,
@@ -89,8 +94,10 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
 		md.NetworkConfig.Interfaces["eth0"] = network
 	}
 	*/
-
-	keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n")
+	keyStrings := strings.Split(instanceSSHKeys, "\n")
+	if blockProjectSSHKeys != "true" {
+		keyStrings = append(keyStrings, strings.Split(projectSSHKeys, "\n")...)
+	}
 
 	i := 0
 	for _, keyString := range keyStrings {