Skip to content

Commit 28bcfa6

Browse files
authored
Merge pull request #344 from authzed/test-refresh
update tests with newer versions of dbs and kube
2 parents 1757d5c + 1c697d9 commit 28bcfa6

File tree

6 files changed

+54
-68
lines changed

6 files changed

+54
-68
lines changed

e2e/cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ var _ = Describe("SpiceDBClusters", func() {
356356
lastCluster = c
357357
return condition == nil
358358
})
359-
Expect(condition).To(EqualCondition(v1alpha1.NewPodErrorCondition(`failed to create containerd task: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: exec: "badcmd": executable file not found in $PATH: unknown`)))
359+
Expect(condition).To(EqualCondition(v1alpha1.NewPodErrorCondition(`failed to create containerd task: failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: exec: "badcmd": executable file not found in $PATH: unknown`)))
360360

361361
By("fixing the config problem")
362362
config["cmd"] = spicedbCmd

e2e/databases/manifests/cockroachdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
topologyKey: kubernetes.io/hostname
8787
containers:
8888
- name: cockroachdb
89-
image: cockroachdb/cockroach:v22.1.13
89+
image: cockroachdb/cockroach:v24.1.9
9090
imagePullPolicy: IfNotPresent
9191
ports:
9292
- containerPort: 26257
@@ -169,7 +169,7 @@ spec:
169169
spec:
170170
containers:
171171
- name: cluster-init
172-
image: cockroachdb/cockroach:v22.1.13
172+
image: cockroachdb/cockroach:v24.1.9
173173
imagePullPolicy: IfNotPresent
174174
command:
175175
- "/cockroach/cockroach"

e2e/databases/manifests/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: postgresql-db
18-
image: postgres:13.8-alpine
18+
image: postgres:16.6-alpine3.21
1919
imagePullPolicy: IfNotPresent
2020
env:
2121
- name: POSTGRES_PASSWORD

e2e/databases/manifests/spanner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
spec:
3636
containers:
3737
- name: spanner
38-
image: gcr.io/cloud-spanner-emulator/emulator:1.5.14
38+
image: gcr.io/cloud-spanner-emulator/emulator:1.5.24
3939
imagePullPolicy: IfNotPresent
4040
ports:
4141
- containerPort: 9010

e2e/go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
github.com/jackc/pgx/v5 v5.6.0
2525
github.com/jzelinskie/stringz v0.0.3
2626
github.com/nightlyone/lockfile v1.0.0
27-
github.com/onsi/ginkgo/v2 v2.20.1
28-
github.com/onsi/gomega v1.34.1
27+
github.com/onsi/ginkgo/v2 v2.22.1
28+
github.com/onsi/gomega v1.36.2
2929
github.com/spf13/afero v1.11.0
3030
go.uber.org/zap v1.27.0
3131
google.golang.org/api v0.187.0
@@ -42,7 +42,7 @@ require (
4242
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
4343
sigs.k8s.io/controller-runtime v0.18.4
4444
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240707215501-3299760ea46c
45-
sigs.k8s.io/kind v0.18.0
45+
sigs.k8s.io/kind v0.26.0
4646
sigs.k8s.io/yaml v1.4.0
4747
)
4848

@@ -55,10 +55,10 @@ require (
5555
cloud.google.com/go/longrunning v0.5.9 // indirect
5656
filippo.io/edwards25519 v1.1.0 // indirect
5757
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
58-
github.com/BurntSushi/toml v1.2.1 // indirect
58+
github.com/BurntSushi/toml v1.4.0 // indirect
5959
github.com/MakeNowJust/heredoc v1.0.0 // indirect
6060
github.com/NYTimes/gziphandler v1.1.1 // indirect
61-
github.com/alessio/shellescape v1.4.1 // indirect
61+
github.com/alessio/shellescape v1.4.2 // indirect
6262
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
6363
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6464
github.com/beorn7/perks v1.0.1 // indirect
@@ -92,7 +92,7 @@ require (
9292
github.com/google/gnostic-models v0.6.8 // indirect
9393
github.com/google/go-cmp v0.6.0 // indirect
9494
github.com/google/gofuzz v1.2.0 // indirect
95-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
95+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
9696
github.com/google/s2a-go v0.1.7 // indirect
9797
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
9898
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -111,7 +111,7 @@ require (
111111
github.com/json-iterator/go v1.1.12 // indirect
112112
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
113113
github.com/mailru/easyjson v0.7.7 // indirect
114-
github.com/mattn/go-isatty v0.0.17 // indirect
114+
github.com/mattn/go-isatty v0.0.20 // indirect
115115
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
116116
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
117117
github.com/moby/spdystream v0.4.0 // indirect
@@ -121,7 +121,7 @@ require (
121121
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
122122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123123
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
124-
github.com/pelletier/go-toml v1.9.4 // indirect
124+
github.com/pelletier/go-toml v1.9.5 // indirect
125125
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
126126
github.com/pkg/errors v0.9.1 // indirect
127127
github.com/prometheus/client_golang v1.19.1 // indirect
@@ -151,19 +151,19 @@ require (
151151
go.starlark.net v0.0.0-20240705175910-70002002b310 // indirect
152152
go.uber.org/atomic v1.11.0 // indirect
153153
go.uber.org/multierr v1.11.0 // indirect
154-
golang.org/x/crypto v0.26.0 // indirect
154+
golang.org/x/crypto v0.31.0 // indirect
155155
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
156-
golang.org/x/net v0.28.0 // indirect
156+
golang.org/x/net v0.33.0 // indirect
157157
golang.org/x/oauth2 v0.21.0 // indirect
158-
golang.org/x/sync v0.8.0 // indirect
159-
golang.org/x/sys v0.23.0 // indirect
160-
golang.org/x/term v0.23.0 // indirect
161-
golang.org/x/text v0.17.0 // indirect
158+
golang.org/x/sync v0.10.0 // indirect
159+
golang.org/x/sys v0.28.0 // indirect
160+
golang.org/x/term v0.27.0 // indirect
161+
golang.org/x/text v0.21.0 // indirect
162162
golang.org/x/time v0.5.0 // indirect
163-
golang.org/x/tools v0.24.0 // indirect
163+
golang.org/x/tools v0.28.0 // indirect
164164
google.golang.org/genproto/googleapis/api v0.0.0-20240708141625-4ad9e859172b // indirect
165165
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
166-
google.golang.org/protobuf v1.34.2 // indirect
166+
google.golang.org/protobuf v1.36.1 // indirect
167167
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
168168
gopkg.in/inf.v0 v0.9.1 // indirect
169169
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)