Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 30 additions & 1 deletion cmd/clusterctl/client/repository/metadata_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,36 @@ func (f *metadataClient) Get(ctx context.Context) (*clusterctlv1.Metadata, error
return nil, errors.Wrapf(err, "error decoding %q for provider %q", metadataFile, f.provider.ManifestLabel())
}

//TODO: consider if to add metadata validation (TBD)
if err := validateMetadata(obj, f.provider.ManifestLabel()); err != nil {
return nil, err
}

return obj, nil
}

// validateMetadata validates the metadata object structure.
//
// It checks if:
// 1. The metadata has the correct apiVersion and kind.
// 2. The metadata has at least one release series.
//
// Note: Version matching against releaseSeries is done later in `installer.go`.
func validateMetadata(metadata *clusterctlv1.Metadata, providerLabel string) error {
// Check if metadata has the correct apiVersion and kind
if metadata.APIVersion != clusterctlv1.GroupVersion.String() {
return errors.Errorf("invalid provider metadata: unexpected apiVersion %q for provider %s (expected %q)",
metadata.APIVersion, providerLabel, clusterctlv1.GroupVersion.String())
}

if metadata.Kind != "Metadata" {
return errors.Errorf("invalid provider metadata: unexpected kind %q for provider %s (expected \"Metadata\")",
metadata.Kind, providerLabel)
}

// Check if metadata has at least one release series
if len(metadata.ReleaseSeries) == 0 {
return errors.Errorf("invalid provider metadata: releaseSeries is empty in metadata.yaml for provider %s", providerLabel)
}

return nil
}
82 changes: 82 additions & 0 deletions cmd/clusterctl/client/repository/metadata_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,85 @@ func Test_metadataClient_Get(t *testing.T) {
})
}
}

func Test_validateMetadata(t *testing.T) {
tests := []struct {
name string
metadata *clusterctlv1.Metadata
providerLabel string
wantErr bool
errMessage string
}{
{
name: "valid metadata",
metadata: &clusterctlv1.Metadata{
TypeMeta: metav1.TypeMeta{
APIVersion: clusterctlv1.GroupVersion.String(),
Kind: "Metadata",
},
ReleaseSeries: []clusterctlv1.ReleaseSeries{
{Major: 1, Minor: 0, Contract: "v1beta1"},
},
},
providerLabel: "infra-test",
wantErr: false,
},
{
name: "invalid apiVersion",
metadata: &clusterctlv1.Metadata{
TypeMeta: metav1.TypeMeta{
APIVersion: "wrong.group/v1",
Kind: "Metadata",
},
ReleaseSeries: []clusterctlv1.ReleaseSeries{
{Major: 1, Minor: 0, Contract: "v1beta1"},
},
},
providerLabel: "infra-test",
wantErr: true,
errMessage: "invalid provider metadata: unexpected apiVersion \"wrong.group/v1\" for provider infra-test (expected \"clusterctl.cluster.x-k8s.io/v1alpha3\")",
},
{
name: "invalid kind",
metadata: &clusterctlv1.Metadata{
TypeMeta: metav1.TypeMeta{
APIVersion: clusterctlv1.GroupVersion.String(),
Kind: "WrongKind",
},
ReleaseSeries: []clusterctlv1.ReleaseSeries{
{Major: 1, Minor: 0, Contract: "v1beta1"},
},
},
providerLabel: "infra-test",
wantErr: true,
errMessage: "invalid provider metadata: unexpected kind \"WrongKind\" for provider infra-test (expected \"Metadata\")",
},
{
name: "empty releaseSeries",
metadata: &clusterctlv1.Metadata{
TypeMeta: metav1.TypeMeta{
APIVersion: clusterctlv1.GroupVersion.String(),
Kind: "Metadata",
},
ReleaseSeries: []clusterctlv1.ReleaseSeries{},
},
providerLabel: "infra-test",
wantErr: true,
errMessage: "invalid provider metadata: releaseSeries is empty in metadata.yaml for provider infra-test",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
g := NewWithT(t)

err := validateMetadata(tt.metadata, tt.providerLabel)
if tt.wantErr {
g.Expect(err).To(HaveOccurred())
g.Expect(err.Error()).To(ContainSubstring(tt.errMessage))
return
}
g.Expect(err).ToNot(HaveOccurred())
})
}
}
15 changes: 15 additions & 0 deletions docs/book/src/developer/providers/contracts/clusterctl.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,21 @@ releaseSeries:
contract: v1alpha2
```

#### Validation Rules

Starting from clusterctl v1.11, the metadata YAML file is subject to strict validation to ensure consistency and prevent configuration errors. The following validation rules are enforced:

1. **apiVersion**: Must be set to `clusterctl.cluster.x-k8s.io/v1alpha3`
* This ensures compatibility with the current clusterctl metadata format

2. **kind**: Must be set to `Metadata`
* This identifies the resource type correctly

3. **releaseSeries**: Must contain at least one entry
* This ensures providers properly document their version compatibility

These validation rules help catch configuration issues early and provide clear error messages to assist in troubleshooting.

<aside class="note">

<h1> Note on user experience</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,15 @@ TODO

TODO

### clusterctl

- **Stricter validation for provider metadata**: clusterctl now enforces validation rules when reading provider metadata files to ensure they are properly formatted and contain required information. The following validation rules are now enforced:
- `apiVersion` must be set to `clusterctl.cluster.x-k8s.io/v1alpha3`
- `kind` must be set to `Metadata`
- `releaseSeries` must contain at least one entry

These changes help surface mis-shaped metadata early and make failures easier to troubleshoot. Providers with invalid metadata.yaml files will need to update them to comply with these validation rules.

## Deprecations

- v1beta1 API version is deprecated and it will be removed tentatively in August 2026
Expand Down
Loading