Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish_ghcr_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: actions/setup-go@v2
with:
go-version: "^1.19.8"
go-version: "^1.23.4"

- name: Run unit tests
run: make deps mocks test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-go@v2
with:
go-version: "^1.21.7"
go-version: "^1.23.4"
- name: Make dependencies
run: make deps mocks
- name: Code generation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "^1.21.7"
go-version: "^1.23.4"
- name: Make dependencies
run: make deps mocks
- name: Compile
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ DIRS := cmd pkg
PKG := `go list ./... | grep -v /vendor/`

BASE_IMAGE ?= rockylinux:9
# BASE_IMAGE ?= rockylinux/rockylinux:10
PACKAGER ?= dnf
BUILD ?= 1
ROOTPATH = $(GOPATH)/src/github.com/cybertec/cybertec-pg-operator
Expand Down Expand Up @@ -88,7 +89,7 @@ docker-local: build/cybertec-pg-operator


indocker-race:
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 bash -c "make linux"
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.23.4 bash -c "make linux"

push:
docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
Expand All @@ -97,7 +98,7 @@ mocks:
GO111MODULE=on go generate ./...

tools:
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.28.7
GO111MODULE=on go get k8s.io/client-go@kubernetes-1.30.4
GO111MODULE=on go install github.com/golang/mock/[email protected]
GO111MODULE=on go mod tidy

Expand Down
2 changes: 1 addition & 1 deletion charts/postgres-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# my-annotation: value

cluster:
dockerImage: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.0-2
dockerImage: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1
numberOfInstances: 2

postgresql:
Expand Down
1 change: 1 addition & 0 deletions charts/postgres-operator-ui/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ spec:
"limit_iops": 16000,
"limit_throughput": 1000,
"postgresql_versions": [
"18",
"17",
"16",
"15",
Expand Down
1 change: 1 addition & 0 deletions charts/postgres-operator/crds/postgresqls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ spec:
- "15"
- "16"
- "17"
- "18"
parameters:
type: object
additionalProperties:
Expand Down
2 changes: 1 addition & 1 deletion docker/build_operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set -ex

(
cd /tmp
wget -q "https://storage.googleapis.com/golang/go1.24.2.linux-${arch}.tar.gz" -O go.tar.gz
wget -q "https://storage.googleapis.com/golang/go1.24.6.linux-${arch}.tar.gz" -O go.tar.gz
tar -xf go.tar.gz
mv go /usr/local
ln -s /usr/local/go/bin/go /usr/bin/go
Expand Down
2 changes: 1 addition & 1 deletion docs/hugo/content/en/first_cluster/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: "docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.4-1"
dockerImage: "docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1"
numberOfInstances: 1
postgresql:
version: "17"
Expand Down
2 changes: 1 addition & 1 deletion docs/hugo/content/en/ha_cluster/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: "docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.4-1"
dockerImage: "docker.io/cybertecpostgresql/cybertec-pg-container:postgres-17.6-1"
numberOfInstances: 2
postgresql:
version: "17"
Expand Down
4 changes: 2 additions & 2 deletions docs/hugo/content/en/pg_versioning/major_upgrades.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ CPO enables the use of the in-place upgrade, which makes it possible to upgrade
```
spec:
postgresql:
version: "17"
version: "18"
```
To trigger an In-Place-Upgrade you have just to increase the parameter `spec.postgresql.version`. If you choose a valid number the Operator will start with the prozedure, described above.

```sh
kubectl patch postgresqls.cpo.opensource.cybertec.at cluster-1 --type='merge' -p \
'{"spec":{"postgresql":{"version":"17"}}}'
'{"spec":{"postgresql":{"version":"18"}}}'
```

## Upgrade on cloning
Expand Down
70 changes: 38 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,44 +1,53 @@
module github.com/cybertec-postgresql/cybertec-pg-operator

go 1.22.12
go 1.23.4

require (
github.com/aws/aws-sdk-go v1.54.18
github.com/aws/aws-sdk-go v1.55.8
github.com/golang/mock v1.6.0
github.com/lib/pq v1.10.4
github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d
github.com/pkg/errors v0.9.1
github.com/r3labs/diff v1.1.0
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
go.etcd.io/etcd/client/v3 v3.5.4
golang.org/x/crypto v0.31.0
golang.org/x/crypto v0.41.0
golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.7
k8s.io/api v0.30.4
k8s.io/apiextensions-apiserver v0.25.9
k8s.io/apimachinery v0.28.7
k8s.io/client-go v0.28.7
k8s.io/code-generator v0.25.9
k8s.io/apimachinery v0.30.4
k8s.io/client-go v0.30.4
k8s.io/code-generator v0.26.15
)

require (
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.75.0 // indirect
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.3 // 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.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -49,33 +58,30 @@ require (
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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.etcd.io/etcd/api/v3 v3.5.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/tools v0.35.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // 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/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading
Loading