fix: AnalysisRunMetadata should be a pointer to avoid empty bracket creations in k8s (#4446)

* AnalysisRunMetadata should be a pointer to avoid empty bracket creations in etcd

Signed-off-by: Zach Aller <[email protected]>

* AnalysisRunMetadata should be a pointer to avoid empty bracket creations in etcd

Signed-off-by: Zach Aller <[email protected]>

* fix tests

Signed-off-by: Zach Aller <[email protected]>

* AnalysisRunMetadata should be a pointer to avoid empty bracket creations in etcd

Signed-off-by: Zach Aller <[email protected]>

* AnalysisRunMetadata should be a pointer to avoid empty bracket creations in etcd

Signed-off-by: Zach Aller <[email protected]>

* fix tests

Signed-off-by: Zach Aller <[email protected]>

* codegen

Signed-off-by: Zach Aller <[email protected]>

---------

Signed-off-by: Zach Aller <[email protected]>

Author: zachaller

pkg/apis/rollouts/v1alpha1/generated.pb.go

@@ -778,7 +778,7 @@ type RolloutAnalysis struct {
 	MeasurementRetention []MeasurementRetention `json:"measurementRetention,omitempty" patchStrategy:"merge" patchMergeKey:"metricName" protobuf:"bytes,4,rep,name=measurementRetention"`
 	// AnalysisRunMetadata labels and annotations that will be added to the AnalysisRuns
 	// +optional
-	AnalysisRunMetadata AnalysisRunMetadata `json:"analysisRunMetadata,omitempty" protobuf:"bytes,5,opt,name=analysisRunMetadata"`
+	AnalysisRunMetadata *AnalysisRunMetadata `json:"analysisRunMetadata,omitempty" protobuf:"bytes,5,opt,name=analysisRunMetadata"`
 }
 
 type AnalysisTemplateRef struct {

pkg/apis/rollouts/v1alpha1/openapi_generated.go

@@ -460,19 +460,22 @@ func (c *rolloutContext) newAnalysisRunFromRollout(rolloutAnalysis *v1alpha1.Rol
 		return nil, err
 	}
 	runLabels := labels
-	for k, v := range rolloutAnalysis.AnalysisRunMetadata.Labels {
-		runLabels[k] = v
+	if rolloutAnalysis.AnalysisRunMetadata != nil {
+		for k, v := range rolloutAnalysis.AnalysisRunMetadata.Labels {
+			runLabels[k] = v
+		}
 	}
-
 	for k, v := range c.rollout.Spec.Selector.MatchLabels {
 		runLabels[k] = v
 	}
 
 	runAnnotations := map[string]string{
 		annotations.RevisionAnnotation: revision,
 	}
-	for k, v := range rolloutAnalysis.AnalysisRunMetadata.Annotations {
-		runAnnotations[k] = v
+	if rolloutAnalysis.AnalysisRunMetadata != nil {
+		for k, v := range rolloutAnalysis.AnalysisRunMetadata.Annotations {
+			runAnnotations[k] = v
+		}
 	}
 	run, err = analysisutil.NewAnalysisRunFromTemplates(templates, clusterTemplates, args, rolloutAnalysis.DryRun, rolloutAnalysis.MeasurementRetention,
 		runLabels, runAnnotations, name, "", c.rollout.Namespace)

pkg/apis/rollouts/v1alpha1/types.go

@@ -2725,7 +2725,7 @@ func TestCreateAnalysisRunWithCustomAnalysisRunMetadataAndROCopyLabels(t *testin
 					TemplateName: at.Name,
 				},
 			},
-			AnalysisRunMetadata: v1alpha1.AnalysisRunMetadata{
+			AnalysisRunMetadata: &v1alpha1.AnalysisRunMetadata{
 				Annotations: map[string]string{"testAnnotationKey": "testAnnotationValue"},
 				Labels:      map[string]string{"testLabelKey": "testLabelValue"},
 			},