-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: use bootstrap data secret names
Fixes #38 Fixes: * bootstrap provider now uses proper passed in bootstrap data secret name instead of hardcoding it in the code * try to remove finalizer early, so that talosconfig can be deleted even if the owner is gone Tests: * existing tests refactored for readability * added test for full cluster config * added test for custom cluster settings * added test for config patches * talosVersion field is now passed to trigger proper generation * addressed test stability by waiting properly for namespace teardown Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
- Loading branch information
Showing
9 changed files
with
373 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| package integration | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/AlekSi/pointer" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| bootstrapv1alpha3 "github.com/talos-systems/cluster-api-bootstrap-provider-talos/api/v1alpha3" | ||
| talosclientconfig "github.com/talos-systems/talos/pkg/machinery/client/config" | ||
| machineconfig "github.com/talos-systems/talos/pkg/machinery/config" | ||
| "github.com/talos-systems/talos/pkg/machinery/config/configloader" | ||
| "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate" | ||
| "gopkg.in/yaml.v2" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| // assertClientConfig checks that Talos client config as part of TalosConfig resource is valid. | ||
| func assertClientConfig(t *testing.T, talosConfig *bootstrapv1alpha3.TalosConfig) { | ||
| t.Helper() | ||
|
|
||
| clientConfig, err := talosclientconfig.FromString(talosConfig.Status.TalosConfig) | ||
| require.NoError(t, err) | ||
| validateClientConfig(t, clientConfig) | ||
| } | ||
|
|
||
| // assertMachineConfiguration checks that generated bootstrap data is a valid Talos machine configuration. | ||
| func assertMachineConfiguration(ctx context.Context, t *testing.T, c client.Client, talosConfig *bootstrapv1alpha3.TalosConfig) machineconfig.Provider { | ||
| var bootstrapDataSecret corev1.Secret | ||
|
|
||
| key := types.NamespacedName{ | ||
| Namespace: talosConfig.Namespace, | ||
| Name: pointer.GetString(talosConfig.Status.DataSecretName), | ||
| } | ||
| require.NoError(t, c.Get(ctx, key, &bootstrapDataSecret)) | ||
|
|
||
| assert.Len(t, bootstrapDataSecret.Data, 1) | ||
|
|
||
| provider, err := configloader.NewFromBytes(bootstrapDataSecret.Data["value"]) | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = provider.Validate(runtimeMode{false}, machineconfig.WithStrict()) | ||
| assert.NoError(t, err) | ||
|
|
||
| return provider | ||
| } | ||
|
|
||
| // assertClusterCA checks that generated cluster CA secret matches secrets in machine config (machine config from controlplane node required). | ||
| func assertClusterCA(ctx context.Context, t *testing.T, c client.Client, cluster *capiv1.Cluster, provider machineconfig.Provider) { | ||
| var caSecret corev1.Secret | ||
|
|
||
| key := types.NamespacedName{ | ||
| Namespace: cluster.Namespace, | ||
| Name: cluster.Name + "-ca", | ||
| } | ||
| require.NoError(t, c.Get(ctx, key, &caSecret)) | ||
|
|
||
| assert.Len(t, caSecret.Data, 2) | ||
| assert.Equal(t, corev1.SecretTypeOpaque, caSecret.Type) // TODO why not SecretTypeTLS? | ||
|
|
||
| assert.NotEmpty(t, caSecret.Data[corev1.TLSCertKey]) | ||
| assert.NotEmpty(t, caSecret.Data[corev1.TLSPrivateKeyKey]) | ||
|
|
||
| assert.Equal(t, provider.Cluster().CA().Crt, caSecret.Data[corev1.TLSCertKey]) | ||
| assert.Equal(t, provider.Cluster().CA().Key, caSecret.Data[corev1.TLSPrivateKeyKey]) | ||
| } | ||
|
|
||
| // assertControllerSecret checks that persisted controller secret (used to bootstrap more machines with same secrets) maches generated controlplane config. | ||
| func assertControllerSecret(ctx context.Context, t *testing.T, c client.Client, cluster *capiv1.Cluster, provider machineconfig.Provider) { | ||
| var talosSecret corev1.Secret | ||
| key := types.NamespacedName{ | ||
| Namespace: cluster.Namespace, | ||
| Name: cluster.Name + "-talos", | ||
| } | ||
| require.NoError(t, c.Get(ctx, key, &talosSecret)) | ||
|
|
||
| assert.Len(t, talosSecret.Data, 3) | ||
| assert.NotEmpty(t, talosSecret.Data["certs"]) | ||
| assert.NotEmpty(t, talosSecret.Data["kubeSecrets"]) | ||
| assert.NotEmpty(t, talosSecret.Data["trustdInfo"]) | ||
|
|
||
| // cross-checks | ||
| secretsBundle := generate.NewSecretsBundleFromConfig(generate.NewClock(), provider) | ||
|
|
||
| var certs generate.Certs | ||
| require.NoError(t, yaml.Unmarshal(talosSecret.Data["certs"], &certs)) | ||
| assert.NotEmpty(t, certs.Admin) | ||
| certs.Admin = nil | ||
| assert.Equal(t, secretsBundle.Certs, &certs) | ||
|
|
||
| var kubeSecrets generate.Secrets | ||
| require.NoError(t, yaml.Unmarshal(talosSecret.Data["kubeSecrets"], &kubeSecrets)) | ||
| assert.Equal(t, secretsBundle.Secrets, &kubeSecrets) | ||
|
|
||
| var trustdInfo generate.TrustdInfo | ||
| require.NoError(t, yaml.Unmarshal(talosSecret.Data["trustdInfo"], &trustdInfo)) | ||
| assert.Equal(t, secretsBundle.TrustdInfo, &trustdInfo) | ||
| } | ||
|
|
||
| // assertSameMachineConfigSecrets checks that control plane configs share same set of secrets. | ||
| func assertSameMachineConfigSecrets(ctx context.Context, t *testing.T, c client.Client, talosConfigs ...*bootstrapv1alpha3.TalosConfig) { | ||
| providers := make([]machineconfig.Provider, len(talosConfigs)) | ||
|
|
||
| for i := range providers { | ||
| providers[i] = assertMachineConfiguration(ctx, t, c, talosConfigs[i]) | ||
| } | ||
|
|
||
| secretsBundle0 := generate.NewSecretsBundleFromConfig(generate.NewClock(), providers[0]) | ||
|
|
||
| for _, provider := range providers[1:] { | ||
| assert.Equal(t, secretsBundle0, generate.NewSecretsBundleFromConfig(generate.NewClock(), provider)) | ||
| } | ||
| } | ||
|
|
||
| // assertCompatibleMachineConfigs checks that configs share same set of core secrets so that nodes can build a cluster. | ||
| func assertCompatibleMachineConfigs(ctx context.Context, t *testing.T, c client.Client, talosConfigs ...*bootstrapv1alpha3.TalosConfig) { | ||
| providers := make([]machineconfig.Provider, len(talosConfigs)) | ||
|
|
||
| for i := range providers { | ||
| providers[i] = assertMachineConfiguration(ctx, t, c, talosConfigs[i]) | ||
| } | ||
|
|
||
| checks := []func(p machineconfig.Provider) interface{}{ | ||
| func(p machineconfig.Provider) interface{} { return p.Machine().Security().Token() }, | ||
| // TODO: uncomment me with Talos 0.12: func(p machineconfig.Provider) interface{} { return p.Cluster().ID() }, | ||
| // TODO: uncomment me with Talos 0.12: func(p machineconfig.Provider) interface{} { return p.Cluster().Secret() }, | ||
| func(p machineconfig.Provider) interface{} { return p.Cluster().Endpoint().String() }, | ||
| func(p machineconfig.Provider) interface{} { return p.Cluster().Token().ID() }, | ||
| func(p machineconfig.Provider) interface{} { return p.Cluster().Token().Secret() }, | ||
| func(p machineconfig.Provider) interface{} { return p.Cluster().CA().Crt }, | ||
| } | ||
|
|
||
| for _, check := range checks { | ||
| value0 := check(providers[0]) | ||
|
|
||
| for _, provider := range providers[1:] { | ||
| assert.Equal(t, value0, check(provider)) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| package integration | ||
|
|
||
| // TalosVersion is set by the build process. | ||
| var TalosVersion string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.