update

Author: sbueringer

internal/contract/infrastructure_cluster_template.go

@@ -0,0 +1,51 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package contract
+
+import (
+	"sync"
+)
+
+// InfrastructureClusterTemplateContract encodes information about the Cluster API contract for InfrastructureClusterTemplate objects
+// like DockerClusterTemplates, AWSClusterTemplates, etc.
+type InfrastructureClusterTemplateContract struct{}
+
+var infrastructureClusterTemplate *InfrastructureClusterTemplateContract
+var onceInfrastructureClusterTemplate sync.Once
+
+// InfrastructureClusterTemplate provides access to the information about the Cluster API contract for InfrastructureClusterTemplate objects.
+func InfrastructureClusterTemplate() *InfrastructureClusterTemplateContract {
+	onceInfrastructureClusterTemplate.Do(func() {
+		infrastructureClusterTemplate = &InfrastructureClusterTemplateContract{}
+	})
+	return infrastructureClusterTemplate
+}
+
+// Template provides access to the template.
+func (c *InfrastructureClusterTemplateContract) Template() *InfrastructureClusterTemplateTemplate {
+	return &InfrastructureClusterTemplateTemplate{}
+}
+
+// InfrastructureClusterTemplateTemplate provides a helper struct for working with the template in an InfrastructureClusterTemplate..
+type InfrastructureClusterTemplateTemplate struct{}
+
+// Metadata provides access to the metadata of a template.
+func (c *InfrastructureClusterTemplateTemplate) Metadata() *Metadata {
+	return &Metadata{
+		path: Path{"spec", "template", "spec", "metadata"},
+	}
+}

test/e2e/clusterclass_rollout.go

@@ -265,13 +265,14 @@ func assertMetadataOnClusterObjects(ctx context.Context, clusterProxy framework.
 		clusterObjects := getClusterObjects(ctx, g, clusterProxy, cluster)
 
 		// InfrastructureCluster
+		infrastructureClusterTemplateTemplateMetadata := mustMetadata(contract.InfrastructureClusterTemplate().Template().Metadata().Get(clusterClassObjects.InfrastructureClusterTemplate))
 		g.Expect(clusterObjects.InfrastructureCluster.GetLabels()).To(BeEquivalentTo(
 			union(
 				map[string]string{
 					clusterv1.ClusterNameLabel:          cluster.Name,
 					clusterv1.ClusterTopologyOwnedLabel: "",
 				},
-				templateMetadata(clusterClassObjects.InfrastructureClusterTemplate).Labels,
+				infrastructureClusterTemplateTemplateMetadata.Labels,
 			),
 		))
 		g.Expect(clusterObjects.InfrastructureCluster.GetAnnotations()).To(BeEquivalentTo(
@@ -280,7 +281,7 @@ func assertMetadataOnClusterObjects(ctx context.Context, clusterProxy framework.
 					clusterv1.TemplateClonedFromGroupKindAnnotation: groupKind(clusterClass.Spec.Infrastructure.Ref),
 					clusterv1.TemplateClonedFromNameAnnotation:      clusterClass.Spec.Infrastructure.Ref.Name,
 				},
-				templateMetadata(clusterClassObjects.InfrastructureClusterTemplate).Annotations,
+				infrastructureClusterTemplateTemplateMetadata.Annotations,
 			),
 		))
 
@@ -307,8 +308,8 @@ func assertMetadataOnClusterObjects(ctx context.Context, clusterProxy framework.
 				templateMetadata(clusterClassObjects.ControlPlaneTemplate).Annotations,
 			),
 		))
-		controlPlaneMachineTemplateMetadata, err := contract.ControlPlane().MachineTemplate().Metadata().Get(clusterObjects.ControlPlane)
-		g.Expect(err).NotTo(HaveOccurred())
+
+		controlPlaneMachineTemplateMetadata := mustMetadata(contract.ControlPlane().MachineTemplate().Metadata().Get(clusterObjects.ControlPlane))
 		g.Expect(controlPlaneMachineTemplateMetadata.Labels).To(BeEquivalentTo(
 			union(
 				map[string]string{
@@ -672,7 +673,14 @@ func assertMetadataOnClusterObjects(ctx context.Context, clusterProxy framework.
 		}
 
 		By("All cluster objects have the right labels, annotations and selectors")
-	}, 10*time.Minute, 1*time.Second).Should(Succeed()) // FIXME: timeouts, look at actual rollout times
+	}, 10*time.Minute, 1*time.Second).Should(Succeed()) // FIXME: timeouts, look at actual rollout times => check if we should wait before calling this func for complete rollout (including nodes)
+}
+
+func mustMetadata(metadata *clusterv1.ObjectMeta, err error) *clusterv1.ObjectMeta {
+	if err != nil {
+		panic(err)
+	}
+	return metadata
 }
 
 func getMDTopology(cluster *clusterv1.Cluster, md *clusterv1.MachineDeployment) *clusterv1.MachineDeploymentTopology {