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

SecretStore and CAStore implementations backed by API #3409

Merged
merged 2 commits into from
Sep 21, 2017
Merged

SecretStore and CAStore implementations backed by API #3409

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
914fe68
SecretStore and CAStore implementations backed by API
justinsb Sep 17, 2017
d9a3c46
Clientset fixes per code review
justinsb Sep 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nodeup/pkg/model/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@ func (c *NodeupModelContext) CNIConfDir() string {

// buildPKIKubeconfig generates a kubeconfig
func (c *NodeupModelContext) buildPKIKubeconfig(id string) (string, error) {
caCertificate, err := c.KeyStore.Cert(fi.CertificateId_CA)
caCertificate, err := c.KeyStore.Cert(fi.CertificateId_CA, false)
if err != nil {
return "", fmt.Errorf("error fetching CA certificate from keystore: %v", err)
}

certificate, err := c.KeyStore.Cert(id)
certificate, err := c.KeyStore.Cert(id, false)
if err != nil {
return "", fmt.Errorf("error fetching %q certificate from keystore: %v", id, err)
}
privateKey, err := c.KeyStore.PrivateKey(id)
privateKey, err := c.KeyStore.PrivateKey(id, false)
if err != nil {
return "", fmt.Errorf("error fetching %q private key from keystore: %v", id, err)
}
Expand Down
4 changes: 2 additions & 2 deletions nodeup/pkg/model/convenience.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func getProxyEnvVars(proxies *kops.EgressProxySpec) []v1.EnvVar {

// buildCertificateRequest retrieves the certificate from a keystore
func buildCertificateRequest(c *fi.ModelBuilderContext, b *NodeupModelContext, name, path string) error {
cert, err := b.KeyStore.Cert(name)
cert, err := b.KeyStore.Cert(name, false)
if err != nil {
return err
}
Expand All @@ -120,7 +120,7 @@ func buildCertificateRequest(c *fi.ModelBuilderContext, b *NodeupModelContext, n

// buildPrivateKeyRequest retrieves a private key from the store
func buildPrivateKeyRequest(c *fi.ModelBuilderContext, b *NodeupModelContext, name, path string) error {
k, err := b.KeyStore.PrivateKey(name)
k, err := b.KeyStore.PrivateKey(name, false)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion nodeup/pkg/model/kubecontrollermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (b *KubeControllerManagerBuilder) Build(c *fi.ModelBuilderContext) error {
// If we're using the CertificateSigner, include the CA Key
// TODO: use a per-machine key? use KMS?
if b.useCertificateSigner() {
ca, err := b.KeyStore.PrivateKey(fi.CertificateId_CA)
ca, err := b.KeyStore.PrivateKey(fi.CertificateId_CA, false)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions nodeup/pkg/model/protokube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ func (t *ProtokubeBuilder) writeProxyEnvVars(buffer *bytes.Buffer) {

// buildCertificateTask is responsible for build a certificate request task
func (t *ProtokubeBuilder) buildCeritificateTask(c *fi.ModelBuilderContext, name, filename string) error {
cert, err := t.KeyStore.Cert(name)
cert, err := t.KeyStore.Cert(name, false)
if err != nil {
return err
}
Expand All @@ -353,7 +353,7 @@ func (t *ProtokubeBuilder) buildCeritificateTask(c *fi.ModelBuilderContext, name

// buildPrivateKeyTask is responsible for build a certificate request task
func (t *ProtokubeBuilder) buildPrivateTask(c *fi.ModelBuilderContext, name, filename string) error {
cert, err := t.KeyStore.PrivateKey(name)
cert, err := t.KeyStore.PrivateKey(name, false)
if err != nil {
return err
}
Expand Down
10 changes: 5 additions & 5 deletions nodeup/pkg/model/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {

// retrieve the platform ca
{
ca, err := b.KeyStore.CertificatePool(fi.CertificateId_CA)
ca, err := b.KeyStore.CertificatePool(fi.CertificateId_CA, false)
if err != nil {
return err
}
Expand Down Expand Up @@ -79,7 +79,7 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {
}

{
cert, err := b.KeyStore.Cert("master")
cert, err := b.KeyStore.Cert("master", false)
if err != nil {
return err
}
Expand All @@ -98,7 +98,7 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {
}

{
k, err := b.KeyStore.PrivateKey("master")
k, err := b.KeyStore.PrivateKey("master", false)
if err != nil {
return err
}
Expand All @@ -118,7 +118,7 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {

if b.IsKubernetesGTE("1.7") {

cert, err := b.KeyStore.Cert("apiserver-proxy-client")
cert, err := b.KeyStore.Cert("apiserver-proxy-client", false)
if err != nil {
return fmt.Errorf("apiserver proxy client cert lookup failed: %v", err.Error())
}
Expand All @@ -135,7 +135,7 @@ func (b *SecretBuilder) Build(c *fi.ModelBuilderContext) error {
}
c.AddTask(t)

key, err := b.KeyStore.PrivateKey("apiserver-proxy-client")
key, err := b.KeyStore.PrivateKey("apiserver-proxy-client", false)
if err != nil {
return fmt.Errorf("apiserver proxy client private key lookup failed: %v", err.Error())
}
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ type CAStore interface {
Keystore

// Cert returns the primary specified certificate
Cert(name string) (*pki.Certificate, error)
Cert(name string, createIfMissing bool) (*pki.Certificate, error)
// CertificatePool returns all active certificates with the specified id
CertificatePool(name string) (*CertificatePool, error)
PrivateKey(name string) (*pki.PrivateKey, error)
CertificatePool(name string, createIfMissing bool) (*CertificatePool, error)
PrivateKey(name string, createIfMissing bool) (*pki.PrivateKey, error)

FindCert(name string) (*pki.Certificate, error)
FindPrivateKey(name string) (*pki.PrivateKey, error)
Expand Down
Loading