Skip to content

Commit

Permalink
Merge pull request #24 from metalmatze/updates-2023-05
Browse files Browse the repository at this point in the history
Update all Go dependencies and migrate to PodDisruptionBudget/v1
  • Loading branch information
metalmatze authored Jun 28, 2023
2 parents 1d5d378 + 055d3ea commit 9844a47
Show file tree
Hide file tree
Showing 14 changed files with 482 additions and 532 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.0
1.20.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17-alpine AS build
FROM golang:1.20-alpine AS build

ARG ARCH=amd64
ENV CGO_ENABLED=0
Expand All @@ -12,7 +12,7 @@ COPY . /app
RUN make build -o operator/api/v1alphav1/zz_generated.deepcopy.go
RUN cp ./kubernetes.libsonnet ./operator/kubernetes.libsonnet

FROM alpine:3.11
FROM alpine:3.18

COPY --from=build /app/operator/operator /kube-cockroachdb/operator/operator
COPY --from=build /app/operator/config.yaml /kube-cockroachdb/operator/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ test:
CGO_ENABLED=0 go test -v ./operator/...

operator/operator: $(shell find ./operator -type f -name '*.go')
CGO_ENABLED=0 go build -v -ldflags '-w -extldflags '-static'' -o operator ./operator/...
CGO_ENABLED=0 go build -v -o operator ./operator/...

operator/metalmatze.de_cockroachdbs.yaml: $(shell find ./operator/api/v1alphav1 -type f -name '*.go') | $(CONTROLLER_GEN)
$(CONTROLLER_GEN) crd paths="./operator/..." output:crd:artifacts:config=./operator
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ items:
image: cockroachdb/cockroach:v20.1.5
name: cluster-init
restartPolicy: OnFailure
- apiVersion: policy/v1beta1
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion examples/storage/storage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ items:
image: cockroachdb/cockroach:v20.1.5
name: cluster-init
restartPolicy: OnFailure
- apiVersion: policy/v1beta1
- apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
labels:
Expand Down
82 changes: 72 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,79 @@
module github.com/metalmatze/kube-cockroachdb

go 1.14
go 1.20

require (
github.com/brancz/locutus v0.0.0-20200430073700-65b7640ed9bc
github.com/go-kit/kit v0.10.0
github.com/metalmatze/signal v0.0.0-20200428133549-c4243ecaf121
github.com/brancz/locutus v0.2.0-rc.4.0.20230627132800-aa1e6baa6119
github.com/go-kit/kit v0.12.0
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a
github.com/oklog/run v1.1.0
github.com/prometheus/client_golang v1.5.1
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
sigs.k8s.io/controller-runtime v0.6.0
github.com/prometheus/client_golang v1.16.0
k8s.io/api v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.27.3
sigs.k8s.io/controller-runtime v0.15.0
)

replace github.com/brancz/locutus => github.com/metalmatze/locutus v0.0.0-20200526233827-d87182291dbf
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/cockroach-go/v2 v2.3.5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-jsonnet v0.20.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/pgx/v4 v4.18.1 // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/oauth2 v0.9.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 9844a47

Please sign in to comment.