Skip to content
Draft
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
6 changes: 3 additions & 3 deletions .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ jobs:
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- name: check on release branch
if: ${{ contains(github.base_ref, 'release-') }}
if: ${{ contains(github.base_ref, 'release-') && ! startsWith(github.head_ref, 'after-release-') }}
run: |
make generate manifests VERSION="$(grep -Eo "[0-9]+\.[0-9]+\.[0-9]+" pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-server-mongodb-operator"
make release VERSION="$(cat pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-server-mongodb-operator"
git diff --exit-code
- name: check on non release branches
if: ${{ ! contains(github.base_ref, 'release-') }}
if: ${{ ! contains(github.base_ref, 'release-') || startsWith(github.head_ref, 'after-release-') }}
run: |
make generate manifests VERSION=main
git diff --exit-code
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ release: manifests
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
$(SED) -i "s|perconalab/percona-server-mongodb-operator:main-mongod8.0|$(IMAGE_MONGOD80)|g" pkg/psmdb/mongos_test.go
$(SED) -i "s|image: .*percona-clustersync-mongodb.*|image: $(IMAGE_CLUSTERSYNC)|g" deploy/clustersync.yaml

# Prepare main branch after release
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
Expand All @@ -158,6 +159,7 @@ after-release: update-version manifests
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
$(SED) -i "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" pkg/psmdb/mongos_test.go
$(SED) -i "s|image: .*percona-clustersync-mongodb.*|image: perconalab/percona-clustersync-mongodb:latest|g" deploy/clustersync.yaml

version-service-client: swagger
curl https://raw.githubusercontent.com/Percona-Lab/percona-version-service/$(VS_BRANCH)/api/version.swagger.yaml \
Expand Down
2 changes: 1 addition & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31432,7 +31432,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: perconalab/percona-server-mongodb-operator:main
image: percona/percona-server-mongodb-operator:1.23.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/cr-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: minimal-cluster
spec:
crVersion: 1.23.0
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
image: percona/percona-server-mongodb:8.0.26-11
unsafeFlags:
replsetSize: true
mongosSize: true
Expand Down
12 changes: 6 additions & 6 deletions deploy/cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
# growthStep: 2Gi
# maxSize: "10Gi"
crVersion: 1.23.0
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
image: percona/percona-server-mongodb:8.0.26-11
imagePullPolicy: Always
# tls:
# mode: preferTLS
Expand All @@ -35,7 +35,7 @@ spec:
# group: cert-manager.io
# imagePullSecrets:
# - name: private-registry-credentials
# initImage: perconalab/percona-server-mongodb-operator:main
# initImage: percona/percona-server-mongodb-operator:1.23.0
# initContainerSecurityContext: {}
# unsafeFlags:
# tls: false
Expand Down Expand Up @@ -81,7 +81,7 @@ spec:
# sse: my-cluster-name-sse
pmm:
enabled: false
image: perconalab/pmm-client:3-dev-latest
image: percona/pmm-client:3.8.1
serverHost: monitoring-service
# authenticationMechanism: SCRAM-SHA-256
# containerSecurityContext: {}
Expand Down Expand Up @@ -810,7 +810,7 @@ spec:

backup:
enabled: true
image: perconalab/percona-server-mongodb-operator:main-backup
image: percona/percona-backup-mongodb:2.15.0
# startingDeadlineSeconds: 300
# hookScript:
# configMapRef:
Expand Down Expand Up @@ -1029,7 +1029,7 @@ spec:
# volumeSnapshotClass: YOUR-VOLUME-SNAPSHOT-CLASS
logcollector:
enabled: true
image: perconalab/fluentbit:main-logcollector
image: percona/fluentbit:5.0.9-1
# configuration: |
# [SERVICE]
# Flush 1
Expand Down Expand Up @@ -1089,7 +1089,7 @@ spec:
# periodSeconds: 10
# search:
# enabled: true
# image: perconalab/percona-server-mongodb-operator:main-mongot
# image: perconalab/percona-search-mongodb:1.70.1-1
# size: 1
# storage:
# persistentVolumeClaim:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31460,7 +31460,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: perconalab/percona-server-mongodb-operator:main
image: percona/percona-server-mongodb-operator:1.23.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: perconalab/percona-server-mongodb-operator:main
image: percona/percona-server-mongodb-operator:1.23.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: perconalab/percona-server-mongodb-operator:main
image: percona/percona-server-mongodb-operator:1.23.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/demand-backup-sharded/run
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,12 @@ sleep 5
if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
desc 'check backup and restore -- aws-s3'
backup_dest_aws=$(get_backup_dest "$backup_name_aws")
_aws_env_save
setup_aws_credentials
check_backup_existence_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
check_backup_existence_aws "$backup_dest_aws" "/rs1/myApp1.test.gz"
check_backup_existence_aws "$backup_dest_aws" "/rs2/myApp2.test.gz"
_aws_env_restore
insert_data_mongos "100501" "myApp" "" "$custom_port"
insert_data_mongos "100501" "myApp1" "" "$custom_port"
insert_data_mongos "100501" "myApp2" "" "$custom_port"
Expand Down
2 changes: 2 additions & 0 deletions e2e-tests/demand-backup/run
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,10 @@ sleep 5
if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
desc 'check backup and restore -- aws-s3'
backup_dest_aws=$(get_backup_dest "$backup_name_aws")
_aws_env_save
setup_aws_credentials
check_backup_existence_aws ${backup_dest_aws} '/rs0/myApp.test.gz'
_aws_env_restore
run_recovery_check "$backup_name_aws" "$cluster"

desc 'check backup and restore -- gcp-cs-s3'
Expand Down
Loading