scrapeconfig: support more discovery mechanisms

Author: AndrewChubatiuk

api/operator/v1beta1/vmscrapeconfig_types.go

@@ -28,6 +28,7 @@ aliases:
 * FEATURE: [vmprobe](https://docs.victoriametrics.com/operator/resources/vmprobe/): added `spec.targets.kubernetes` property, that allows to configure probe for `ingress`, `pod` and `service` roles. See [#1078](https://github.com/VictoriaMetrics/operator/issues/1078) and [#1716](https://github.com/VictoriaMetrics/operator/issues/1716).
 * FEATURE: [vmscrapeconfig](https://docs.victoriametrics.com/operator/resources/vmscrapeconfig/): added nomad_sd_config support. See [#1809](https://github.com/VictoriaMetrics/operator/issues/1809).
 * FEATURE: [vmoperator](https://docs.victoriametrics.com/operator/): support VPA for vmcluster, vtcluster, vlcluster and vmauth. See [#1795](https://github.com/VictoriaMetrics/operator/issues/1795). Thanks to the @dctrwatson for the pull request [#1803](https://github.com/VictoriaMetrics/operator/pull/1803).
+* FEATURE: [vmscrapeconfig](https://docs.victoriametrics.com/operator/resources/vmscrapeconfig/): added kuma_sd_config, hetzner_sd_config, eureka_sd_confiig, puppetdb_sd_config and vultr_sd_config support.
 
 * BUGFIX: [vmagent](https://docs.victoriametrics.com/operator/resources/vmagent/): previously the operator requested `nodes/proxy` RBAC permissions even though vmagent did not use them; now this permission is no longer required, reducing the default privilege footprint for users running vmagent. See [#1753](https://github.com/VictoriaMetrics/operator/issues/1753).
 * BUGFIX: [vmalert](https://docs.victoriametrics.com/operator/resources/vmalert/): throw error if no notifiers found. See [#1757](https://github.com/VictoriaMetrics/operator/issues/1757).

api/operator/v1beta1/zz_generated.deepcopy.go

@@ -193,21 +193,25 @@ func TestConvertScrapeConfig(t *testing.T) {
 				HTTPSDConfigs: []vmv1beta1.HTTPSDConfig{
 					{
 						URL: "http://test1.com",
-						Authorization: &vmv1beta1.Authorization{
-							Type: "Bearer",
-							Credentials: &corev1.SecretKeySelector{
-								Key: "token",
+						HTTPSDOptions: vmv1beta1.HTTPSDOptions{
+							Authorization: &vmv1beta1.Authorization{
+								Type: "Bearer",
+								Credentials: &corev1.SecretKeySelector{
+									Key: "token",
+								},
 							},
 						},
 					},
 					{
 						URL: "http://test2.com",
-						TLSConfig: &vmv1beta1.TLSConfig{
-							CA:                 vmv1beta1.SecretOrConfigMap{ConfigMap: &corev1.ConfigMapKeySelector{Key: "ca.crt"}},
-							Cert:               vmv1beta1.SecretOrConfigMap{Secret: &corev1.SecretKeySelector{Key: "cert.pem"}},
-							KeySecret:          &corev1.SecretKeySelector{Key: "key"},
-							ServerName:         "test",
-							InsecureSkipVerify: true,
+						HTTPSDOptions: vmv1beta1.HTTPSDOptions{
+							TLSConfig: &vmv1beta1.TLSConfig{
+								CA:                 vmv1beta1.SecretOrConfigMap{ConfigMap: &corev1.ConfigMapKeySelector{Key: "ca.crt"}},
+								Cert:               vmv1beta1.SecretOrConfigMap{Secret: &corev1.SecretKeySelector{Key: "cert.pem"}},
+								KeySecret:          &corev1.SecretKeySelector{Key: "key"},
+								ServerName:         "test",
+								InsecureSkipVerify: true,
+							},
 						},
 					},
 				},
@@ -295,7 +299,7 @@ func TestConvertScrapeConfig(t *testing.T) {
 						Name:   "f1",
 						Values: []string{"1"},
 					}},
-					Port: ptr.To(80),
+					Port: ptr.To[int32](80),
 				}},
 			},
 		},
@@ -347,7 +351,7 @@ func TestConvertScrapeConfig(t *testing.T) {
 					Project:      "eu-project",
 					Zone:         vmv1beta1.StringOrArray{"zone-1"},
 					TagSeparator: ptr.To(""),
-					Port:         ptr.To(80),
+					Port:         ptr.To[int32](80),
 				}},
 			},
 		},
@@ -437,21 +441,25 @@ func TestConvertScrapeConfig(t *testing.T) {
 						Server:     "https://nomad.example.com:4646",
 						Namespace:  ptr.To("default"),
 						AllowStale: ptr.To(true),
-						Authorization: &vmv1beta1.Authorization{
-							Credentials: &corev1.SecretKeySelector{
-								LocalObjectReference: corev1.LocalObjectReference{Name: "nomad-secret"},
-								Key:                  "NOMAD_TOKEN",
+						HTTPSDOptions: vmv1beta1.HTTPSDOptions{
+							Authorization: &vmv1beta1.Authorization{
+								Credentials: &corev1.SecretKeySelector{
+									LocalObjectReference: corev1.LocalObjectReference{Name: "nomad-secret"},
+									Key:                  "NOMAD_TOKEN",
+								},
 							},
 						},
 					},
 					{
 						Server:     "https://nomad.example.com:4646",
 						Namespace:  ptr.To("staging"),
 						AllowStale: ptr.To(true),
-						Authorization: &vmv1beta1.Authorization{
-							Credentials: &corev1.SecretKeySelector{
-								LocalObjectReference: corev1.LocalObjectReference{Name: "nomad-secret"},
-								Key:                  "NOMAD_TOKEN",
+						HTTPSDOptions: vmv1beta1.HTTPSDOptions{
+							Authorization: &vmv1beta1.Authorization{
+								Credentials: &corev1.SecretKeySelector{
+									LocalObjectReference: corev1.LocalObjectReference{Name: "nomad-secret"},
+									Key:                  "NOMAD_TOKEN",
+								},
 							},
 						},
 					},
@@ -515,18 +523,20 @@ func TestConvertScrapeConfig(t *testing.T) {
 		want: vmv1beta1.VMScrapeConfig{
 			Spec: vmv1beta1.VMScrapeConfigSpec{
 				NomadSDConfigs: []vmv1beta1.NomadSDConfig{{
-					Server:          "https://nomad.example.com:4646",
-					Namespace:       ptr.To("prod"),
-					Region:          ptr.To("us-west-1"),
-					TagSeparator:    ptr.To(","),
-					AllowStale:      ptr.To(true),
-					FollowRedirects: ptr.To(true),
-					BasicAuth: &vmv1beta1.BasicAuth{
-						Username: corev1.SecretKeySelector{Key: "user"},
-						Password: corev1.SecretKeySelector{Key: "pass"},
-					},
-					TLSConfig: &vmv1beta1.TLSConfig{
-						InsecureSkipVerify: true,
+					Server:       "https://nomad.example.com:4646",
+					Namespace:    ptr.To("prod"),
+					Region:       ptr.To("us-west-1"),
+					TagSeparator: ptr.To(","),
+					AllowStale:   ptr.To(true),
+					HTTPSDOptions: vmv1beta1.HTTPSDOptions{
+						FollowRedirects: ptr.To(true),
+						BasicAuth: &vmv1beta1.BasicAuth{
+							Username: corev1.SecretKeySelector{Key: "user"},
+							Password: corev1.SecretKeySelector{Key: "pass"},
+						},
+						TLSConfig: &vmv1beta1.TLSConfig{
+							InsecureSkipVerify: true,
+						},
 					},
 				}},
 			},