Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: wanjunlei <wanjunlei@kubesphere.io>
  • Loading branch information
wanjunlei committed Jan 30, 2023
1 parent 3c39e05 commit 91a1263
Show file tree
Hide file tree
Showing 8 changed files with 1,476 additions and 1,148 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ARG GOPROXY="https://goproxy.cn"

# Build the openfunction binary
FROM golang:1.16 as builder
FROM golang:1.18 as builder
ARG GOPROXY

WORKDIR /workspace
Expand Down
754 changes: 620 additions & 134 deletions config/bundle.yaml

Large diffs are not rendered by default.

244 changes: 244 additions & 0 deletions config/crd/bases/core.openfunction.io_functions.yaml

Large diffs are not rendered by default.

244 changes: 244 additions & 0 deletions config/crd/bases/core.openfunction.io_servings.yaml

Large diffs are not rendered by default.

44 changes: 14 additions & 30 deletions controllers/events/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

componentsv1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
"github.com/go-logr/logr"
log "github.com/go-logr/logr/testing"
"github.com/go-logr/logr/testr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/json"
Expand Down Expand Up @@ -119,11 +119,9 @@ func Test_createSinkComponent(t *testing.T) {
{
name: "Use uri",
args: args{
ctx: context.Background(),
c: nil,
log: &log.TestLogger{
T: t,
},
ctx: context.Background(),
c: nil,
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Uri: &uri,
Expand All @@ -149,9 +147,7 @@ func Test_createSinkComponent(t *testing.T) {
},
Status: *newServiceStatusFunc(t, "http://test-service"),
}).Build(),
log: &log.TestLogger{
T: t,
},
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand Down Expand Up @@ -184,9 +180,7 @@ func Test_createSinkComponent(t *testing.T) {
Addresses: []ofcore.FunctionAddress{{Type: &addressType, Value: "http://test-of"}},
},
}).Build(),
log: &log.TestLogger{
T: t,
},
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand Down Expand Up @@ -217,9 +211,7 @@ func Test_createSinkComponent(t *testing.T) {
},
Status: *newServiceStatusFunc(t, "http://test"),
}).Build(),
log: &log.TestLogger{
T: t,
},
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand Down Expand Up @@ -251,9 +243,7 @@ func Test_createSinkComponent(t *testing.T) {
},
Status: *newServiceStatusFunc(t, "http://test-ref"),
}).Build(),
log: &log.TestLogger{
T: t,
},
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand All @@ -279,9 +269,7 @@ func Test_createSinkComponent(t *testing.T) {
Addresses: []ofcore.FunctionAddress{{Type: &addressType, Value: "http://test-of"}},
},
}).Build(),
log: &log.TestLogger{
T: t,
},
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand All @@ -297,11 +285,9 @@ func Test_createSinkComponent(t *testing.T) {
{
name: "unsupported reference",
args: args{
ctx: context.Background(),
c: nil,
log: &log.TestLogger{
T: t,
},
ctx: context.Background(),
c: nil,
log: testr.New(t),
resource: resource,
sink: &ofevent.SinkSpec{
Ref: &ofevent.Reference{
Expand All @@ -317,10 +303,8 @@ func Test_createSinkComponent(t *testing.T) {
{
name: "None of them are set",
args: args{
ctx: context.Background(),
log: &log.TestLogger{
T: t,
},
ctx: context.Background(),
log: testr.New(t),
sink: &ofevent.SinkSpec{},
},
wantErr: true,
Expand Down
104 changes: 84 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,33 +1,97 @@
module github.com/openfunction

go 1.16
go 1.18

require (
github.com/dapr/dapr v1.3.1
github.com/go-logr/logr v1.2.0
github.com/json-iterator/go v1.1.11
github.com/dapr/dapr v1.8.3
github.com/go-logr/logr v1.2.3
github.com/json-iterator/go v1.1.12
github.com/kedacore/keda/v2 v2.4.0
github.com/mitchellh/hashstructure v1.1.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.15.0
github.com/shipwright-io/build v0.6.0
go.uber.org/zap v1.19.0
golang.org/x/text v0.3.6
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.20.2
github.com/shipwright-io/build v0.11.0
go.uber.org/zap v1.23.0
golang.org/x/text v0.5.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/api v0.25.0-alpha.0
k8s.io/apimachinery v0.25.0-alpha.0
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
knative.dev/serving v0.26.0
sigs.k8s.io/controller-runtime v0.9.7
knative.dev/serving v0.32.0
sigs.k8s.io/controller-runtime v0.12.1
sigs.k8s.io/gateway-api v0.4.0
)

require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/zapr v1.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-containerregistry v0.11.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
golang.org/x/tools v0.4.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.25.0-alpha.0 // indirect
k8s.io/component-base v0.25.0-alpha.0 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
knative.dev/networking v0.0.0-20220524205304-22d1b933cf73 // indirect
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.7
k8s.io/api => k8s.io/api v0.23.5
k8s.io/apimachinery => k8s.io/apimachinery v0.23.5
k8s.io/client-go => k8s.io/client-go v0.23.5
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2
)

0 comments on commit 91a1263

Please sign in to comment.