diff --git a/.chloggen/fix-ingress-type-default.yaml b/.chloggen/fix-ingress-type-default.yaml new file mode 100755 index 000000000..7097693cc --- /dev/null +++ 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 index 75f51117b..439edd80a 100644 --- 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 index a34011a10..6ec9eaffb 100644 --- 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 index a34011a10..6ec9eaffb 100644 --- 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 index 6212f3001..9b156e754 100644 --- 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: