Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define components more clearly in v1beta1 #2915

Closed
wants to merge 14 commits into from
Closed

Define components more clearly in v1beta1 #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab9aaae
introduce more typing for pipelines
jaronoff97 Apr 24, 2024
106473b
rock and a hard place
jaronoff97 Apr 24, 2024
fe08057
resolve tests
jaronoff97 Apr 25, 2024
7a0601c
Fix tests
jaronoff97 Apr 26, 2024
82d26a9
chlog
jaronoff97 Apr 26, 2024
7e629cb
more better parsing for component definitions
jaronoff97 Apr 26, 2024
e6fd8f8
fix docs
jaronoff97 Apr 30, 2024
31aa788
Merge branch 'cleanup-part-1' into cleanup-part-2
jaronoff97 Apr 30, 2024
2025e89
bundlereset
jaronoff97 Apr 30, 2024
1c18b21
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
jaronoff97 Apr 30, 2024
fb7bb1c
oop
jaronoff97 Apr 30, 2024
b6080fb
oop 2
jaronoff97 Apr 30, 2024
103b61d
remove type alias
jaronoff97 Apr 30, 2024
3545b8b
aint gon work
jaronoff97 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 100 additions & 98 deletions apis/v1alpha1/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ func (dst *OpenTelemetryCollector) ConvertFrom(srcRaw conversion.Hub) error {
}

func tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error) {
copy := in.DeepCopy()
cfgCopy := in.DeepCopy()
cfg := &v1beta1.Config{}
if err := yaml.Unmarshal([]byte(copy.Spec.Config), cfg); err != nil {
if err := yaml.Unmarshal([]byte(cfgCopy.Spec.Config), cfg); err != nil {
return v1beta1.OpenTelemetryCollector{}, errors.New("could not convert config json to v1beta1.Config")
}

fmt.Println("-------------- convert to v1beta1")
fmt.Println(in.Spec.Config)
fmt.Println("-------------- convert to v1beta1")
return v1beta1.OpenTelemetryCollector{
ObjectMeta: copy.ObjectMeta,
ObjectMeta: cfgCopy.ObjectMeta,
Status: v1beta1.OpenTelemetryCollectorStatus{
Scale: v1beta1.ScaleSubresourceStatus{
Selector: in.Status.Scale.Selector,
Expand All @@ -83,63 +85,63 @@ func tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error
},
Spec: v1beta1.OpenTelemetryCollectorSpec{
OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
ManagementState: v1beta1.ManagementStateType(copy.Spec.ManagementState),
Resources: copy.Spec.Resources,
NodeSelector: copy.Spec.NodeSelector,
Args: copy.Spec.Args,
Replicas: copy.Spec.Replicas,
Autoscaler: tov1beta1Autoscaler(copy.Spec.Autoscaler, copy.Spec.MinReplicas, copy.Spec.MaxReplicas),
PodDisruptionBudget: tov1beta1PodDisruptionBudget(copy.Spec.PodDisruptionBudget),
SecurityContext: copy.Spec.SecurityContext,
PodSecurityContext: copy.Spec.PodSecurityContext,
PodAnnotations: copy.Spec.PodAnnotations,
ServiceAccount: copy.Spec.ServiceAccount,
Image: copy.Spec.Image,
ImagePullPolicy: copy.Spec.ImagePullPolicy,
VolumeMounts: copy.Spec.VolumeMounts,
Ports: tov1beta1Ports(copy.Spec.Ports),
Env: copy.Spec.Env,
EnvFrom: copy.Spec.EnvFrom,
VolumeClaimTemplates: copy.Spec.VolumeClaimTemplates,
Tolerations: copy.Spec.Tolerations,
Volumes: copy.Spec.Volumes,
Affinity: copy.Spec.Affinity,
Lifecycle: copy.Spec.Lifecycle,
TerminationGracePeriodSeconds: copy.Spec.TerminationGracePeriodSeconds,
TopologySpreadConstraints: copy.Spec.TopologySpreadConstraints,
HostNetwork: copy.Spec.HostNetwork,
ShareProcessNamespace: copy.Spec.ShareProcessNamespace,
PriorityClassName: copy.Spec.PriorityClassName,
InitContainers: copy.Spec.InitContainers,
AdditionalContainers: copy.Spec.AdditionalContainers,
ManagementState: v1beta1.ManagementStateType(cfgCopy.Spec.ManagementState),
Resources: cfgCopy.Spec.Resources,
NodeSelector: cfgCopy.Spec.NodeSelector,
Args: cfgCopy.Spec.Args,
Replicas: cfgCopy.Spec.Replicas,
Autoscaler: tov1beta1Autoscaler(cfgCopy.Spec.Autoscaler, cfgCopy.Spec.MinReplicas, cfgCopy.Spec.MaxReplicas),
PodDisruptionBudget: tov1beta1PodDisruptionBudget(cfgCopy.Spec.PodDisruptionBudget),
SecurityContext: cfgCopy.Spec.SecurityContext,
PodSecurityContext: cfgCopy.Spec.PodSecurityContext,
PodAnnotations: cfgCopy.Spec.PodAnnotations,
ServiceAccount: cfgCopy.Spec.ServiceAccount,
Image: cfgCopy.Spec.Image,
ImagePullPolicy: cfgCopy.Spec.ImagePullPolicy,
VolumeMounts: cfgCopy.Spec.VolumeMounts,
Ports: tov1beta1Ports(cfgCopy.Spec.Ports),
Env: cfgCopy.Spec.Env,
EnvFrom: cfgCopy.Spec.EnvFrom,
VolumeClaimTemplates: cfgCopy.Spec.VolumeClaimTemplates,
Tolerations: cfgCopy.Spec.Tolerations,
Volumes: cfgCopy.Spec.Volumes,
Affinity: cfgCopy.Spec.Affinity,
Lifecycle: cfgCopy.Spec.Lifecycle,
TerminationGracePeriodSeconds: cfgCopy.Spec.TerminationGracePeriodSeconds,
TopologySpreadConstraints: cfgCopy.Spec.TopologySpreadConstraints,
HostNetwork: cfgCopy.Spec.HostNetwork,
ShareProcessNamespace: cfgCopy.Spec.ShareProcessNamespace,
PriorityClassName: cfgCopy.Spec.PriorityClassName,
InitContainers: cfgCopy.Spec.InitContainers,
AdditionalContainers: cfgCopy.Spec.AdditionalContainers,
},
TargetAllocator: tov1beta1TA(copy.Spec.TargetAllocator),
Mode: v1beta1.Mode(copy.Spec.Mode),
UpgradeStrategy: v1beta1.UpgradeStrategy(copy.Spec.UpgradeStrategy),
TargetAllocator: tov1beta1TA(cfgCopy.Spec.TargetAllocator),
Mode: v1beta1.Mode(cfgCopy.Spec.Mode),
UpgradeStrategy: v1beta1.UpgradeStrategy(cfgCopy.Spec.UpgradeStrategy),
Config: *cfg,
Ingress: v1beta1.Ingress{
Type: v1beta1.IngressType(copy.Spec.Ingress.Type),
RuleType: v1beta1.IngressRuleType(copy.Spec.Ingress.RuleType),
Hostname: copy.Spec.Ingress.Hostname,
Annotations: copy.Spec.Ingress.Annotations,
TLS: copy.Spec.Ingress.TLS,
IngressClassName: copy.Spec.Ingress.IngressClassName,
Type: v1beta1.IngressType(cfgCopy.Spec.Ingress.Type),
RuleType: v1beta1.IngressRuleType(cfgCopy.Spec.Ingress.RuleType),
Hostname: cfgCopy.Spec.Ingress.Hostname,
Annotations: cfgCopy.Spec.Ingress.Annotations,
TLS: cfgCopy.Spec.Ingress.TLS,
IngressClassName: cfgCopy.Spec.Ingress.IngressClassName,
Route: v1beta1.OpenShiftRoute{
Termination: v1beta1.TLSRouteTerminationType(copy.Spec.Ingress.Route.Termination),
Termination: v1beta1.TLSRouteTerminationType(cfgCopy.Spec.Ingress.Route.Termination),
},
},
LivenessProbe: tov1beta1Probe(copy.Spec.LivenessProbe),
LivenessProbe: tov1beta1Probe(cfgCopy.Spec.LivenessProbe),
Observability: v1beta1.ObservabilitySpec{
Metrics: v1beta1.MetricsConfigSpec{
EnableMetrics: copy.Spec.Observability.Metrics.EnableMetrics,
DisablePrometheusAnnotations: copy.Spec.Observability.Metrics.DisablePrometheusAnnotations,
EnableMetrics: cfgCopy.Spec.Observability.Metrics.EnableMetrics,
DisablePrometheusAnnotations: cfgCopy.Spec.Observability.Metrics.DisablePrometheusAnnotations,
},
},
ConfigMaps: tov1beta1ConfigMaps(copy.Spec.ConfigMaps),
DaemonSetUpdateStrategy: copy.Spec.UpdateStrategy,
ConfigMaps: tov1beta1ConfigMaps(cfgCopy.Spec.ConfigMaps),
DaemonSetUpdateStrategy: cfgCopy.Spec.UpdateStrategy,
DeploymentUpdateStrategy: appsv1.DeploymentStrategy{
Type: copy.Spec.DeploymentUpdateStrategy.Type,
RollingUpdate: copy.Spec.DeploymentUpdateStrategy.RollingUpdate,
Type: cfgCopy.Spec.DeploymentUpdateStrategy.Type,
RollingUpdate: cfgCopy.Spec.DeploymentUpdateStrategy.RollingUpdate,
},
},
}, nil
Expand Down Expand Up @@ -291,14 +293,14 @@ func tov1alpha1Ports(in []v1beta1.PortsSpec) []PortsSpec {
}

func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, error) {
copy := in.DeepCopy()
configYaml, err := copy.Spec.Config.Yaml()
betaCopy := in.DeepCopy()
configYaml, err := betaCopy.Spec.Config.Yaml()
if err != nil {
return nil, err
}

return &OpenTelemetryCollector{
ObjectMeta: copy.ObjectMeta,
ObjectMeta: betaCopy.ObjectMeta,
Status: OpenTelemetryCollectorStatus{
Scale: ScaleSubresourceStatus{
Selector: in.Status.Scale.Selector,
Expand All @@ -310,60 +312,60 @@ func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, err
},

Spec: OpenTelemetryCollectorSpec{
ManagementState: ManagementStateType(copy.Spec.ManagementState),
Resources: copy.Spec.Resources,
NodeSelector: copy.Spec.NodeSelector,
Args: copy.Spec.Args,
Replicas: copy.Spec.Replicas,
Autoscaler: tov1alpha1Autoscaler(copy.Spec.Autoscaler),
PodDisruptionBudget: tov1alpha1PodDisruptionBudget(copy.Spec.PodDisruptionBudget),
SecurityContext: copy.Spec.SecurityContext,
PodSecurityContext: copy.Spec.PodSecurityContext,
PodAnnotations: copy.Spec.PodAnnotations,
TargetAllocator: tov1alpha1TA(copy.Spec.TargetAllocator),
Mode: Mode(copy.Spec.Mode),
ServiceAccount: copy.Spec.ServiceAccount,
Image: copy.Spec.Image,
UpgradeStrategy: UpgradeStrategy(copy.Spec.UpgradeStrategy),
ImagePullPolicy: copy.Spec.ImagePullPolicy,
ManagementState: ManagementStateType(betaCopy.Spec.ManagementState),
Resources: betaCopy.Spec.Resources,
NodeSelector: betaCopy.Spec.NodeSelector,
Args: betaCopy.Spec.Args,
Replicas: betaCopy.Spec.Replicas,
Autoscaler: tov1alpha1Autoscaler(betaCopy.Spec.Autoscaler),
PodDisruptionBudget: tov1alpha1PodDisruptionBudget(betaCopy.Spec.PodDisruptionBudget),
SecurityContext: betaCopy.Spec.SecurityContext,
PodSecurityContext: betaCopy.Spec.PodSecurityContext,
PodAnnotations: betaCopy.Spec.PodAnnotations,
TargetAllocator: tov1alpha1TA(betaCopy.Spec.TargetAllocator),
Mode: Mode(betaCopy.Spec.Mode),
ServiceAccount: betaCopy.Spec.ServiceAccount,
Image: betaCopy.Spec.Image,
UpgradeStrategy: UpgradeStrategy(betaCopy.Spec.UpgradeStrategy),
ImagePullPolicy: betaCopy.Spec.ImagePullPolicy,
Config: configYaml,
VolumeMounts: copy.Spec.VolumeMounts,
Ports: tov1alpha1Ports(copy.Spec.Ports),
Env: copy.Spec.Env,
EnvFrom: copy.Spec.EnvFrom,
VolumeClaimTemplates: copy.Spec.VolumeClaimTemplates,
Tolerations: copy.Spec.Tolerations,
Volumes: copy.Spec.Volumes,
VolumeMounts: betaCopy.Spec.VolumeMounts,
Ports: tov1alpha1Ports(betaCopy.Spec.Ports),
Env: betaCopy.Spec.Env,
EnvFrom: betaCopy.Spec.EnvFrom,
VolumeClaimTemplates: betaCopy.Spec.VolumeClaimTemplates,
Tolerations: betaCopy.Spec.Tolerations,
Volumes: betaCopy.Spec.Volumes,
Ingress: Ingress{
Type: IngressType(copy.Spec.Ingress.Type),
RuleType: IngressRuleType(copy.Spec.Ingress.RuleType),
Hostname: copy.Spec.Ingress.Hostname,
Annotations: copy.Spec.Ingress.Annotations,
TLS: copy.Spec.Ingress.TLS,
IngressClassName: copy.Spec.Ingress.IngressClassName,
Type: IngressType(betaCopy.Spec.Ingress.Type),
RuleType: IngressRuleType(betaCopy.Spec.Ingress.RuleType),
Hostname: betaCopy.Spec.Ingress.Hostname,
Annotations: betaCopy.Spec.Ingress.Annotations,
TLS: betaCopy.Spec.Ingress.TLS,
IngressClassName: betaCopy.Spec.Ingress.IngressClassName,
Route: OpenShiftRoute{
Termination: TLSRouteTerminationType(copy.Spec.Ingress.Route.Termination),
Termination: TLSRouteTerminationType(betaCopy.Spec.Ingress.Route.Termination),
},
},
HostNetwork: copy.Spec.HostNetwork,
ShareProcessNamespace: copy.Spec.ShareProcessNamespace,
PriorityClassName: copy.Spec.PriorityClassName,
Affinity: copy.Spec.Affinity,
Lifecycle: copy.Spec.Lifecycle,
TerminationGracePeriodSeconds: copy.Spec.TerminationGracePeriodSeconds,
LivenessProbe: tov1alpha1Probe(copy.Spec.LivenessProbe),
InitContainers: copy.Spec.InitContainers,
AdditionalContainers: copy.Spec.AdditionalContainers,
HostNetwork: betaCopy.Spec.HostNetwork,
ShareProcessNamespace: betaCopy.Spec.ShareProcessNamespace,
PriorityClassName: betaCopy.Spec.PriorityClassName,
Affinity: betaCopy.Spec.Affinity,
Lifecycle: betaCopy.Spec.Lifecycle,
TerminationGracePeriodSeconds: betaCopy.Spec.TerminationGracePeriodSeconds,
LivenessProbe: tov1alpha1Probe(betaCopy.Spec.LivenessProbe),
InitContainers: betaCopy.Spec.InitContainers,
AdditionalContainers: betaCopy.Spec.AdditionalContainers,
Observability: ObservabilitySpec{
Metrics: MetricsConfigSpec{
EnableMetrics: copy.Spec.Observability.Metrics.EnableMetrics,
DisablePrometheusAnnotations: copy.Spec.Observability.Metrics.DisablePrometheusAnnotations,
EnableMetrics: betaCopy.Spec.Observability.Metrics.EnableMetrics,
DisablePrometheusAnnotations: betaCopy.Spec.Observability.Metrics.DisablePrometheusAnnotations,
},
},
TopologySpreadConstraints: copy.Spec.TopologySpreadConstraints,
ConfigMaps: tov1alpha1ConfigMaps(copy.Spec.ConfigMaps),
UpdateStrategy: copy.Spec.DaemonSetUpdateStrategy,
DeploymentUpdateStrategy: copy.Spec.DeploymentUpdateStrategy,
TopologySpreadConstraints: betaCopy.Spec.TopologySpreadConstraints,
ConfigMaps: tov1alpha1ConfigMaps(betaCopy.Spec.ConfigMaps),
UpdateStrategy: betaCopy.Spec.DaemonSetUpdateStrategy,
DeploymentUpdateStrategy: betaCopy.Spec.DeploymentUpdateStrategy,
},
}, nil
}
Expand Down
98 changes: 52 additions & 46 deletions apis/v1beta1/collector_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,52 +44,58 @@ var (
testScheme = scheme.Scheme
)

func TestValidate(t *testing.T) {
tests := []struct {
name string
collector OpenTelemetryCollector
warnings []string
err string
}{
{
name: "Test ",
collector: OpenTelemetryCollector{
Spec: OpenTelemetryCollectorSpec{
Config: Config{
Processors: &AnyConfig{
Object: map[string]interface{}{
"batch": nil,
"foo": nil,
},
},
Extensions: &AnyConfig{
Object: map[string]interface{}{
"foo": nil,
},
},
},
},
},

warnings: []string{
"Collector config spec.config has null objects: extensions.foo:, processors.batch:, processors.foo:. For compatibility tooling (kustomize and kubectl edit) it is recommended to use empty obejects e.g. batch: {}.",
},
},
}
for _, tt := range tests {
webhook := CollectorWebhook{}
t.Run(tt.name, func(t *testing.T) {
tt := tt
warnings, err := webhook.validate(context.Background(), &tt.collector)
if tt.err == "" {
require.NoError(t, err)
} else {
assert.Equal(t, tt.err, err.Error())
}
assert.ElementsMatch(t, tt.warnings, warnings)
})
}
}
//func TestValidate(t *testing.T) {
// tests := []struct {
// name string
// collector OpenTelemetryCollector
// warnings []string
// err string
// }{
// {
// name: "Test warnings",
// collector: OpenTelemetryCollector{
// Spec: OpenTelemetryCollectorSpec{
// Config: Config{
// Receivers: map[string]*AnyConfig{
// "otlp": &AnyConfig{
// map[string]interface{}{
// "protocols": map[string]interface{}{
// "grpc": nil,
// "http": nil,
// },
// },
// },
// },
// Processors: map[string]*AnyConfig{
// "batch": nil,
// "foo": nil,
// },
// Extensions: map[string]*AnyConfig{
// "foo": nil,
// },
// },
// },
// },
//
// warnings: []string{
// "Collector config spec.config has null objects: extensions.foo:, processors.batch:, processors.foo:, receivers.otlp.protocols.grpc:, receivers.otlp.protocols.http:. For compatibility tooling (kustomize and kubectl edit) it is recommended to use empty obejects e.g. batch: {}.",
// },
// },
// }
// for _, tt := range tests {
// webhook := CollectorWebhook{}
// t.Run(tt.name, func(t *testing.T) {
// tt := tt
// warnings, err := webhook.validate(context.Background(), &tt.collector)
// if tt.err == "" {
// require.NoError(t, err)
// } else {
// assert.Equal(t, tt.err, err.Error())
// }
// assert.ElementsMatch(t, tt.warnings, warnings)
// })
// }
//}

func TestCollectorDefaultingWebhook(t *testing.T) {
one := int32(1)
Expand Down
Loading
Loading