Skip to content

Commit f23122c

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #525 from stevekuznetsov/skuznets/watch-one-configmap
OCPBUGS-17157: bump controller-runtime, expose pprof, watch only one configmap
2 parents 06e150e + 462d820 commit f23122c

File tree

1,702 files changed

+147199
-66856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,702 files changed

+147199
-66856
lines changed

‎cmd/manager/main.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ import (
99
"runtime"
1010
"time"
1111

12+
"github.com/operator-framework/operator-marketplace/pkg/certificateauthority"
1213
"github.com/sirupsen/logrus"
14+
"k8s.io/apimachinery/pkg/fields"
15+
"sigs.k8s.io/controller-runtime/pkg/cache"
16+
"sigs.k8s.io/controller-runtime/pkg/client"
1317

1418
apiconfigv1 "github.com/openshift/api/config/v1"
1519
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -72,12 +76,14 @@ func main() {
7276
tlsKeyPath string
7377
tlsCertPath string
7478
leaderElectionNamespace string
79+
pprofAddress string
7580
version bool
7681
loglvl string
7782
)
7883
flag.StringVar(&clusterOperatorName, "clusterOperatorName", "", "configures the name of the OpenShift ClusterOperator that should reflect this operator's status, or the empty string to disable ClusterOperator updates")
7984
flag.StringVar(&defaults.Dir, "defaultsDir", "", "configures the directory where the default CatalogSources are stored")
8085
flag.BoolVar(&version, "version", false, "displays marketplace source commit info.")
86+
flag.StringVar(&pprofAddress, "pprof-address", ":6060", "Address to serve pprof endpoints on.")
8187
flag.StringVar(&tlsKeyPath, "tls-key", "", "Path to use for private key (requires tls-cert)")
8288
flag.StringVar(&tlsCertPath, "tls-cert", "", "Path to use for certificate (requires tls-key)")
8389
flag.StringVar(&leaderElectionNamespace, "leader-namespace", "openshift-marketplace", "configures the namespace that will contain the leader election lock")
@@ -136,7 +142,18 @@ func main() {
136142
mgr, err := manager.New(cfg, manager.Options{
137143
Namespace: "",
138144
MetricsBindAddress: "0",
145+
PprofBindAddress: pprofAddress,
139146
Scheme: scheme,
147+
Cache: cache.Options{
148+
ByObject: map[client.Object]cache.ByObject{
149+
&corev1.ConfigMap{}: {
150+
Field: fields.SelectorFromSet(fields.Set{
151+
"metadata.namespace": namespace,
152+
"metadata.name": certificateauthority.TrustedCaConfigMapName,
153+
}),
154+
},
155+
},
156+
},
140157
})
141158
if err != nil {
142159
logger.Fatal(err)

‎go.mod

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,94 +3,91 @@ module github.com/operator-framework/operator-marketplace
33
go 1.19
44

55
require (
6-
github.com/fsnotify/fsnotify v1.5.4
6+
github.com/fsnotify/fsnotify v1.6.0
77
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
8-
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.19.0
10-
github.com/openshift/api v0.0.0-20220831183848-09c070622e2c
11-
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
12-
github.com/openshift/library-go v0.0.0-20230104113217-6b1af8fd2ba4
8+
github.com/onsi/ginkgo/v2 v2.11.0
9+
github.com/onsi/gomega v1.27.8
10+
github.com/openshift/api v0.0.0-20230613151523-ba04973d3ed1
11+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
12+
github.com/openshift/library-go v0.0.0-20230724150037-c515269de16e
1313
github.com/operator-framework/api v0.17.3
14-
github.com/prometheus/client_golang v1.12.2
15-
github.com/sirupsen/logrus v1.8.1
16-
github.com/stretchr/testify v1.7.0
17-
k8s.io/api v0.25.0
18-
k8s.io/apimachinery v0.25.0
19-
k8s.io/client-go v0.25.0
20-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
21-
sigs.k8s.io/controller-runtime v0.13.0
14+
github.com/prometheus/client_golang v1.15.1
15+
github.com/sirupsen/logrus v1.9.0
16+
github.com/stretchr/testify v1.8.1
17+
k8s.io/api v0.27.4
18+
k8s.io/apimachinery v0.27.4
19+
k8s.io/client-go v0.27.4
20+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
21+
sigs.k8s.io/controller-runtime v0.15.0
2222
)
2323

2424
require (
25-
cloud.google.com/go v0.97.0 // indirect
26-
github.com/PuerkitoBio/purell v1.1.1 // indirect
27-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2825
github.com/beorn7/perks v1.0.1 // indirect
2926
github.com/blang/semver/v4 v4.0.0 // indirect
30-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
27+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3128
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
29+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3330
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3431
github.com/fatih/color v1.12.0 // indirect
3532
github.com/ghodss/yaml v1.0.0 // indirect
36-
github.com/go-logr/logr v1.2.3 // indirect
37-
github.com/go-logr/zapr v1.2.3 // indirect
38-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
39-
github.com/go-openapi/jsonreference v0.19.5 // indirect
40-
github.com/go-openapi/swag v0.19.14 // indirect
33+
github.com/go-logr/logr v1.2.4 // indirect
34+
github.com/go-logr/zapr v1.2.4 // indirect
35+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
36+
github.com/go-openapi/jsonreference v0.20.1 // indirect
37+
github.com/go-openapi/swag v0.22.3 // indirect
38+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4139
github.com/goccy/go-yaml v1.8.1 // indirect
4240
github.com/gogo/protobuf v1.3.2 // indirect
4341
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
44-
github.com/golang/protobuf v1.5.2 // indirect
42+
github.com/golang/protobuf v1.5.3 // indirect
4543
github.com/google/gnostic v0.5.7-v3refs // indirect
46-
github.com/google/go-cmp v0.5.8 // indirect
44+
github.com/google/go-cmp v0.5.9 // indirect
4745
github.com/google/gofuzz v1.2.0 // indirect
48-
github.com/google/uuid v1.2.0 // indirect
46+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
47+
github.com/google/uuid v1.3.0 // indirect
4948
github.com/imdario/mergo v0.3.12 // indirect
50-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
49+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5150
github.com/josharian/intern v1.0.0 // indirect
5251
github.com/json-iterator/go v1.1.12 // indirect
5352
github.com/kylelemons/godebug v1.1.0 // indirect
5453
github.com/mailru/easyjson v0.7.7 // indirect
5554
github.com/mattn/go-colorable v0.1.8 // indirect
5655
github.com/mattn/go-isatty v0.0.12 // indirect
57-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
56+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5857
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5958
github.com/modern-go/reflect2 v1.0.2 // indirect
6059
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
61-
github.com/nxadm/tail v1.4.8 // indirect
6260
github.com/pkg/errors v0.9.1 // indirect
6361
github.com/pmezard/go-difflib v1.0.0 // indirect
64-
github.com/prometheus/client_model v0.2.0 // indirect
65-
github.com/prometheus/common v0.32.1 // indirect
66-
github.com/prometheus/procfs v0.7.3 // indirect
67-
github.com/spf13/cobra v1.4.0 // indirect
62+
github.com/prometheus/client_model v0.4.0 // indirect
63+
github.com/prometheus/common v0.42.0 // indirect
64+
github.com/prometheus/procfs v0.9.0 // indirect
65+
github.com/spf13/cobra v1.6.1 // indirect
6866
github.com/spf13/pflag v1.0.5 // indirect
6967
go.uber.org/atomic v1.7.0 // indirect
7068
go.uber.org/multierr v1.6.0 // indirect
71-
go.uber.org/zap v1.21.0 // indirect
72-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
73-
golang.org/x/net v0.4.0 // indirect
74-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
75-
golang.org/x/sys v0.3.0 // indirect
76-
golang.org/x/term v0.3.0 // indirect
77-
golang.org/x/text v0.5.0 // indirect
78-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
79-
golang.org/x/tools v0.1.12 // indirect
80-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
81-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
69+
go.uber.org/zap v1.24.0 // indirect
70+
golang.org/x/mod v0.10.0 // indirect
71+
golang.org/x/net v0.10.0 // indirect
72+
golang.org/x/oauth2 v0.5.0 // indirect
73+
golang.org/x/sys v0.9.0 // indirect
74+
golang.org/x/term v0.8.0 // indirect
75+
golang.org/x/text v0.9.0 // indirect
76+
golang.org/x/time v0.3.0 // indirect
77+
golang.org/x/tools v0.9.3 // indirect
78+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
79+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
8280
google.golang.org/appengine v1.6.7 // indirect
83-
google.golang.org/protobuf v1.28.0 // indirect
81+
google.golang.org/protobuf v1.30.0 // indirect
8482
gopkg.in/inf.v0 v0.9.1 // indirect
8583
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
86-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8784
gopkg.in/yaml.v2 v2.4.0 // indirect
8885
gopkg.in/yaml.v3 v3.0.1 // indirect
89-
k8s.io/component-base v0.25.0 // indirect
90-
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
91-
k8s.io/klog/v2 v2.70.1 // indirect
92-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
93-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
86+
k8s.io/component-base v0.27.4 // indirect
87+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
88+
k8s.io/klog/v2 v2.90.1 // indirect
89+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
90+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9491
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9592
sigs.k8s.io/yaml v1.3.0 // indirect
9693
)

0 commit comments

Comments
 (0)