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

VM support fixes #123

Merged
merged 11 commits into from
Mar 25, 2021
Merged

VM support fixes #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
78d75a0
clustermesh: Relax cluster validation on Enable
jrajahalme Mar 12, 2021
0fd940e
clustermesh: Add support for ClusterIP
jrajahalme Mar 11, 2021
2254d0c
clustermesh: Error out if service type is not specified or LoadBalanc…
jrajahalme Mar 10, 2021
efb399c
clustermesh: Set CNs to etcd user account names
jrajahalme Mar 10, 2021
843200b
clustermesh: Add support for external-workload cert
jrajahalme Mar 9, 2021
17ebab0
install: Auto-detect datapath mode for Kind
jrajahalme Mar 12, 2021
077d821
clustermesh: Fix status when clustermesh is not available
jrajahalme Mar 16, 2021
e5d594e
clustermesh: Add subcommand 'external-workload' (alias 'vm')
jrajahalme Mar 12, 2021
b3f7f03
clustermesh: Fail external workload install generation if Cilium has …
jrajahalme Mar 19, 2021
baaa86e
clustermesh: Allow VM install script to run as root, do not assume sy…
jrajahalme Mar 19, 2021
98283cd
clustermesh: Fix error capitalization and typos
jrajahalme Mar 22, 2021
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
44 changes: 42 additions & 2 deletions clustermesh/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (k *K8sClusterMesh) createClusterMeshAdminCertificate(ctx context.Context)
"localhost",
"127.0.0.1",
},
CN: "ClusterMesh Admin",
CN: "root",
}

signConf := &config.Signing{
Expand Down Expand Up @@ -112,7 +112,7 @@ func (k *K8sClusterMesh) createClusterMeshClientCertificate(ctx context.Context)
Names: []csr.Name{{C: "US", ST: "San Francisco", L: "CA"}},
KeyRequest: csr.NewKeyRequest(),
Hosts: []string{""},
CN: "ClusterMesh Client",
CN: "remote",
}

signConf := &config.Signing{
Expand Down Expand Up @@ -143,11 +143,48 @@ func (k *K8sClusterMesh) createClusterMeshClientCertificate(ctx context.Context)
return nil
}

func (k *K8sClusterMesh) createClusterMeshExternalWorkloadCertificate(ctx context.Context) error {
certReq := &csr.CertificateRequest{
Names: []csr.Name{{C: "US", ST: "San Francisco", L: "CA"}},
KeyRequest: csr.NewKeyRequest(),
Hosts: []string{""},
CN: "externalworkload",
}

signConf := &config.Signing{
Default: &config.SigningProfile{Expiry: 5 * 365 * 24 * time.Hour},
Profiles: map[string]*config.SigningProfile{
defaults.ClusterMeshExternalWorkloadSecretName: {
Expiry: 5 * 365 * 24 * time.Hour,
Usage: []string{"signing", "key encipherment", "server auth", "client auth"},
},
},
}

cert, key, err := k.certManager.GenerateCertificate(defaults.ClusterMeshExternalWorkloadSecretName, certReq, signConf)
if err != nil {
return fmt.Errorf("unable to generate certificate %s: %w", defaults.ClusterMeshExternalWorkloadSecretName, err)
}

data := map[string][]byte{
defaults.ClusterMeshExternalWorkloadSecretCertName: cert,
defaults.ClusterMeshExternalWorkloadSecretKeyName: key,
}

_, err = k.client.CreateSecret(ctx, k.params.Namespace, k8s.NewSecret(defaults.ClusterMeshExternalWorkloadSecretName, k.params.Namespace, data), metav1.CreateOptions{})
if err != nil {
return fmt.Errorf("unable to create secret %s/%s: %w", k.params.Namespace, defaults.ClusterMeshExternalWorkloadSecretName, err)
}

return nil
}

func (k *K8sClusterMesh) deleteCertificates(ctx context.Context) error {
k.Log("🔥 Deleting ClusterMesh certificates...")
k.client.DeleteSecret(ctx, k.params.Namespace, defaults.ClusterMeshServerSecretName, metav1.DeleteOptions{})
k.client.DeleteSecret(ctx, k.params.Namespace, defaults.ClusterMeshAdminSecretName, metav1.DeleteOptions{})
k.client.DeleteSecret(ctx, k.params.Namespace, defaults.ClusterMeshClientSecretName, metav1.DeleteOptions{})
k.client.DeleteSecret(ctx, k.params.Namespace, defaults.ClusterMeshExternalWorkloadSecretName, metav1.DeleteOptions{})
return nil
}

Expand Down Expand Up @@ -181,6 +218,9 @@ func (k *K8sClusterMesh) installCertificates(ctx context.Context) error {
if err := k.createClusterMeshClientCertificate(ctx); err != nil {
return err
}
if err := k.createClusterMeshExternalWorkloadCertificate(ctx); err != nil {
return err
}

return nil
}
Loading