Added PodDNSConfig

Signed-off-by: Yuri Sa <[email protected]>

Author: yuriolisa

.chloggen/dotnet-instrumentation-command-flag.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note:  change dotnet instrumentation feature gate into command line flag --enable-dotnet-instrumentation
+
+# One or more tracking issues related to the change
+issues: [2582, 2671]
+
+# (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: 

apis/v1alpha1/convert.go

@@ -19,18 +19,20 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
+	appsv1 "k8s.io/api/apps/v1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	v1 "k8s.io/api/core/v1"
+	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 )
 
-func Test_V1Alpha1to2(t *testing.T) {
-	t.Run("valid config", func(t *testing.T) {
-		config := `---
+const collectorCfg = `---
 receivers:
   otlp:
     protocols:
@@ -48,9 +50,12 @@ service:
       processors: [resourcedetection]
       exporters: [otlp]
 `
+
+func Test_tov1beta1_config(t *testing.T) {
+	t.Run("valid config", func(t *testing.T) {
 		cfgV1 := OpenTelemetryCollector{
 			Spec: OpenTelemetryCollectorSpec{
-				Config: config,
+				Config: collectorCfg,
 				Args: map[string]string{
 					"test": "something",
 				},
@@ -64,7 +69,7 @@ service:
 
 		yamlCfg, err := yaml.Marshal(&cfgV2.Spec.Config)
 		assert.Nil(t, err)
-		assert.YAMLEq(t, config, string(yamlCfg))
+		assert.YAMLEq(t, collectorCfg, string(yamlCfg))
 	})
 	t.Run("invalid config", func(t *testing.T) {
 		config := `!!!`
@@ -79,13 +84,252 @@ service:
 	})
 }
 
-func Test_TargetAllocator(t *testing.T) {
+func Test_tov1alpha1_config(t *testing.T) {
+	cfg := v1beta1.Config{}
+	err := yaml.Unmarshal([]byte(collectorCfg), &cfg)
+	require.NoError(t, err)
+
+	beta1Col := v1beta1.OpenTelemetryCollector{
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			Config: cfg,
+		},
+	}
+	alpha1Col, err := tov1alpha1(beta1Col)
+	require.NoError(t, err)
+	assert.YAMLEq(t, collectorCfg, alpha1Col.Spec.Config)
+}
+
+func Test_tov1beta1AndBack(t *testing.T) {
+	one := int32(1)
+	two := int64(2)
+	intstrAAA := intstr.FromString("aaa")
+	boolTrue := true
+	ingressClass := "someClass"
+	colalpha1 := &OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        "otel",
+			Namespace:   "observability",
+			Labels:      map[string]string{"foo": "bar"},
+			Annotations: map[string]string{"bax": "foo"},
+		},
+		Spec: OpenTelemetryCollectorSpec{
+			ManagementState: ManagementStateManaged,
+			Resources: v1.ResourceRequirements{
+				Limits: v1.ResourceList{
+					v1.ResourceCPU:    resource.MustParse("500m"),
+					v1.ResourceMemory: resource.MustParse("128Mi"),
+				},
+				Requests: v1.ResourceList{
+					v1.ResourceCPU:    resource.MustParse("500m"),
+					v1.ResourceMemory: resource.MustParse("128Mi"),
+				},
+			},
+			NodeSelector: map[string]string{"aaa": "ccc"},
+			Args:         map[string]string{"foo": "bar"},
+			Replicas:     &one,
+			Autoscaler: &AutoscalerSpec{
+				MinReplicas: &one,
+				MaxReplicas: &one,
+				Behavior: &autoscalingv2.HorizontalPodAutoscalerBehavior{
+					ScaleUp: &autoscalingv2.HPAScalingRules{
+						Policies: []autoscalingv2.HPAScalingPolicy{
+							{
+								Type:          "aaa",
+								Value:         2,
+								PeriodSeconds: 4,
+							},
+						},
+					},
+				},
+				Metrics: []MetricSpec{
+					{
+						Type: autoscalingv2.ContainerResourceMetricSourceType,
+						Pods: &autoscalingv2.PodsMetricSource{
+							Metric: autoscalingv2.MetricIdentifier{
+								Name: "rrrrt",
+							},
+						},
+					},
+				},
+				TargetCPUUtilization:    &one,
+				TargetMemoryUtilization: &one,
+			},
+			PodDisruptionBudget: &PodDisruptionBudgetSpec{
+				MinAvailable:   &intstrAAA,
+				MaxUnavailable: &intstrAAA,
+			},
+			SecurityContext: &v1.SecurityContext{
+				RunAsUser: &two,
+			},
+			PodSecurityContext: &v1.PodSecurityContext{
+				RunAsNonRoot: &boolTrue,
+			},
+			PodAnnotations:  map[string]string{"foo": "bar"},
+			TargetAllocator: createTA(),
+			Mode:            ModeDeployment,
+			ServiceAccount:  "foo",
+			Image:           "baz/bar:1.0",
+			UpgradeStrategy: UpgradeStrategyAutomatic,
+			ImagePullPolicy: v1.PullAlways,
+			Config:          collectorCfg,
+			VolumeMounts: []v1.VolumeMount{
+				{
+					Name: "aaa",
+				},
+			},
+			Ports: []v1.ServicePort{
+				{
+					Name: "otlp",
+				},
+			},
+			Env: []v1.EnvVar{
+				{
+					Name:  "foo",
+					Value: "bar",
+					ValueFrom: &v1.EnvVarSource{
+						ResourceFieldRef: &v1.ResourceFieldSelector{
+							ContainerName: "bbb",
+							Resource:      "aaa",
+							Divisor:       resource.Quantity{},
+						},
+					},
+				},
+			},
+			EnvFrom: []v1.EnvFromSource{
+				{
+					Prefix: "aa",
+					ConfigMapRef: &v1.ConfigMapEnvSource{
+						LocalObjectReference: v1.LocalObjectReference{
+							Name: "bbb",
+						},
+					},
+				},
+			},
+			VolumeClaimTemplates: []v1.PersistentVolumeClaim{
+				{
+					TypeMeta:   metav1.TypeMeta{},
+					ObjectMeta: metav1.ObjectMeta{},
+					Spec: v1.PersistentVolumeClaimSpec{
+						VolumeName: "aaaa",
+					},
+				},
+			},
+			Tolerations: []v1.Toleration{
+				{
+					Key:      "11",
+					Operator: "33",
+					Value:    "44",
+					Effect:   "55",
+				},
+			},
+			Volumes: []v1.Volume{
+				{
+					Name:         "cfg",
+					VolumeSource: v1.VolumeSource{},
+				},
+			},
+			Ingress: Ingress{
+				Type:        IngressTypeRoute,
+				RuleType:    IngressRuleTypePath,
+				Hostname:    "foo.com",
+				Annotations: map[string]string{"aa": "bb"},
+				TLS: []networkingv1.IngressTLS{
+					{
+						Hosts:      []string{"foo"},
+						SecretName: "bar",
+					},
+				},
+				IngressClassName: &ingressClass,
+				Route: OpenShiftRoute{
+					Termination: TLSRouteTerminationTypeEdge,
+				},
+			},
+			HostNetwork:           true,
+			ShareProcessNamespace: true,
+			PriorityClassName:     "foobar",
+			Affinity: &v1.Affinity{
+				NodeAffinity: &v1.NodeAffinity{
+					PreferredDuringSchedulingIgnoredDuringExecution: []v1.PreferredSchedulingTerm{{
+						Weight: 444,
+					}},
+				},
+			},
+			Lifecycle: &v1.Lifecycle{
+				PostStart: &v1.LifecycleHandler{
+					Exec: &v1.ExecAction{
+						Command: []string{"/bin"},
+					},
+				},
+			},
+			TerminationGracePeriodSeconds: &two,
+			LivenessProbe: &Probe{
+				PeriodSeconds: &one,
+			},
+			InitContainers: []v1.Container{
+				{
+					Name: "init",
+				},
+			},
+			AdditionalContainers: []v1.Container{
+				{
+					Name: "some",
+				},
+			},
+			Observability: ObservabilitySpec{
+				Metrics: MetricsConfigSpec{
+					EnableMetrics:                true,
+					DisablePrometheusAnnotations: true,
+				},
+			},
+			TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+				{
+					TopologyKey: "key",
+				},
+			},
+			ConfigMaps: []ConfigMapsSpec{
+				{
+					Name:      "aaa",
+					MountPath: "bbb",
+				},
+			},
+			UpdateStrategy: appsv1.DaemonSetUpdateStrategy{
+				Type: appsv1.RollingUpdateDaemonSetStrategyType,
+			},
+			DeploymentUpdateStrategy: appsv1.DeploymentStrategy{
+				Type: appsv1.RecreateDeploymentStrategyType,
+			},
+		},
+		Status: OpenTelemetryCollectorStatus{
+			Scale: ScaleSubresourceStatus{
+				Selector:       "bar",
+				Replicas:       1,
+				StatusReplicas: "foo",
+			},
+			Version: "1.0",
+			Image:   "foo/bar:1.0",
+		},
+	}
+
+	colbeta1, err := Tov1beta1(*colalpha1)
+	require.NoError(t, err)
+	colalpha1Converted, err := tov1alpha1(colbeta1)
+	require.NoError(t, err)
+
+	assert.YAMLEq(t, colalpha1.Spec.Config, colalpha1Converted.Spec.Config)
+
+	// empty the config to enable assertion on the entire objects
+	colalpha1.Spec.Config = ""
+	colalpha1Converted.Spec.Config = ""
+	assert.Equal(t, colalpha1, colalpha1Converted)
+}
+
+func createTA() OpenTelemetryTargetAllocator {
 	replicas := int32(2)
 	runAsNonRoot := true
 	privileged := true
 	runAsUser := int64(1337)
 	runasGroup := int64(1338)
-	input := OpenTelemetryTargetAllocator{
+	return OpenTelemetryTargetAllocator{
 		Replicas:     &replicas,
 		NodeSelector: map[string]string{"key": "value"},
 		Resources: v1.ResourceRequirements{
@@ -176,43 +420,4 @@ func Test_TargetAllocator(t *testing.T) {
 			},
 		},
 	}
-
-	expected := v1beta1.TargetAllocatorEmbedded{
-		Replicas:           input.Replicas,
-		NodeSelector:       input.NodeSelector,
-		Resources:          input.Resources,
-		AllocationStrategy: v1beta1.TargetAllocatorAllocationStrategyConsistentHashing,
-		FilterStrategy:     v1beta1.TargetAllocatorFilterStrategyRelabelConfig,
-		ServiceAccount:     input.ServiceAccount,
-		Image:              input.Image,
-		Enabled:            input.Enabled,
-		Affinity:           input.Affinity,
-		PrometheusCR: v1beta1.TargetAllocatorPrometheusCR{
-			Enabled:        input.PrometheusCR.Enabled,
-			ScrapeInterval: input.PrometheusCR.ScrapeInterval,
-			PodMonitorSelector: &metav1.LabelSelector{
-				MatchLabels: input.PrometheusCR.PodMonitorSelector,
-			},
-			ServiceMonitorSelector: &metav1.LabelSelector{
-				MatchLabels: input.PrometheusCR.ServiceMonitorSelector,
-			},
-		},
-		SecurityContext:           input.SecurityContext,
-		PodSecurityContext:        input.PodSecurityContext,
-		TopologySpreadConstraints: input.TopologySpreadConstraints,
-		Tolerations:               input.Tolerations,
-		Env:                       input.Env,
-		Observability: v1beta1.ObservabilitySpec{
-			Metrics: v1beta1.MetricsConfigSpec{
-				EnableMetrics:                input.Observability.Metrics.EnableMetrics,
-				DisablePrometheusAnnotations: input.Observability.Metrics.DisablePrometheusAnnotations,
-			},
-		},
-		PodDisruptionBudget: &v1beta1.PodDisruptionBudgetSpec{
-			MinAvailable:   input.PodDisruptionBudget.MinAvailable,
-			MaxUnavailable: input.PodDisruptionBudget.MaxUnavailable,
-		},
-	}
-
-	assert.Equal(t, expected, TargetAllocatorEmbedded(input))
 }

apis/v1alpha1/convert_test.go

@@ -45,6 +45,7 @@ type Config struct {
 	createRBACPermissions               bool
 	enableMultiInstrumentation          bool
 	enableApacheHttpdInstrumentation    bool
+	enableDotNetInstrumentation         bool
 	autoInstrumentationDotNetImage      string
 	autoInstrumentationGoImage          string
 	autoInstrumentationApacheHttpdImage string
@@ -79,6 +80,7 @@ func New(opts ...Option) Config {
 		createRBACPermissions:               o.createRBACPermissions,
 		enableMultiInstrumentation:          o.enableMultiInstrumentation,
 		enableApacheHttpdInstrumentation:    o.enableApacheHttpdInstrumentation,
+		enableDotNetInstrumentation:         o.enableDotNetInstrumentation,
 		targetAllocatorImage:                o.targetAllocatorImage,
 		operatorOpAMPBridgeImage:            o.operatorOpAMPBridgeImage,
 		targetAllocatorConfigMapEntry:       o.targetAllocatorConfigMapEntry,
@@ -118,10 +120,16 @@ func (c *Config) EnableMultiInstrumentation() bool {
 	return c.enableMultiInstrumentation
 }
 
+// EnableApacheHttpdAutoInstrumentation is true when the operator supports ApacheHttpd auto instrumentation.
 func (c *Config) EnableApacheHttpdAutoInstrumentation() bool {
 	return c.enableApacheHttpdInstrumentation
 }
 
+// EnableDotNetAutoInstrumentation is true when the operator supports dotnet auto instrumentation.
+func (c *Config) EnableDotNetAutoInstrumentation() bool {
+	return c.enableDotNetInstrumentation
+}
+
 // CollectorConfigMapEntry represents the configuration file name for the collector. Immutable.
 func (c *Config) CollectorConfigMapEntry() string {
 	return c.collectorConfigMapEntry