Skip to content

Commit 6aef030

Browse files
authored
Merge pull request #408 from application-stacks/update-deps
Update operator dependencies
2 parents 8360d69 + f4bd718 commit 6aef030

File tree

813 files changed

+56567
-13842
lines changed

Some content is hidden

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

813 files changed

+56567
-13842
lines changed

bundle/manifests/rc.app.stacks_runtimecomponents.yaml

Lines changed: 190 additions & 61 deletions
Large diffs are not rendered by default.

bundle/manifests/runtime-component.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadata:
3838
categories: Application Runtime
3939
certified: "true"
4040
containerImage: applicationstacks/operator:daily
41-
createdAt: "2022-05-20T14:35:03Z"
41+
createdAt: "2022-07-07T12:04:46Z"
4242
description: Deploys any runtime component with dynamic and auto-tuning configuration
4343
operators.operatorframework.io/builder: operator-sdk-v1.6.1+git
4444
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

common/common.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
// GetDefaultMicroProfileStartupProbe returns the default values for MicroProfile Health-based startup probe.
99
func GetDefaultMicroProfileStartupProbe(ba BaseComponent) *corev1.Probe {
1010
return &corev1.Probe{
11-
Handler: corev1.Handler{
11+
ProbeHandler: corev1.ProbeHandler{
1212
HTTPGet: &corev1.HTTPGetAction{
1313
Path: "/health/started",
1414
Port: intstr.FromInt(int(ba.GetService().GetPort())),
@@ -24,7 +24,7 @@ func GetDefaultMicroProfileStartupProbe(ba BaseComponent) *corev1.Probe {
2424
// GetDefaultMicroProfileReadinessProbe returns the default values for MicroProfile Health-based readiness probe.
2525
func GetDefaultMicroProfileReadinessProbe(ba BaseComponent) *corev1.Probe {
2626
return &corev1.Probe{
27-
Handler: corev1.Handler{
27+
ProbeHandler: corev1.ProbeHandler{
2828
HTTPGet: &corev1.HTTPGetAction{
2929
Path: "/health/ready",
3030
Port: intstr.FromInt(int(ba.GetService().GetPort())),
@@ -41,7 +41,7 @@ func GetDefaultMicroProfileReadinessProbe(ba BaseComponent) *corev1.Probe {
4141
// GetDefaultMicroProfileLivenessProbe returns the default values for MicroProfile Health-based liveness probe.
4242
func GetDefaultMicroProfileLivenessProbe(ba BaseComponent) *corev1.Probe {
4343
return &corev1.Probe{
44-
Handler: corev1.Handler{
44+
ProbeHandler: corev1.ProbeHandler{
4545
HTTPGet: &corev1.HTTPGetAction{
4646
Path: "/health/live",
4747
Port: intstr.FromInt(int(ba.GetService().GetPort())),

config/crd/bases/rc.app.stacks_runtimecomponents.yaml

Lines changed: 331 additions & 111 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,87 +3,86 @@ module github.com/application-stacks/runtime-component-operator
33
go 1.17
44

55
require (
6-
github.com/go-logr/logr v0.4.0
6+
github.com/go-logr/logr v1.2.2
77
github.com/jetstack/cert-manager v1.5.0
8-
github.com/openshift/api v0.0.0-20211028023115-7224b732cc14
9-
github.com/openshift/library-go v0.0.0-20220405121559-e304504b7d6f
8+
github.com/openshift/api v0.0.0-20220414050251-a83e6f8f1d50
9+
github.com/openshift/library-go v0.0.0-20220630204433-c71d40c7de49
1010
github.com/pkg/errors v0.9.1
1111
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0
12-
k8s.io/api v0.22.8
13-
k8s.io/apimachinery v0.22.8
14-
k8s.io/client-go v0.22.8
15-
knative.dev/serving v0.26.0
16-
sigs.k8s.io/controller-runtime v0.10.3
12+
k8s.io/api v0.23.5
13+
k8s.io/apimachinery v0.23.5
14+
k8s.io/client-go v0.23.5
15+
knative.dev/serving v0.32.0
16+
sigs.k8s.io/controller-runtime v0.11.2
1717
)
1818

1919
require (
20-
cloud.google.com/go v0.84.0 // indirect
20+
cloud.google.com/go v0.98.0 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver v3.5.1+incompatible // indirect
23-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
23+
github.com/blendle/zapdriver v1.3.1 // indirect
24+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2425
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
26-
github.com/evanphx/json-patch/v5 v5.5.0 // indirect
27-
github.com/fsnotify/fsnotify v1.4.9 // indirect
28-
github.com/go-logr/zapr v0.4.0 // indirect
26+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
27+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
28+
github.com/fsnotify/fsnotify v1.5.1 // indirect
29+
github.com/go-logr/zapr v1.2.0 // indirect
2930
github.com/gogo/protobuf v1.3.2 // indirect
3031
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3132
github.com/golang/protobuf v1.5.2 // indirect
32-
github.com/google/go-cmp v0.5.6 // indirect
33-
github.com/google/go-containerregistry v0.6.0 // indirect
33+
github.com/google/go-cmp v0.5.7 // indirect
34+
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 // indirect
3435
github.com/google/gofuzz v1.2.0 // indirect
3536
github.com/google/uuid v1.3.0 // indirect
3637
github.com/googleapis/gnostic v0.5.5 // indirect
3738
github.com/hashicorp/golang-lru v0.5.4 // indirect
3839
github.com/imdario/mergo v0.3.12 // indirect
39-
github.com/json-iterator/go v1.1.11 // indirect
40+
github.com/json-iterator/go v1.1.12 // indirect
4041
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4142
github.com/moby/spdystream v0.2.0 // indirect
4243
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
43-
github.com/modern-go/reflect2 v1.0.1 // indirect
44-
github.com/prometheus/client_golang v1.11.0 // indirect
44+
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/prometheus/client_golang v1.11.1 // indirect
4546
github.com/prometheus/client_model v0.2.0 // indirect
46-
github.com/prometheus/common v0.30.0 // indirect
47-
github.com/prometheus/procfs v0.6.0 // indirect
47+
github.com/prometheus/common v0.32.1 // indirect
48+
github.com/prometheus/procfs v0.7.3 // indirect
4849
github.com/spf13/pflag v1.0.5 // indirect
4950
go.uber.org/atomic v1.9.0 // indirect
5051
go.uber.org/multierr v1.6.0 // indirect
51-
go.uber.org/zap v1.19.0 // indirect
52-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
53-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
54-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
55-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
56-
golang.org/x/text v0.3.6 // indirect
57-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
52+
go.uber.org/zap v1.19.1 // indirect
53+
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
54+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
55+
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
56+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
57+
golang.org/x/text v0.3.7 // indirect
58+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
5859
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
5960
google.golang.org/appengine v1.6.7 // indirect
6061
google.golang.org/protobuf v1.27.1 // indirect
6162
gopkg.in/inf.v0 v0.9.1 // indirect
6263
gopkg.in/yaml.v2 v2.4.0 // indirect
6364
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
64-
k8s.io/apiextensions-apiserver v0.22.2 // indirect
65-
k8s.io/component-base v0.22.2 // indirect
66-
k8s.io/klog/v2 v2.9.0 // indirect
67-
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
68-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
69-
knative.dev/networking v0.0.0-20210914225408-69ad45454096 // indirect
70-
knative.dev/pkg v0.0.0-20210919202233-5ae482141474 // indirect
65+
k8s.io/apiextensions-apiserver v0.23.5 // indirect
66+
k8s.io/component-base v0.23.5 // indirect
67+
k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89 // indirect
68+
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
69+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
70+
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73 // indirect
71+
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8 // indirect
72+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
7173
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
72-
sigs.k8s.io/yaml v1.2.0 // indirect
74+
sigs.k8s.io/yaml v1.3.0 // indirect
7375
)
7476

7577
replace (
76-
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
77-
github.com/go-logr/zapr => github.com/go-logr/zapr v0.2.0
78-
7978
//To resolve license issue - https://github.com/operator-framework/operator-registry/issues/190
8079
github.com/otiai10/copy => github.com/otiai10/copy v1.0.2
8180
github.com/otiai10/mint => github.com/otiai10/mint v1.3.0
8281
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.1
83-
k8s.io/api => k8s.io/api v0.22.8
84-
k8s.io/apimachinery => k8s.io/apimachinery v0.22.8
85-
k8s.io/client-go => k8s.io/client-go v0.22.8
86-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.10.3
82+
k8s.io/api => k8s.io/api v0.23.0
83+
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
84+
k8s.io/client-go => k8s.io/client-go v0.23.0
85+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2
8786
)
8887

8988
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

0 commit comments

Comments
 (0)