Fix default value for jaeger query ingress type (grafana#1055)

* Fix default value for jaeger query ingress type Signed-off-by: Israel Blancas <[email protected]> * Fix conflict Signed-off-by: Israel Blancas <[email protected]> --------- Signed-off-by: Israel Blancas <[email protected]>
tempooperatorbot · Oct 11, 2024 · 3084bc9 · 3084bc9
1 parent 900170b
commit 3084bc9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/.chloggen/fix-ingress-type-default.yaml b/.chloggen/fix-ingress-type-default.yaml
@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. tempostack, tempomonolithic, github action)
+component: tempostack
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: The default value for the IngressType type is now correctly "" (empty string). Previously, it was impossible to select it in tools like the OpenShift web console, what could cause some issues.
+
+# One or more tracking issues related to the change
+issues: [1054]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
diff --git a/apis/tempo/v1alpha1/ingress_types.go b/apis/tempo/v1alpha1/ingress_types.go
@@ -2,7 +2,8 @@ package v1alpha1
 
 type (
 	// IngressType represents how a service should be exposed (ingress vs route).
-	// +kubebuilder:validation:Enum=ingress;route
+	// +kubebuilder:validation:Enum=ingress;route;""
+	// +kubebuilder:default=""
 	IngressType string
 )
 

diff --git a/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/community/manifests/tempo.grafana.com_tempostacks.yaml
@@ -1431,6 +1431,7 @@ spec:
                             enum:
                             - ingress
                             - route
+                            - ""
                             type: string
                         type: object
                     required:
@@ -2443,6 +2444,7 @@ spec:
                                 enum:
                                 - ingress
                                 - route
+                                - ""
                                 type: string
                             type: object
                           monitorTab:

diff --git a/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml b/bundle/openshift/manifests/tempo.grafana.com_tempostacks.yaml
@@ -1431,6 +1431,7 @@ spec:
                             enum:
                             - ingress
                             - route
+                            - ""
                             type: string
                         type: object
                     required:
@@ -2443,6 +2444,7 @@ spec:
                                 enum:
                                 - ingress
                                 - route
+                                - ""
                                 type: string
                             type: object
                           monitorTab:

diff --git a/config/crd/bases/tempo.grafana.com_tempostacks.yaml b/config/crd/bases/tempo.grafana.com_tempostacks.yaml
@@ -1427,6 +1427,7 @@ spec:
                             enum:
                             - ingress
                             - route
+                            - ""
                             type: string
                         type: object
                     required:
@@ -2439,6 +2440,7 @@ spec:
                                 enum:
                                 - ingress
                                 - route
+                                - ""
                                 type: string
                             type: object
                           monitorTab: