Skip to content

Commit c35fc73

Browse files
authored
Merge pull request #271 from authzed/spicedb-1.25
Add SpiceDB v1.25.0 to the stable channel
2 parents 80bfd88 + 8a048d6 commit c35fc73

File tree

16 files changed

+811
-912
lines changed

16 files changed

+811
-912
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM golang:1.20-alpine3.18 AS builder
1+
FROM golang:1.21-alpine3.18 AS builder
22
WORKDIR /go/src/app
33
ENV CGO_ENABLED=0
44

55
COPY go.mod go.sum ./
66
COPY . .
77
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod go build ./cmd/...
88

9-
FROM alpine:3.18.2
9+
FROM alpine:3.18.4
1010

1111
COPY --from=builder /go/src/app/validated-update-graph.yaml /opt/operator/config.yaml
1212
COPY --from=builder /go/src/app/spicedb-operator /usr/local/bin/spicedb-operator

Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# vim: syntax=dockerfile
22
FROM gcr.io/distroless/base:nonroot
33
COPY validated-update-graph.yaml /opt/operator/config.yaml
4-
COPY --from=ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.19 /ko-app/grpc-health-probe /usr/local/bin/grpc_health_probe
4+
COPY --from=ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.22 /ko-app/grpc-health-probe /usr/local/bin/grpc_health_probe
55
COPY spicedb-operator /usr/local/bin/spicedb-operator
66
ENTRYPOINT ["spicedb-operator"]

e2e/go.mod

Lines changed: 79 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,52 @@ module github.com/authzed/spicedb-operator/e2e
33
go 1.20
44

55
require (
6-
cloud.google.com/go/spanner v1.45.0
6+
cloud.google.com/go/spanner v1.51.0
77
github.com/authzed/controller-idioms v0.9.1
88
github.com/authzed/spicedb-operator v0.0.0-00010101000000-000000000000
99
github.com/fluxcd/pkg/ssa v0.23.0
10-
github.com/go-logr/logr v1.2.4
10+
github.com/go-logr/logr v1.3.0
1111
github.com/go-logr/zapr v1.2.3
1212
github.com/go-sql-driver/mysql v1.7.0
1313
github.com/jackc/pgx/v5 v5.2.0
14-
github.com/jzelinskie/stringz v0.0.1
14+
github.com/jzelinskie/stringz v0.0.2
1515
github.com/nightlyone/lockfile v1.0.0
1616
github.com/onsi/ginkgo/v2 v2.11.0
1717
github.com/onsi/gomega v1.27.8
1818
github.com/spf13/afero v1.9.4
19-
go.uber.org/zap v1.24.0
20-
google.golang.org/api v0.114.0
21-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
22-
google.golang.org/grpc v1.54.0
23-
k8s.io/api v0.28.0
24-
k8s.io/apiextensions-apiserver v0.28.0
25-
k8s.io/apimachinery v0.28.0
26-
k8s.io/apiserver v0.28.0
27-
k8s.io/cli-runtime v0.28.0
28-
k8s.io/client-go v0.28.0
29-
k8s.io/klog/v2 v2.100.1
30-
k8s.io/kubectl v0.28.0
31-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
19+
go.uber.org/zap v1.26.0
20+
google.golang.org/api v0.128.0
21+
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405
22+
google.golang.org/grpc v1.59.0
23+
k8s.io/api v0.28.3
24+
k8s.io/apiextensions-apiserver v0.28.3
25+
k8s.io/apimachinery v0.28.3
26+
k8s.io/apiserver v0.28.3
27+
k8s.io/cli-runtime v0.28.3
28+
k8s.io/client-go v0.28.3
29+
k8s.io/klog/v2 v2.110.1
30+
k8s.io/kubectl v0.28.3
31+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3232
sigs.k8s.io/cli-utils v0.34.0
3333
sigs.k8s.io/controller-runtime v0.14.1
3434
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230816140827-f30e11d97fd1
3535
sigs.k8s.io/kind v0.17.0
36-
sigs.k8s.io/yaml v1.3.0
36+
sigs.k8s.io/yaml v1.4.0
3737
)
3838

3939
require (
40-
cloud.google.com/go v0.110.0 // indirect
41-
cloud.google.com/go/compute v1.19.1 // indirect
40+
cloud.google.com/go v0.110.9 // indirect
41+
cloud.google.com/go/compute v1.23.2 // indirect
4242
cloud.google.com/go/compute/metadata v0.2.3 // indirect
43-
cloud.google.com/go/iam v0.13.0 // indirect
44-
cloud.google.com/go/longrunning v0.4.1 // indirect
45-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
43+
cloud.google.com/go/iam v1.1.4 // indirect
44+
cloud.google.com/go/longrunning v0.5.3 // indirect
45+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4646
github.com/BurntSushi/toml v1.2.1 // indirect
4747
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4848
github.com/NYTimes/gziphandler v1.1.1 // indirect
4949
github.com/alessio/shellescape v1.4.1 // indirect
5050
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
51-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
51+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5252
github.com/beorn7/perks v1.0.1 // indirect
5353
github.com/blang/semver/v4 v4.0.0 // indirect
5454
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -57,38 +57,39 @@ require (
5757
github.com/coreos/go-semver v0.3.1 // indirect
5858
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5959
github.com/davecgh/go-spew v1.1.1 // indirect
60-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
61-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
60+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
61+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
6262
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
63-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
63+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6464
github.com/fatih/camelcase v1.0.0 // indirect
6565
github.com/felixge/httpsnoop v1.0.3 // indirect
66-
github.com/fsnotify/fsnotify v1.6.0 // indirect
66+
github.com/fsnotify/fsnotify v1.7.0 // indirect
6767
github.com/fvbommel/sortorder v1.1.0 // indirect
68-
github.com/go-errors/errors v1.4.2 // indirect
68+
github.com/go-errors/errors v1.5.1 // indirect
6969
github.com/go-logr/stdr v1.2.2 // indirect
70-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
70+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
7171
github.com/go-openapi/jsonreference v0.20.2 // indirect
72-
github.com/go-openapi/swag v0.22.3 // indirect
72+
github.com/go-openapi/swag v0.22.4 // indirect
7373
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7474
github.com/gogo/protobuf v1.3.2 // indirect
7575
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7676
github.com/golang/protobuf v1.5.3 // indirect
77-
github.com/google/btree v1.0.1 // indirect
78-
github.com/google/cel-go v0.16.0 // indirect
77+
github.com/google/btree v1.1.2 // indirect
78+
github.com/google/cel-go v0.16.1 // indirect
7979
github.com/google/gnostic-models v0.6.8 // indirect
80-
github.com/google/go-cmp v0.5.9 // indirect
80+
github.com/google/go-cmp v0.6.0 // indirect
8181
github.com/google/gofuzz v1.2.0 // indirect
8282
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
83+
github.com/google/s2a-go v0.1.4 // indirect
8384
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
8485
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
85-
github.com/google/uuid v1.3.0 // indirect
86-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
87-
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
88-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
86+
github.com/google/uuid v1.4.0 // indirect
87+
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
88+
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
89+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8990
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
90-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
91-
github.com/imdario/mergo v0.3.14 // indirect
91+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
92+
github.com/imdario/mergo v0.3.16 // indirect
9293
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9394
github.com/jackc/pgpassfile v1.0.0 // indirect
9495
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
@@ -97,68 +98,68 @@ require (
9798
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
9899
github.com/mailru/easyjson v0.7.7 // indirect
99100
github.com/mattn/go-isatty v0.0.17 // indirect
100-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
101+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
101102
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
102103
github.com/moby/spdystream v0.2.0 // indirect
103-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
104+
github.com/moby/term v0.5.0 // indirect
104105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
105106
github.com/modern-go/reflect2 v1.0.2 // indirect
106107
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
107108
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
108109
github.com/pelletier/go-toml v1.9.4 // indirect
109110
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
110111
github.com/pkg/errors v0.9.1 // indirect
111-
github.com/prometheus/client_golang v1.16.0 // indirect
112-
github.com/prometheus/client_model v0.4.0 // indirect
113-
github.com/prometheus/common v0.44.0 // indirect
114-
github.com/prometheus/procfs v0.10.1 // indirect
112+
github.com/prometheus/client_golang v1.17.0 // indirect
113+
github.com/prometheus/client_model v0.5.0 // indirect
114+
github.com/prometheus/common v0.45.0 // indirect
115+
github.com/prometheus/procfs v0.12.0 // indirect
115116
github.com/russross/blackfriday/v2 v2.1.0 // indirect
116117
github.com/spf13/cobra v1.7.0 // indirect
117118
github.com/spf13/pflag v1.0.5 // indirect
118-
github.com/stoewer/go-strcase v1.2.0 // indirect
119+
github.com/stoewer/go-strcase v1.3.0 // indirect
119120
github.com/xlab/treeprint v1.2.0 // indirect
120-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
121-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
122-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
121+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
122+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
123+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
123124
go.opencensus.io v0.24.0 // indirect
124-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
125-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
126-
go.opentelemetry.io/otel v1.10.0 // indirect
127-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
128-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
130-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
131-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
132-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
133-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
134-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
125+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
126+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
127+
go.opentelemetry.io/otel v1.19.0 // indirect
128+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
129+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
130+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
131+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
132+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
133+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
134+
go.starlark.net v0.0.0-20231101134539-556fd59b42f6 // indirect
135135
go.uber.org/atomic v1.11.0 // indirect
136136
go.uber.org/multierr v1.11.0 // indirect
137-
golang.org/x/crypto v0.12.0 // indirect
138-
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
139-
golang.org/x/net v0.14.0 // indirect
140-
golang.org/x/oauth2 v0.8.0 // indirect
141-
golang.org/x/sync v0.3.0 // indirect
142-
golang.org/x/sys v0.11.0 // indirect
143-
golang.org/x/term v0.11.0 // indirect
144-
golang.org/x/text v0.12.0 // indirect
137+
golang.org/x/crypto v0.14.0 // indirect
138+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
139+
golang.org/x/net v0.17.0 // indirect
140+
golang.org/x/oauth2 v0.13.0 // indirect
141+
golang.org/x/sync v0.4.0 // indirect
142+
golang.org/x/sys v0.13.0 // indirect
143+
golang.org/x/term v0.13.0 // indirect
144+
golang.org/x/text v0.13.0 // indirect
145145
golang.org/x/time v0.3.0 // indirect
146-
golang.org/x/tools v0.12.0 // indirect
147-
google.golang.org/appengine v1.6.7 // indirect
148-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
149-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
146+
golang.org/x/tools v0.14.0 // indirect
147+
google.golang.org/appengine v1.6.8 // indirect
148+
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect
149+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
150150
google.golang.org/protobuf v1.31.0 // indirect
151+
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
151152
gopkg.in/inf.v0 v0.9.1 // indirect
152153
gopkg.in/yaml.v2 v2.4.0 // indirect
153154
gopkg.in/yaml.v3 v3.0.1 // indirect
154-
k8s.io/component-base v0.28.0 // indirect
155-
k8s.io/controller-manager v0.28.0 // indirect
155+
k8s.io/component-base v0.28.3 // indirect
156+
k8s.io/controller-manager v0.28.3 // indirect
156157
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
157-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
158+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.1 // indirect
158159
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
159-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
160-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
161-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
160+
sigs.k8s.io/kustomize/api v0.15.0 // indirect
161+
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
162+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
162163
)
163164

164165
replace github.com/authzed/spicedb-operator => ../

0 commit comments

Comments
 (0)