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

Jump to bottom

Run the upgrade of a collector instance after the status changes from unmanaged to managed #2086

Merged
merged 18 commits into from
Sep 14, 2023
Merged

Run the upgrade of a collector instance after the status changes from unmanaged to managed #2086

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7a8b1e1
Run the upgrade of a collector instance after the status changes from…
iblancasa Sep 5, 2023
c28d375
Add changelog
iblancasa Sep 5, 2023
6f932a7
Merge branch 'main' into task/1890
iblancasa Sep 5, 2023
a5e6dcf
Merge branch 'main' into task/1890
iblancasa Sep 8, 2023
0fa0dfa
Merge branch 'task/1890' of github.com:iblancasa/opentelemetry-operat…
iblancasa Sep 11, 2023
e82530d
Use the recorder
iblancasa Sep 11, 2023
dc42afe
Move import
iblancasa Sep 11, 2023
2a1adfd
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Sep 11, 2023
e5dfaa2
Merge branch 'main' into task/1890
iblancasa Sep 12, 2023
98c72cf
Merge branch 'main' into task/1890
iblancasa Sep 13, 2023
d326618
Merge branch 'task/1890' of github.com:iblancasa/opentelemetry-operat…
iblancasa Sep 13, 2023
2586489
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Sep 13, 2023
278a0cc
Fix imports
iblancasa Sep 13, 2023
4ebf779
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operat…
iblancasa Sep 14, 2023
6d81d01
Merge branch 'main' into task/1890
iblancasa Sep 14, 2023
e00769a
Don't fail when the upgrade cannot be done as part of the reconciliation
iblancasa Sep 14, 2023
511710b
Merge branch 'task/1890' of github.com:iblancasa/opentelemetry-operat…
iblancasa Sep 14, 2023
9467cad
Merge branch 'main' into task/1890
iblancasa Sep 14, 2023
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
3 changes: 1 addition & 2 deletions pkg/collector/reconcile/opentelemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ import (
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
collectorupgrade "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
iblancasa marked this conversation as resolved.
Show resolved Hide resolved

appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

collectorupgrade "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"

"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
"github.com/open-telemetry/opentelemetry-operator/internal/version"
)
Expand Down
Loading