fix(ingress): Fix contact ingress annotations being ignored

clevyr · Jul 20, 2024 · 769547c · 769547c
1 parent 713ac04
commit 769547c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/api/v1/monitor_types.go b/api/v1/monitor_types.go
@@ -165,9 +165,9 @@ type MonitorPOST struct {
 
 // MonitorContactRef attaches alert contacts. If blank, the default will be used.
 type MonitorContactRef struct {
-	corev1.LocalObjectReference `json:",inline"`
+	corev1.LocalObjectReference `json:",inline" mapstructure:",squash"`
 
-	MonitorContactCommon `json:",inline"`
+	MonitorContactCommon `json:",inline" mapstructure:",squash"`
 }
 
 type MonitorContactCommon struct {

diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress_controller.go
@@ -236,7 +236,6 @@ func (r *IngressReconciler) updateValues(ingress *networkingv1.Ingress, monitor
 			mapstructure.TextUnmarshallerHookFunc(),
 		),
 		ErrorUnused:      true,
-		TagName:          "json",
 		WeaklyTypedInput: true,
 		Result:           &monitor.Spec,
 	})