Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

find sshkey resource when updating cluster #6384

Merged
merged 2 commits into from Jan 27, 2019
Merged

find sshkey resource when updating cluster #6384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93974b4
find sshkey resource when updating cluster
zetaab Jan 24, 2019
06de6b3
update bazel
zetaab Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/resources/openstack/compute.go
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ func listServerGroups(cloud openstack.OpenstackCloud, clusterName string) ([]*re
func listKeypairs(cloud openstack.OpenstackCloud, clusterName string) ([]*resources.Resource, error) {
var resourceTrackers []*resources.Resource

kp, err := cloud.ListKeypair(clusterName)
kp, err := cloud.GetKeypair(clusterName)
if err != nil {
return nil, fmt.Errorf("failed to get keypair: %s", err)
}
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/openstack/cloud.go
View file
Open in desktop
Expand Up @@ -150,8 +150,8 @@ type OpenstackCloud interface {
//CreateSubnet will create a new Neutron subnet
CreateSubnet(opt subnets.CreateOptsBuilder) (*subnets.Subnet, error)

// ListKeypair will return the Nova keypairs
ListKeypair(name string) (*keypairs.KeyPair, error)
// GetKeypair will return the Nova keypair
GetKeypair(name string) (*keypairs.KeyPair, error)

// CreateKeypair will create a new Nova Keypair
CreateKeypair(opt keypairs.CreateOptsBuilder) (*keypairs.KeyPair, error)
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/openstack/keypair.go
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/kops/util/pkg/vfs"
)

func (c *openstackCloud) ListKeypair(name string) (*keypairs.KeyPair, error) {
func (c *openstackCloud) GetKeypair(name string) (*keypairs.KeyPair, error) {
var k *keypairs.KeyPair
done, err := vfs.RetryWithBackoff(readBackoff, func() (bool, error) {
rs, err := keypairs.Get(c.novaClient, name).Extract()
Expand Down
1 change: 1 addition & 0 deletions upup/pkg/fi/cloudup/openstacktasks/BUILD.bazel
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@ go_library(
importpath = "k8s.io/kops/upup/pkg/fi/cloudup/openstacktasks",
visibility = ["//visibility:public"],
deps = [
"//pkg/pki:go_default_library",
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/openstack:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
Expand Down
16 changes: 15 additions & 1 deletion upup/pkg/fi/cloudup/openstacktasks/sshkey.go
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/golang/glog"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"

"k8s.io/kops/pkg/pki"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
)
Expand All @@ -45,7 +46,7 @@ func (e *SSHKey) CompareWithID() *string {

func (e *SSHKey) Find(c *fi.Context) (*SSHKey, error) {
cloud := c.Cloud.(openstack.OpenstackCloud)
rs, err := cloud.ListKeypair(openstackKeyPairName(fi.StringValue(e.Name)))
rs, err := cloud.GetKeypair(openstackKeyPairName(fi.StringValue(e.Name)))
if err != nil {
return nil, err
}
Expand All @@ -69,6 +70,19 @@ func (e *SSHKey) Find(c *fi.Context) (*SSHKey, error) {
}

func (e *SSHKey) Run(c *fi.Context) error {
if e.KeyFingerprint == nil && e.PublicKey != nil {
publicKey, err := e.PublicKey.AsString()
if err != nil {
return fmt.Errorf("error reading SSH public key: %v", err)
}

keyFingerprint, err := pki.ComputeOpenSSHKeyFingerprint(publicKey)
if err != nil {
return fmt.Errorf("error computing key fingerprint for SSH key: %v", err)
}
glog.V(2).Infof("Computed SSH key fingerprint as %q", keyFingerprint)
e.KeyFingerprint = &keyFingerprint
}
return fi.DefaultDeltaRunMethod(e, c)
}

Expand Down