diff --git a/api/datadoghq/v1alpha1/datadoginstrumentation_types.go b/api/datadoghq/v1alpha1/datadoginstrumentation_types.go index dc8c502302..d999fb1e45 100644 --- a/api/datadoghq/v1alpha1/datadoginstrumentation_types.go +++ b/api/datadoghq/v1alpha1/datadoginstrumentation_types.go @@ -33,10 +33,9 @@ type DatadogInstrumentationCheckConfig struct { // Integration is the Datadog integration name, for example redisdb. Integration string `json:"integration"` - // ContainerImage identifies container image names this check applies to. + // ContainerName identifies the container name this check applies to. // +optional - // +listType=set - ContainerImage []string `json:"containerImage,omitempty"` + ContainerName string `json:"containerName,omitempty"` // InitConfig is the integration-specific Autodiscovery init_config payload. // +optional diff --git a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go index 7b1e7cce37..17cf0f4d31 100644 --- a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go +++ b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go @@ -868,11 +868,6 @@ func (in *DatadogInstrumentation) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DatadogInstrumentationCheckConfig) DeepCopyInto(out *DatadogInstrumentationCheckConfig) { *out = *in - if in.ContainerImage != nil { - in, out := &in.ContainerImage, &out.ContainerImage - *out = make([]string, len(*in)) - copy(*out, *in) - } in.InitConfig.DeepCopyInto(&out.InitConfig) if in.Instances != nil { in, out := &in.Instances, &out.Instances diff --git a/bundle/manifests/datadoghq.com_datadoginstrumentations.yaml b/bundle/manifests/datadoghq.com_datadoginstrumentations.yaml index c70c3fd8f0..b8289ad8b4 100644 --- a/bundle/manifests/datadoghq.com_datadoginstrumentations.yaml +++ b/bundle/manifests/datadoghq.com_datadoginstrumentations.yaml @@ -66,13 +66,10 @@ spec: description: DatadogInstrumentationCheckConfig defines an Autodiscovery check configuration. properties: - containerImage: - description: ContainerImage identifies container image names + containerName: + description: ContainerName identifies the container name this check applies to. - items: - type: string - type: array - x-kubernetes-list-type: set + type: string initConfig: description: InitConfig is the integration-specific Autodiscovery init_config payload. diff --git a/config/crd/bases/v1/datadoghq.com_datadoginstrumentations.yaml b/config/crd/bases/v1/datadoghq.com_datadoginstrumentations.yaml index eaa890fc78..9f23ab26eb 100644 --- a/config/crd/bases/v1/datadoghq.com_datadoginstrumentations.yaml +++ b/config/crd/bases/v1/datadoghq.com_datadoginstrumentations.yaml @@ -62,12 +62,9 @@ spec: items: description: DatadogInstrumentationCheckConfig defines an Autodiscovery check configuration. properties: - containerImage: - description: ContainerImage identifies container image names this check applies to. - items: - type: string - type: array - x-kubernetes-list-type: set + containerName: + description: ContainerName identifies the container name this check applies to. + type: string initConfig: description: InitConfig is the integration-specific Autodiscovery init_config payload. type: object diff --git a/config/crd/bases/v1/datadoghq.com_datadoginstrumentations_v1alpha1.json b/config/crd/bases/v1/datadoghq.com_datadoginstrumentations_v1alpha1.json index 73bdf1b9e7..650b2b7dc7 100644 --- a/config/crd/bases/v1/datadoghq.com_datadoginstrumentations_v1alpha1.json +++ b/config/crd/bases/v1/datadoghq.com_datadoginstrumentations_v1alpha1.json @@ -27,13 +27,9 @@ "additionalProperties": false, "description": "DatadogInstrumentationCheckConfig defines an Autodiscovery check configuration.", "properties": { - "containerImage": { - "description": "ContainerImage identifies container image names this check applies to.", - "items": { - "type": "string" - }, - "type": "array", - "x-kubernetes-list-type": "set" + "containerName": { + "description": "ContainerName identifies the container name this check applies to.", + "type": "string" }, "initConfig": { "description": "InitConfig is the integration-specific Autodiscovery init_config payload.", diff --git a/config/samples/datadoghq_v1alpha1_datadoginstrumentation.yaml b/config/samples/datadoghq_v1alpha1_datadoginstrumentation.yaml index 11cf81c1ac..0466831df5 100644 --- a/config/samples/datadoghq_v1alpha1_datadoginstrumentation.yaml +++ b/config/samples/datadoghq_v1alpha1_datadoginstrumentation.yaml @@ -10,8 +10,7 @@ spec: config: checks: - integration: openmetrics - containerImage: - - sample-app + containerName: sample-app initConfig: {} instances: - openmetrics_endpoint: "http://%%host%%:8080/metrics"