Skip to content

replace instrumented handler with the one from operator-lib #3523

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

Merged
jmrodri merged 1 commit into from
Jul 24, 2020
Merged

replace instrumented handler with the one from operator-lib #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions changelog/fragments/use-operator-lib-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
Remove the implementation for `InstrumentedEnqueueRequestForObject`
handler from SDK repository and reference it from operator-lib instead.

kind: "change"

# Is this a breaking change?
breaking: true

# Migration can be defined to automatically add a section to
# the migration guide. This is required for breaking changes.
migration:
header: Move the implementation of `InstrumentedEnqueueRequestForObject` handler
body: >
The implementation of `InstrumentedEnqueueRequestForObject` handler has been
removed from Operator SDK repository and is now imported from operator-lib.
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/onsi/ginkgo v1.12.1
github.com/onsi/gomega v1.10.1
github.com/operator-framework/api v0.3.8
github.com/operator-framework/operator-lib v0.0.0-20200723212032-525cb9a9ed70
github.com/operator-framework/operator-lib v0.0.0-20200724152139-f4e8074e89d3
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8
github.com/prometheus/client_golang v1.5.1
github.com/rogpeppe/go-internal v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,8 @@ github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2 h1:2KtDe3
github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
github.com/operator-framework/api v0.3.8 h1:tJykTCmwGKZBsPVTCfxbwz6nTF6dzmKydWJtC40erc8=
github.com/operator-framework/api v0.3.8/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
github.com/operator-framework/operator-lib v0.0.0-20200723212032-525cb9a9ed70 h1:FU2KAQyEmH/Gx8Nh8bfs6qFpxg+t4Un777hMdR5/5sg=
github.com/operator-framework/operator-lib v0.0.0-20200723212032-525cb9a9ed70/go.mod h1:rgkZhbXdfdeZhjXWbl1lUzOfh3m7Fwj5DUYRihyf/w4=
github.com/operator-framework/operator-lib v0.0.0-20200724152139-f4e8074e89d3 h1:of4TVUV5Eg/xTDkoDKsERDKYrzY5nCy/e9QknvGyiF8=
github.com/operator-framework/operator-lib v0.0.0-20200724152139-f4e8074e89d3/go.mod h1:3xYWtjZXmIi9LikMmxqwLWjROJVVoil47sDJ1HD0pAI=
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 h1:F3zzxoBJJANdKMxmSOi5z/HWiVT+gwOdhROkEwDWD2M=
github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8/go.mod h1:loVINznYhgBIkmv83kU4yee88RS0BBk+hqOw9r4bhJk=
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
Expand Down
2 changes: 1 addition & 1 deletion pkg/ansible/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"strings"
"time"

"github.com/operator-framework/operator-lib/handler"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -31,7 +32,6 @@ import (

"github.com/operator-framework/operator-sdk/pkg/ansible/events"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
handler "github.com/operator-framework/operator-sdk/pkg/handler"
"github.com/operator-framework/operator-sdk/pkg/predicate"
)

Expand Down
81 changes: 0 additions & 81 deletions pkg/handler/instrumented_enqueue_object.go
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions pkg/handler/internal/metrics/metrics.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/helm/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"sync"
"time"

"github.com/operator-framework/operator-lib/handler"
rpb "helm.sh/helm/v3/pkg/release"
"helm.sh/helm/v3/pkg/releaseutil"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -35,7 +36,6 @@ import (
libhandler "github.com/operator-framework/operator-lib/handler"
"github.com/operator-framework/operator-lib/predicate"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/handler"
"github.com/operator-framework/operator-sdk/pkg/helm/release"
)

Expand Down