Skip to content

Commit

Permalink
FB: Upstream upgrades (#649)
Browse files Browse the repository at this point in the history
  • Loading branch information
oksana-grishchenko authored Jan 31, 2025
1 parent 91ac803 commit 40b6d1d
Show file tree
Hide file tree
Showing 34 changed files with 206 additions and 153 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go release
uses: actions/setup-go@v3
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Install operator-sdk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ${{ fromJson(inputs.go-version || '["1.22.x"]') }}
go-version: ${{ fromJson(inputs.go-version || '["1.23.x"]') }}
may-fail: [ false ]

env:
Expand All @@ -27,7 +27,7 @@ jobs:
if: env.GO_VERSION != 'tip'
uses: actions/setup-go@v3
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Install development tools
Expand Down
42 changes: 20 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
branches:
- main
pull_request:
branches:
- main
types: [opened, synchronize, reopened, labeled]
jobs:
golang-tests:
Expand All @@ -23,7 +21,7 @@ jobs:
- name: Set up Go release
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Install tools
Expand All @@ -42,8 +40,8 @@ jobs:
run:
make test
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

Expand All @@ -62,7 +60,7 @@ jobs:
- name: Set up Go release
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Build operator
Expand Down Expand Up @@ -92,8 +90,8 @@ jobs:
run: |
kubectl kuttl test --config ./tests/integration/kuttl-core.yaml
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

Expand All @@ -102,8 +100,8 @@ jobs:
run: |
kubectl kuttl test --config ./tests/integration/kuttl-features.yaml
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

Expand All @@ -112,12 +110,12 @@ jobs:
run: |
kubectl kuttl test --config ./tests/integration/kuttl-upgrade.yaml
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PREVIOUS_PG_OPERATOR_VERSION: 2.4.1
PREVIOUS_PXC_OPERATOR_VERSION: 1.14.0
PREVIOUS_PSMDB_OPERATOR_VERSION: 1.17.0
PREVIOUS_PXC_OPERATOR_VERSION: 1.15.0
PREVIOUS_PSMDB_OPERATOR_VERSION: 1.18.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

eks-e2e-tests:
Expand All @@ -137,7 +135,7 @@ jobs:
- name: Set up Go release
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Build operator
Expand Down Expand Up @@ -192,12 +190,12 @@ jobs:
run: |
kubectl kuttl test --config ./tests/e2e/kuttl-upgrade.yaml
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PREVIOUS_PG_OPERATOR_VERSION: 2.4.1
PREVIOUS_PXC_OPERATOR_VERSION: 1.14.0
PREVIOUS_PSMDB_OPERATOR_VERSION: 1.17.0
PREVIOUS_PXC_OPERATOR_VERSION: 1.15.0
PREVIOUS_PSMDB_OPERATOR_VERSION: 1.18.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

- name: Clean up custom resources
Expand Down Expand Up @@ -241,8 +239,8 @@ jobs:
run: |
kubectl kuttl test --config ./tests/e2e/kuttl-core.yaml
env:
PXC_OPERATOR_VERSION: 1.15.0
PSMDB_OPERATOR_VERSION: 1.18.0
PXC_OPERATOR_VERSION: 1.16.1
PSMDB_OPERATOR_VERSION: 1.19.0
PG_OPERATOR_VERSION: 2.5.0
PERCONA_VERSION_SERVICE_URL: https://check-dev.percona.com/versions/v1

Expand Down Expand Up @@ -311,7 +309,7 @@ jobs:
- name: Set up Go release
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true

- name: Install operator-sdk
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.22 as builder
FROM golang:1.23 as builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
4 changes: 3 additions & 1 deletion api/v1alpha1/databasecluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const (
// +kubebuilder:object:generate=false
type Applier interface {
Paused(paused bool)
AllowUnsafeConfig(allow bool)
AllowUnsafeConfig()
Engine() error
Proxy() error
DataSource() error
Expand Down Expand Up @@ -334,6 +334,8 @@ type DatabaseClusterSpec struct {
// Paused is a flag to stop the cluster
Paused bool `json:"paused,omitempty"`
// AllowUnsafeConfiguration field used to ensure that the user can create configurations unfit for production use.
//
// Deprecated: AllowUnsafeConfiguration will not be supported in the future releases.
AllowUnsafeConfiguration bool `json:"allowUnsafeConfiguration,omitempty"`
// Engine is the database engine specification
Engine Engine `json:"engine"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2025-01-02T09:33:51Z"
createdAt: "2025-01-21T11:40:01Z"
operators.operatorframework.io/builder: operator-sdk-v1.38.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: everest-operator.v0.0.0
Expand Down
6 changes: 4 additions & 2 deletions bundle/manifests/everest.percona.com_databaseclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ spec:
description: DatabaseClusterSpec defines the desired state of DatabaseCluster.
properties:
allowUnsafeConfiguration:
description: AllowUnsafeConfiguration field used to ensure that the
user can create configurations unfit for production use.
description: |-
AllowUnsafeConfiguration field used to ensure that the user can create configurations unfit for production use.
Deprecated: AllowUnsafeConfiguration will not be supported in the future releases.
type: boolean
backup:
description: Backup is the backup specification
Expand Down
6 changes: 4 additions & 2 deletions config/crd/bases/everest.percona.com_databaseclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ spec:
description: DatabaseClusterSpec defines the desired state of DatabaseCluster.
properties:
allowUnsafeConfiguration:
description: AllowUnsafeConfiguration field used to ensure that the
user can create configurations unfit for production use.
description: |-
AllowUnsafeConfiguration field used to ensure that the user can create configurations unfit for production use.
Deprecated: AllowUnsafeConfiguration will not be supported in the future releases.
type: boolean
backup:
description: Backup is the backup specification
Expand Down
5 changes: 4 additions & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,10 @@ spec:
description: DatabaseClusterSpec defines the desired state of DatabaseCluster.
properties:
allowUnsafeConfiguration:
description: AllowUnsafeConfiguration field used to ensure that the user can create configurations unfit for production use.
description: |-
AllowUnsafeConfiguration field used to ensure that the user can create configurations unfit for production use.
Deprecated: AllowUnsafeConfiguration will not be supported in the future releases.
type: boolean
backup:
description: Backup is the backup specification
Expand Down
52 changes: 29 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
module github.com/percona/everest-operator

go 1.22.6
go 1.23.4

replace (
k8s.io/api => k8s.io/api v0.31.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
k8s.io/client-go => k8s.io/client-go v0.31.1
k8s.io/component-base => k8s.io/component-base v0.31.1
)
Expand All @@ -24,14 +23,14 @@ require (
github.com/onsi/gomega v1.36.2
github.com/operator-framework/api v0.27.0
github.com/percona/percona-postgresql-operator v0.0.0-20241007204305-35d61aa5aebd
github.com/percona/percona-server-mongodb-operator v1.18.0
github.com/percona/percona-xtradb-cluster-operator v1.15.0
github.com/percona/percona-server-mongodb-operator v1.19.0
github.com/percona/percona-xtradb-cluster-operator v1.16.1
github.com/stretchr/testify v1.10.0
golang.org/x/mod v0.22.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools v2.2.0+incompatible
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/api v0.32.0
k8s.io/apimachinery v0.32.0
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.19.4
)
Expand Down Expand Up @@ -91,23 +90,24 @@ require (
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.10 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/percona/percona-backup-mongodb v1.8.1-0.20241002124601-957ac501f939 // indirect
github.com/percona/percona-backup-mongodb v1.8.1-0.20241212160532-0157f87a7eee // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -129,29 +129,35 @@ require (
github.com/valyala/histogram v1.2.0 // indirect
github.com/valyala/quicktemplate v1.8.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
go.opentelemetry.io/otel v1.30.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
go.opentelemetry.io/otel/metric v1.30.0 // indirect
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/oauth2 v0.24.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/time v0.6.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.28.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -160,12 +166,12 @@ require (
k8s.io/apiserver v0.31.1 // indirect
k8s.io/component-base v0.31.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/gateway-api v1.1.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/mcs-api v0.1.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 40b6d1d

Please sign in to comment.