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
4 changes: 2 additions & 2 deletions config/manager/cluster/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: perconalab/percona-server-mysql-operator
newName: perconalab/percona-server-mysql-operator
newTag: main
newName: percona/percona-server-mysql-operator
newTag: 0.9.0
2 changes: 1 addition & 1 deletion config/manager/cluster/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
value: ""
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
name: manager
securityContext:
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: perconalab/percona-server-mysql-operator
newName: perconalab/percona-server-mysql-operator
newTag: main
newName: percona/percona-server-mysql-operator
newTag: 0.9.0
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
fieldPath: metadata.namespace
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
name: manager
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11648,7 +11648,7 @@ spec:
fieldPath: metadata.namespace
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
24 changes: 12 additions & 12 deletions deploy/cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
upgradeOptions:
versionServiceEndpoint: https://check.percona.com
apply: disabled
# initImage: perconalab/percona-server-mysql-operator:main
# initImage: percona/percona-server-mysql-operator:0.9.0
# ignoreAnnotations:
# - service.beta.kubernetes.io/aws-load-balancer-backend-protocol
# ignoreLabels:
Expand All @@ -39,9 +39,9 @@ spec:
mysql:
clusterType: group-replication
autoRecovery: true
image: perconalab/percona-server-mysql-operator:main-psmysql
image: percona/percona-server:8.0.40-31
imagePullPolicy: Always
# initImage: perconalab/percona-server-mysql-operator:main
# initImage: percona/percona-server-mysql-operator:0.9.0

size: 3

Expand Down Expand Up @@ -146,7 +146,7 @@ spec:

size: 3

image: perconalab/percona-server-mysql-operator:main-haproxy
image: percona/haproxy:2.8.11
imagePullPolicy: Always

resources:
Expand Down Expand Up @@ -254,9 +254,9 @@ spec:

router:
enabled: false
image: perconalab/percona-server-mysql-operator:main-router
image: percona/percona-mysql-router:8.0.40
imagePullPolicy: Always
# initImage: perconalab/percona-server-mysql-operator:main
# initImage: percona/percona-server-mysql-operator:0.9.0

size: 3

Expand Down Expand Up @@ -308,10 +308,10 @@ spec:
orchestrator:
enabled: true

image: perconalab/percona-server-mysql-operator:main-orchestrator
image: percona/percona-orchestrator:3.2.6-15
imagePullPolicy: Always
# serviceAccountName: percona-server-mysql-operator-orchestrator
# initImage: perconalab/percona-server-mysql-operator:main
# initImage: percona/percona-server-mysql-operator:0.9.0

size: 3

Expand Down Expand Up @@ -362,7 +362,7 @@ spec:
pmm:
enabled: false

image: perconalab/pmm-client:dev-latest
image: percona/pmm-client:2.44.0
imagePullPolicy: Always

resources:
Expand All @@ -378,7 +378,7 @@ spec:

backup:
enabled: true
image: perconalab/percona-server-mysql-operator:main-backup
image: percona/percona-xtrabackup:8.0.35-31
# schedule:
# - name: "sat-night-backup"
# schedule: "0 0 * * 6"
Expand All @@ -390,7 +390,7 @@ spec:
# storageName: s3
# backoffLimit: 6
imagePullPolicy: Always
# initImage: perconalab/percona-server-mysql-operator:main
# initImage: percona/percona-server-mysql-operator:0.9.0
# containerSecurityContext:
# privileged: true
storages:
Expand Down Expand Up @@ -443,7 +443,7 @@ spec:
# prefix: ""

toolkit:
image: perconalab/percona-server-mysql-operator:main-toolkit
image: percona/percona-toolkit:3.7.0
imagePullPolicy: Always
# resources:
# requests:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11691,7 +11691,7 @@ spec:
value: ""
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
value: ""
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
fieldPath: metadata.namespace
- name: DISABLE_TELEMETRY
value: "false"
image: perconalab/percona-server-mysql-operator:main
image: percona/percona-server-mysql-operator:0.9.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/release_versions
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
GKE_MIN=1.29
GKE_MAX=1.31
EKS_MIN=1.29
EKS_MAX=1.31
MINIKUBE_REL=1.31.0
EKS_MAX=1.32
MINIKUBE_MAX=1.32.0
8 changes: 2 additions & 6 deletions e2e-tests/vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
export DEPLOY_DIR="${DEPLOY_DIR:-${ROOT_REPO}/deploy}"
export TESTS_DIR="${TESTS_DIR:-${ROOT_REPO}/e2e-tests}"
export TESTS_CONFIG_DIR="${TESTS_CONFIG_DIR:-${TESTS_DIR}/conf}"
export TEMP_DIR="/tmp/kuttl/ps/${test_name}"

Check warning on line 8 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L8 <ShellCheck.SC2154>

test_name is referenced but not assigned.
Raw output
./e2e-tests/vars.sh:8:32: warning: test_name is referenced but not assigned. (ShellCheck.SC2154)

export GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')}
Expand All @@ -20,15 +20,11 @@
export PMM_SERVER_VERSION=${PMM_SERVER_VERSION:-"9.9.9"}
export IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
export IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
export CERT_MANAGER_VER="1.15.1"
export CERT_MANAGER_VER="1.16.3"

date=$(which gdate || which date)

Check warning on line 25 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L25 <ShellCheck.SC2034>

date appears unused. Verify use (or export if used externally).
Raw output
./e2e-tests/vars.sh:25:1: warning: date appears unused. Verify use (or export if used externally). (ShellCheck.SC2034)

if command -v oc &> /dev/null; then
if oc get projects; then
export OPENSHIFT=4
fi
fi
oc get projects &> /dev/null && export OPENSHIFT=4 || :

Check notice on line 27 in e2e-tests/vars.sh

View workflow job for this annotation

GitHub Actions / shellcheck

[shellcheck] e2e-tests/vars.sh#L27 <ShellCheck.SC2015>

Note that A && B || C is not if-then-else. C may run when A is true.
Raw output
./e2e-tests/vars.sh:27:30: info: Note that A && B || C is not if-then-else. C may run when A is true. (ShellCheck.SC2015)

if kubectl get nodes | grep "^minikube" >/dev/null; then
export MINIKUBE=1
Expand Down
Loading