Merge pull request #2122 from jan--f/alert-relabel-no-ptr-list

alert-relabel list should not be a pointer

Author: openshift-merge-bot[bot]

monitoring/v1/types.go

@@ -67,8 +67,8 @@ type AlertingRuleList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 
 	// items is a list of AlertingRule objects.
-	// +required
-	Items []AlertingRule `json:"items"`
+	// +optional
+	Items []AlertingRule `json:"items,omitempty"`
 }
 
 // AlertingRuleSpec is the desired state of an AlertingRule resource.
@@ -285,9 +285,8 @@ type AlertRelabelConfigList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 
 	// items is a list of AlertRelabelConfigs.
-	// +kubebuilder:validation:MinItems:=1
-	// +required
-	Items []*AlertRelabelConfig `json:"items"`
+	// +optional
+	Items []AlertRelabelConfig `json:"items,omitempty"`
 }
 
 // LabelName is a valid Prometheus label name which may only contain ASCII

monitoring/v1/zz_generated.deepcopy.go

@@ -23432,9 +23432,6 @@
     "com.github.openshift.api.monitoring.v1.AlertRelabelConfigList": {
       "description": "AlertRelabelConfigList is a list of AlertRelabelConfigs.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).",
       "type": "object",
-      "required": [
-        "items"
-      ],
       "properties": {
         "apiVersion": {
           "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
@@ -23444,6 +23441,7 @@
           "description": "items is a list of AlertRelabelConfigs.",
           "type": "array",
           "items": {
+            "default": {},
             "$ref": "#/definitions/com.github.openshift.api.monitoring.v1.AlertRelabelConfig"
           }
         },
@@ -23524,9 +23522,6 @@
     "com.github.openshift.api.monitoring.v1.AlertingRuleList": {
       "description": "AlertingRuleList is a list of AlertingRule objects.\n\nCompatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).",
       "type": "object",
-      "required": [
-        "items"
-      ],
       "properties": {
         "apiVersion": {
           "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",