Merge pull request #12714 from nrb/fix-metadata-kind

🌱 Allow metadata.yaml's Kind to be empty

Author: k8s-ci-robot

cmd/clusterctl/client/repository/metadata_client.go

@@ -113,7 +113,9 @@ func validateMetadata(metadata *clusterctlv1.Metadata, providerLabel string) err
 			metadata.APIVersion, providerLabel, clusterctlv1.GroupVersion.String())
 	}
 
-	if metadata.Kind != "Metadata" {
+	// v1.11 started enforcing the Metadata Kind, but several providers did not actually have the field serialized.
+	// Ratchet validation so that an empty Kind is accepted.
+	if metadata.Kind != "Metadata" && metadata.Kind != "" {
 		return errors.Errorf("invalid provider metadata: unexpected kind %q for provider %s (expected \"Metadata\")",
 			metadata.Kind, providerLabel)
 	}

cmd/clusterctl/client/repository/metadata_client_test.go

@@ -188,6 +188,20 @@ func Test_validateMetadata(t *testing.T) {
 			wantErr:       true,
 			errMessage:    "invalid provider metadata: unexpected kind \"WrongKind\" for provider infra-test (expected \"Metadata\")",
 		},
+		{
+			name: "empty kind passes validation",
+			metadata: &clusterctlv1.Metadata{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: clusterctlv1.GroupVersion.String(),
+					Kind:       "",
+				},
+				ReleaseSeries: []clusterctlv1.ReleaseSeries{
+					{Major: 1, Minor: 0, Contract: "v1beta1"},
+				},
+			},
+			providerLabel: "infra-test",
+			wantErr:       false,
+		},
 		{
 			name: "empty releaseSeries",
 			metadata: &clusterctlv1.Metadata{