diff --git a/e2e/k8sworkload.yaml b/e2e/k8sworkload.yaml index 45251a0c..e77bab9a 100644 --- a/e2e/k8sworkload.yaml +++ b/e2e/k8sworkload.yaml @@ -254,7 +254,7 @@ stringData: AAAEDcQgdh2z2r/6blq0ziJ1l6s6IAX8C+9QHfAH931cHNO9RGTH325rDUp12tplwukHmR 8ytbC9TPZ886gCstynP1AAAADWJvbGlhbkB1YnVudHU= -----END OPENSSH PRIVATE KEY----- - ssh-publickey: | + ssh-publickey-cert: | ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIMIr7E6Il5fvTpixHHDCszKhlRbzXrB0fnWtxYAYdyVlAAAAINRGTH325rDUp12tplwukHmR8ytbC9TPZ886gCstynP1AAAAAAAAAAAAAAABAAAAC2s4c2UyZV90ZXN0AAAADgAAAApjbGllbnRfMTIzAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIJrzCeQ3a+m8PnA/KUmK+JAfC1tM7SG2gkGmW29nXj1nAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDICm0JT8fakTkWTRjDtbjjMx0dUrvGvPb+Qzi2592/39CqBj8cEqZAF/DesCJhKmO+hyN4jDxTcKPhPM0y2/sH kind: Secret metadata: diff --git a/plugin/kubernetes/kubernetes.go b/plugin/kubernetes/kubernetes.go index bc290a7f..7a7a4e5f 100644 --- a/plugin/kubernetes/kubernetes.go +++ b/plugin/kubernetes/kubernetes.go @@ -167,10 +167,10 @@ func (p *plugin) createUpstream(conn libplugin.ConnMetadata, pipe *piperv1beta1. } } - for _, k := range []string{anno["publickey_field_name"], "ssh-publickey", "publickey"} { + for _, k := range []string{anno["publickey_field_name"], "ssh-publickey-cert", "publickey-cert", "ssh-publickey", "publickey"} { data := secret.Data[k] if data != nil { - log.Debugf("found publickey key in secret %v/%v", to.PrivateKeySecret.Name, k) + log.Debugf("found publickey key cert in secret %v/%v", to.PrivateKeySecret.Name, k) publicKey = data break }