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

internal/manifests/collector: switch internally to v1alpha2 #2532

Merged
merged 19 commits into from
Feb 5, 2024
+1,294 −649
Merged

internal/manifests/collector: switch internally to v1alpha2 #2532

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ac5fbd6
internal/manifests/collector: switch internally to v1alphav2
frzifus Jan 18, 2024
61e2f25
internal/manifests/collector: change svc account
frzifus Jan 18, 2024
cec1d48
internal/api/convert: propagate ver upgrade error
frzifus Jan 18, 2024
be15d9f
intern/{api,manifests}: directly call yaml unmarshal
frzifus Jan 18, 2024
5ebba26
internal/api/convert: map DaemonSetUpdateStrategy
frzifus Jan 19, 2024
8d91791
internal/manifests/collector: migrate configmap
frzifus Jan 19, 2024
ec3cc4c
internal/api/convert: use go-yaml instead of sig-yaml
frzifus Jan 23, 2024
fdcd167
pkg/sidecar: upgrade internal use from v1alpha2 to v1alpha2
frzifus Jan 23, 2024
16d84f6
internal/manifests/collector: adapt cm, svc, ingress & route
frzifus Jan 23, 2024
ddc747d
internal/api/convert: fix v1alpha1 to v1alpha2
frzifus Jan 23, 2024
10f3ed0
internal/manifests/collector: evaluate returned error value in tests
frzifus Jan 23, 2024
df8df4b
apis/v1alpha2: config yaml method
frzifus Jan 23, 2024
8c73026
internal/manifests/collector: use v1alpha2.Config yaml method
frzifus Jan 24, 2024
f7c7006
controllers/builder: adapt ident in unit test
frzifus Jan 23, 2024
feaa1e1
internal/manifests/collector: fix test
frzifus Feb 1, 2024
d6d01bd
tests/e2e: align to new indentation
frzifus Feb 1, 2024
414d68c
internal/manifests/collector: cleanup
frzifus Feb 1, 2024
da09025
Merge branch 'main' into v1alphav2
frzifus Feb 1, 2024
99f782c
Merge branch 'main' into v1alphav2
frzifus Feb 4, 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
Prev Previous commit
Next Next commit
internal/api/convert: map DaemonSetUpdateStrategy 
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
@frzifus
frzifus committed Feb 1, 2024
commit 5ebba262e01629571708ac3c29c65bfb16b0d471
3 changes: 1 addition & 2 deletions internal/api/convert/v1alpha.go
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ package convert
import (
"errors"

appsv1 "k8s.io/api/apps/v1"
"sigs.k8s.io/yaml"

"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
@@ -141,7 +140,7 @@ func V1Alpha1to2(in v1alpha1.OpenTelemetryCollector) (v1alpha2.OpenTelemetryColl
out.Spec.Observability.Metrics.EnableMetrics = copy.Spec.Observability.Metrics.EnableMetrics

out.Spec.ConfigMaps = copy.Spec.ConfigMaps
out.Spec.DaemonSetUpdateStrategy = appsv1.DaemonSetUpdateStrategy{} // NOTE: N/A in v1alpha1
out.Spec.DaemonSetUpdateStrategy = copy.Spec.UpdateStrategy
out.Spec.DeploymentUpdateStrategy.Type = copy.Spec.DeploymentUpdateStrategy.Type
out.Spec.DeploymentUpdateStrategy.RollingUpdate = copy.Spec.DeploymentUpdateStrategy.RollingUpdate