Merge branch 'master' into fix_finalizer_cfg_drift

Baarsgaard · web-flow · commit 172cf5403975 · 2024-12-19T18:46:10.000+01:00
diff --git a/api/v1beta1/grafanacontactpoint_types.go b/api/v1beta1/grafanacontactpoint_types.go
@@ -45,7 +45,7 @@ type GrafanaContactPointSpec struct {
 	// +kubebuilder:validation:MaxItems=99
 	ValuesFrom []ValueFrom `json:"valuesFrom,omitempty"`
 
-	// +kubebuilder:validation:Enum=alertmanager;prometheus-alertmanager;dingding;discord;email;googlechat;kafka;line;opsgenie;pagerduty;pushover;sensugo;sensu;slack;teams;telegram;threema;victorops;webhook;wecom;hipchat;oncall
+	// +kubebuilder:validation:Enum=alertmanager;prometheus-alertmanager;dingding;discord;email;googlechat;kafka;line;opsgenie;pagerduty;pushover;sensugo;sensu;slack;teams;telegram;threema;victorops;webex;webhook;wecom;hipchat;oncall
 	Type string `json:"type,omitempty"`
 }
 
diff --git a/bundle/manifests/grafana.integreatly.org_grafanacontactpoints.yaml b/bundle/manifests/grafana.integreatly.org_grafanacontactpoints.yaml
@@ -122,6 +122,7 @@ spec:
                 - telegram
                 - threema
                 - victorops
+                - webex
                 - webhook
                 - wecom
                 - hipchat
diff --git a/config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml b/config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml
@@ -129,6 +129,7 @@ spec:
                 - telegram
                 - threema
                 - victorops
+                - webex
                 - webhook
                 - wecom
                 - hipchat
diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml
@@ -129,6 +129,7 @@ spec:
                 - telegram
                 - threema
                 - victorops
+                - webex
                 - webhook
                 - wecom
                 - hipchat
diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
@@ -445,6 +445,7 @@ spec:
                 - telegram
                 - threema
                 - victorops
+                - webex
                 - webhook
                 - wecom
                 - hipchat
diff --git a/docs/docs/api.md b/docs/docs/api.md
@@ -750,7 +750,7 @@ GrafanaContactPointSpec defines the desired state of GrafanaContactPoint
         <td>
           <br/>
           <br/>
-            <i>Enum</i>: alertmanager, prometheus-alertmanager, dingding, discord, email, googlechat, kafka, line, opsgenie, pagerduty, pushover, sensugo, sensu, slack, teams, telegram, threema, victorops, webhook, wecom, hipchat, oncall<br/>
+            <i>Enum</i>: alertmanager, prometheus-alertmanager, dingding, discord, email, googlechat, kafka, line, opsgenie, pagerduty, pushover, sensugo, sensu, slack, teams, telegram, threema, victorops, webex, webhook, wecom, hipchat, oncall<br/>
         </td>
         <td>false</td>
       </tr><tr>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ type GrafanaContactPointSpec struct {`
`45`	`45`	`// +kubebuilder:validation:MaxItems=99`
`46`	`46`	ValuesFrom []ValueFrom `json:"valuesFrom,omitempty"`
`47`	`47`
`48`		`- // +kubebuilder:validation:Enum=alertmanager;prometheus-alertmanager;dingding;discord;email;googlechat;kafka;line;opsgenie;pagerduty;pushover;sensugo;sensu;slack;teams;telegram;threema;victorops;webhook;wecom;hipchat;oncall`
	`48`	`+ // +kubebuilder:validation:Enum=alertmanager;prometheus-alertmanager;dingding;discord;email;googlechat;kafka;line;opsgenie;pagerduty;pushover;sensugo;sensu;slack;teams;telegram;threema;victorops;webex;webhook;wecom;hipchat;oncall`
`49`	`49`	Type string `json:"type,omitempty"`
`50`	`50`	`}`
`51`	`51`