Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

K8SPXC-1363 Update container image versions back to main and add a section in the upgrade-consistency test for 1.16.0 #1800

Merged
merged 2 commits into from
Aug 21, 2024
Merged

K8SPXC-1363 Update container image versions back to main and add a section in the upgrade-consistency test for 1.16.0 #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b4fd3b
K8SPXC-1363 Update container image versions back to main and add a s…
ptankov Aug 21, 2024
45b703f
Update mysql_servers_ssl_params and runtime_mysql_servers_ssl_params
ptankov Aug 21, 2024
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 deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11308,7 +11308,7 @@ spec:
value: percona-xtradb-cluster-operator
- name: DISABLE_TELEMETRY
value: "false"
image: percona/percona-xtradb-cluster-operator:1.15.0
image: perconalab/percona-xtradb-cluster-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
8 changes: 4 additions & 4 deletions deploy/cr-minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: PerconaXtraDBCluster
metadata:
name: minimal-cluster
spec:
crVersion: 1.15.0
crVersion: 1.16.0
secretsName: minimal-cluster-secrets
unsafeFlags:
tls: true
Expand All @@ -16,7 +16,7 @@ spec:
enabled: false
pxc:
size: 1
image: percona/percona-xtradb-cluster:8.0.36-28.1
image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0
volumeSpec:
persistentVolumeClaim:
resources:
Expand All @@ -25,7 +25,7 @@ spec:
haproxy:
enabled: true
size: 1
image: percona/haproxy:2.8.5
image: perconalab/percona-xtradb-cluster-operator:main-haproxy
logcollector:
enabled: true
image: percona/percona-xtradb-cluster-operator:1.15.0-logcollector-fluentbit3.1.4
image: perconalab/percona-xtradb-cluster-operator:main-logcollector
16 changes: 8 additions & 8 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
# annotations:
# percona.com/issue-vault-token: "true"
spec:
crVersion: 1.15.0
crVersion: 1.16.0
# ignoreAnnotations:
# - iam.amazonaws.com/role
# ignoreLabels:
Expand All @@ -21,7 +21,7 @@ spec:
# sslInternalSecretName: cluster1-ssl-internal
# logCollectorSecretName: cluster1-log-collector-secrets
# initContainer:
# image: percona/percona-xtradb-cluster-operator:1.15.0
# image: perconalab/percona-xtradb-cluster-operator:main
# resources:
# requests:
# memory: 100M
Expand Down Expand Up @@ -53,7 +53,7 @@ spec:
schedule: "0 4 * * *"
pxc:
size: 3
image: percona/percona-xtradb-cluster:8.0.36-28.1
image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0
autoRecovery: true
# expose:
# enabled: true
Expand Down Expand Up @@ -201,7 +201,7 @@ spec:
haproxy:
enabled: true
size: 3
image: percona/haproxy:2.8.5
image: perconalab/percona-xtradb-cluster-operator:main-haproxy
# imagePullPolicy: Always
# schedulerName: mycustom-scheduler
# readinessDelaySec: 15
Expand Down Expand Up @@ -376,7 +376,7 @@ spec:
proxysql:
enabled: false
size: 3
image: percona/proxysql2:2.5.5
image: perconalab/percona-xtradb-cluster-operator:main-proxysql
# imagePullPolicy: Always
# configuration: |
# datadir="/var/lib/proxysql"
Expand Down Expand Up @@ -538,7 +538,7 @@ spec:
# - 10.0.0.0/8
logcollector:
enabled: true
image: percona/percona-xtradb-cluster-operator:1.15.0-logcollector-fluentbit3.1.4
image: perconalab/percona-xtradb-cluster-operator:main-logcollector
# configuration: |
# [OUTPUT]
# Name es
Expand All @@ -553,7 +553,7 @@ spec:
cpu: 200m
pmm:
enabled: false
image: percona/pmm-client:2.42.0
image: perconalab/pmm-client:dev-latest
serverHost: monitoring-service
# serverUser: admin
# pxcParams: "--disable-tablestats-limit=2000"
Expand All @@ -566,7 +566,7 @@ spec:
cpu: 300m
backup:
# allowParallel: true
image: percona/percona-xtradb-cluster-operator:1.15.0-pxc8.0-backup-pxb8.0.35
image: perconalab/percona-xtradb-cluster-operator:main-pxc8.0-backup
# backoffLimit: 6
# serviceAccountName: percona-xtradb-cluster-operator
# imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11318,7 +11318,7 @@ spec:
value: percona-xtradb-cluster-operator
- name: DISABLE_TELEMETRY
value: "false"
image: percona/percona-xtradb-cluster-operator:1.15.0
image: perconalab/percona-xtradb-cluster-operator:main
imagePullPolicy: Always
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
value: percona-xtradb-cluster-operator
- name: DISABLE_TELEMETRY
value: "false"
image: percona/percona-xtradb-cluster-operator:1.15.0
image: perconalab/percona-xtradb-cluster-operator:main
imagePullPolicy: Always
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
value: percona-xtradb-cluster-operator
- name: DISABLE_TELEMETRY
value: "false"
image: percona/percona-xtradb-cluster-operator:1.15.0
image: perconalab/percona-xtradb-cluster-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
0 ...mpare/service_some-name-proxysql-1130.yml → ...mpare/service_some-name-proxysql-1160.yml
View file
Open in desktop
File renamed without changes.
0 ...cy/compare/service_some-name-pxc-1130.yml → ...cy/compare/service_some-name-pxc-1160.yml
View file
Open in desktop
eleo007 marked this conversation as resolved.
Show resolved Hide resolved
File renamed without changes.
2 changes: 1 addition & 1 deletion e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
generation: 2
generation: 1
name: some-name-proxysql
ownerReferences:
- controller: true
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1150-k127.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
generation: 3
generation: 2
name: some-name-proxysql
ownerReferences:
- controller: true
Expand Down
48 changes: 37 additions & 11 deletions ...ulset_some-name-proxysql-1130-k127-oc.yml → ...ulset_some-name-proxysql-1160-k127-oc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
generation: 1
generation: 3
name: some-name-proxysql
ownerReferences:
- controller: true
Expand Down Expand Up @@ -43,7 +43,15 @@ spec:
app.kubernetes.io/part-of: percona-xtradb-cluster
topologyKey: kubernetes.io/hostname
containers:
- env:
- args:
- proxysql
- -f
- -c
- /etc/proxysql/proxysql.cnf
- --reload
command:
- /opt/percona/proxysql-entrypoint.sh
env:
- name: PXC_SERVICE
value: some-name-pxc
- name: OPERATOR_PASSWORD
Expand Down Expand Up @@ -92,9 +100,11 @@ spec:
name: ssl
- mountPath: /etc/proxysql/ssl-internal
name: ssl-internal
- mountPath: /opt/percona
name: bin
- args:
- /usr/bin/peer-list
- -on-change=/usr/bin/add_pxc_nodes.sh
- /opt/percona/peer-list
- -on-change=/opt/percona/proxysql_add_pxc_nodes.sh
- -service=$(PXC_SERVICE)
env:
- name: PXC_SERVICE
Expand Down Expand Up @@ -125,9 +135,12 @@ spec:
resources: {}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
- args:
- /usr/bin/peer-list
- -on-change=/usr/bin/add_proxysql_nodes.sh
- /opt/percona/peer-list
- -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh
- -service=$(PROXYSQL_SERVICE)
env:
- name: PROXYSQL_SERVICE
Expand Down Expand Up @@ -158,6 +171,9 @@ spec:
resources: {}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
dnsPolicy: ClusterFirst
initContainers:
- command:
Expand All @@ -166,16 +182,26 @@ spec:
name: pxc-init
resources:
limits:
cpu: "1"
memory: 1G
requests:
cpu: 100m
memory: 100M
cpu: 50m
memory: 50M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /var/lib/mysql
name: bin
- command:
- /proxysql-init-entrypoint.sh
imagePullPolicy: Always
name: proxysql-init
resources:
limits:
cpu: 50m
memory: 50M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
restartPolicy: Always
schedulerName: default-scheduler
securityContext:
Expand Down
48 changes: 37 additions & 11 deletions ...tefulset_some-name-proxysql-1130-k127.yml → ...tefulset_some-name-proxysql-1160-k127.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
generation: 1
generation: 3
name: some-name-proxysql
ownerReferences:
- controller: true
Expand Down Expand Up @@ -43,7 +43,15 @@ spec:
app.kubernetes.io/part-of: percona-xtradb-cluster
topologyKey: kubernetes.io/hostname
containers:
- env:
- args:
- proxysql
- -f
- -c
- /etc/proxysql/proxysql.cnf
- --reload
command:
- /opt/percona/proxysql-entrypoint.sh
env:
- name: PXC_SERVICE
value: some-name-pxc
- name: OPERATOR_PASSWORD
Expand Down Expand Up @@ -92,9 +100,11 @@ spec:
name: ssl
- mountPath: /etc/proxysql/ssl-internal
name: ssl-internal
- mountPath: /opt/percona
name: bin
- args:
- /usr/bin/peer-list
- -on-change=/usr/bin/add_pxc_nodes.sh
- /opt/percona/peer-list
- -on-change=/opt/percona/proxysql_add_pxc_nodes.sh
- -service=$(PXC_SERVICE)
env:
- name: PXC_SERVICE
Expand Down Expand Up @@ -125,9 +135,12 @@ spec:
resources: {}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
- args:
- /usr/bin/peer-list
- -on-change=/usr/bin/add_proxysql_nodes.sh
- /opt/percona/peer-list
- -on-change=/opt/percona/proxysql_add_proxysql_nodes.sh
- -service=$(PROXYSQL_SERVICE)
env:
- name: PROXYSQL_SERVICE
Expand Down Expand Up @@ -158,6 +171,9 @@ spec:
resources: {}
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
dnsPolicy: ClusterFirst
initContainers:
- command:
Expand All @@ -166,16 +182,26 @@ spec:
name: pxc-init
resources:
limits:
cpu: "1"
memory: 1G
requests:
cpu: 100m
memory: 100M
cpu: 50m
memory: 50M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /var/lib/mysql
name: bin
- command:
- /proxysql-init-entrypoint.sh
imagePullPolicy: Always
name: proxysql-init
resources:
limits:
cpu: 50m
memory: 50M
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
- mountPath: /opt/percona
name: bin
restartPolicy: Always
schedulerName: default-scheduler
securityContext:
Expand Down
Loading
Loading