Skip to content

Commit

Permalink
Migrate to buf v2 and update database versions (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Jun 10, 2024
1 parent fac9578 commit 95a63a7
Show file tree
Hide file tree
Showing 17 changed files with 115 additions and 105 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test: build
go test -cover ./...

.PHONY: generate-examples
generate-examples:
generate-examples: proto
go run ./pkg/generate/examples/dump.go

.PHONY: test-integration
Expand Down
2 changes: 1 addition & 1 deletion api/v1/backup.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1/database.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1/initializer.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions deploy/etcd-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- command:
- backup-restore-sidecar
- wait
image: quay.io/coreos/etcd:v3.5.7
image: quay.io/coreos/etcd:v3.5.14
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -68,7 +68,7 @@ spec:
- backup-restore-sidecar
- start
- --log-level=debug
image: quay.io/coreos/etcd:v3.5.7
image: quay.io/coreos/etcd:v3.5.14
name: backup-restore-sidecar
ports:
- containerPort: 8000
Expand Down
4 changes: 2 additions & 2 deletions deploy/meilisearch-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- command:
- backup-restore-sidecar
- wait
image: getmeili/meilisearch:v1.3.0
image: getmeili/meilisearch:v1.8.1
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 6
Expand Down Expand Up @@ -80,7 +80,7 @@ spec:
secretKeyRef:
key: MEILISEARCH_URL
name: meilisearch
image: getmeili/meilisearch:v1.3.0
image: getmeili/meilisearch:v1.8.1
name: backup-restore-sidecar
ports:
- containerPort: 8000
Expand Down
4 changes: 2 additions & 2 deletions deploy/postgres-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
secretKeyRef:
key: POSTGRES_DATA
name: postgres
image: postgres:12-alpine
image: postgres:16-alpine
livenessProbe:
exec:
command:
Expand Down Expand Up @@ -107,7 +107,7 @@ spec:
secretKeyRef:
key: POSTGRES_USER
name: postgres
image: postgres:12-alpine
image: postgres:16-alpine
name: backup-restore-sidecar
ports:
- containerPort: 8000
Expand Down
4 changes: 2 additions & 2 deletions deploy/rethinkdb-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
secretKeyRef:
key: rethinkdb-password
name: rethinkdb
image: rethinkdb:2.4.0
image: rethinkdb:2.4.4-bookworm-slim
name: rethinkdb
ports:
- containerPort: 8080
Expand All @@ -48,7 +48,7 @@ spec:
- backup-restore-sidecar
- start
- --log-level=debug
image: rethinkdb:2.4.0
image: rethinkdb:2.4.4-bookworm-slim
name: backup-restore-sidecar
ports:
- containerPort: 8000
Expand Down
45 changes: 23 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/metal-stack/backup-restore-sidecar
go 1.22

require (
cloud.google.com/go/storage v1.40.0
cloud.google.com/go/storage v1.41.0
github.com/Masterminds/semver/v3 v3.2.1
github.com/avast/retry-go/v4 v4.6.0
github.com/aws/aws-sdk-go v1.51.17
github.com/docker/docker v26.1.3+incompatible
github.com/aws/aws-sdk-go v1.53.19
github.com/docker/docker v26.1.4+incompatible
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/lib/pq v1.10.9
github.com/meilisearch/meilisearch-go v0.26.3
Expand All @@ -16,7 +16,7 @@ require (
github.com/mholt/archiver/v3 v3.5.1
github.com/olekukonko/tablewriter v0.0.5
github.com/prometheus/client_golang v1.19.1
github.com/redis/go-redis/v9 v9.5.2
github.com/redis/go-redis/v9 v9.5.3
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/afero v1.11.0
github.com/spf13/cobra v1.8.0
Expand All @@ -25,7 +25,7 @@ require (
github.com/testcontainers/testcontainers-go v0.31.0
go.etcd.io/etcd/client/v3 v3.5.14
golang.org/x/sync v0.7.0
google.golang.org/api v0.182.0
google.golang.org/api v0.183.0
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
Expand All @@ -38,19 +38,20 @@ require (

require (
cloud.google.com/go v0.114.0 // indirect
cloud.google.com/go/auth v0.4.2 // indirect
cloud.google.com/go/auth v0.5.1 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.8 // indirect
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.3 // indirect
github.com/Microsoft/hcsshim v0.12.4 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/containerd v1.7.17 // indirect
github.com/containerd/containerd v1.7.18 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
Expand Down Expand Up @@ -82,7 +83,7 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.2 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
Expand Down Expand Up @@ -121,7 +122,7 @@ require (
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sagikazarmark/locafero v0.5.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
Expand All @@ -134,7 +135,7 @@ require (
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.52.0 // indirect
github.com/valyala/fasthttp v1.54.0 // indirect
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
Expand All @@ -147,24 +148,24 @@ require (
go.opentelemetry.io/otel/trace v1.27.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240403164606-bc84c2ddaf99 // indirect
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
Loading

0 comments on commit 95a63a7

Please sign in to comment.