Merge branch 'main' into main

percona · Dec 16, 2024 · 4a01bbc · 4a01bbc
2 parents 1718fb9 + c496a65
commit 4a01bbc
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 164 deletions.
diff --git a/fluentbit/Dockerfile b/fluentbit/Dockerfile
@@ -21,18 +21,18 @@ RUN export GNUPGHOME="$(mktemp -d)" \
     && rpm -i /tmp/percona-release.rpm \
     && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
     && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
-    && percona-release setup pdpxc-8.0.37
+    && percona-release setup pdpxc-8.0.39
 
 # install exact version of PS for repeatability
-ENV PERCONA_VERSION 8.0.37-29.1.el9
+ENV PERCONA_VERSION 8.0.39-30.1.el9
 
 # fluentbit does not have el8 repo and the doc suggests installing el7 rpm
 RUN set -ex; \
     microdnf install -y hostname postgresql-libs shadow-utils yum-utils logrotate make libpq procps-ng compat-openssl11 \
     percona-xtradb-cluster-client-${PERCONA_VERSION} tar vim-minimal; \
     curl -Lf https://github.com/michaloo/go-cron/releases/download/v0.0.2/go-cron.tar.gz -o /tmp/go-cron.tar.gz; \
     tar xvf /tmp/go-cron.tar.gz -C /usr/bin; \
-    curl -Lf https://packages.fluentbit.io/centos/9/x86_64/fluent-bit-3.1.8-1.x86_64.rpm -o /tmp/fluent-bit.rpm; \
+    curl -Lf https://packages.fluentbit.io/centos/9/x86_64/fluent-bit-3.2.2-1.x86_64.rpm -o /tmp/fluent-bit.rpm; \
     rpmkeys --checksig /tmp/fluent-bit.rpm; \
     rpm -i /tmp/fluent-bit.rpm; \
     rm -rf /var/cache

diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile
@@ -1,9 +1,3 @@
-FROM golang:1.22 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal AS ubi9
 
 LABEL name="HAproxy" \
@@ -61,7 +55,6 @@ COPY LICENSE /licenses/LICENSE.Dockerfile
 RUN cp /usr/share/licenses/percona-haproxy/LICENSE /licenses/LICENSE.haproxy
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 
 RUN set -ex; \
     chown 1001:1001 /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy-global.cfg /usr/local/bin/check_pxc.sh

diff --git a/percona-backup-mongodb/Dockerfile b/percona-backup-mongodb/Dockerfile
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="Percona Backup for MongoDB" \
     low-impact solution for achieving consistent backups of MongoDB Sharded Clusters and Replica Sets." \
     org.opencontainers.image.authors="[email protected]"
 
-ENV PBM_VERSION 2.7.0-1
+ENV PBM_VERSION 2.8.0-1
 ENV PBM_REPO_CH release
 ENV PSMDB_REPO psmdb-42
 ENV PSMDB_REPO_CH release

diff --git a/percona-backup-mongodb/Dockerfile.aarch64 b/percona-backup-mongodb/Dockerfile.aarch64
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="Percona Backup for MongoDB" \
     low-impact solution for achieving consistent backups of MongoDB Sharded Clusters and Replica Sets." \
     org.opencontainers.image.authors="[email protected]"
 
-ENV PBM_VERSION 2.7.0-1
+ENV PBM_VERSION 2.8.0-1
 ENV PBM_REPO_CH release
 ENV OS_VER el8
 ENV FULL_PBM_VERSION "$PBM_VERSION.$OS_VER"

diff --git a/percona-backup-mongodb/Dockerfile.ubi8 b/percona-backup-mongodb/Dockerfile.ubi8
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="Percona Backup for MongoDB" \
     low-impact solution for achieving consistent backups of MongoDB Sharded Clusters and Replica Sets." \
     org.opencontainers.image.authors="[email protected]"
 
-ENV PBM_VERSION 2.7.0-1
+ENV PBM_VERSION 2.8.0-1
 ENV PBM_REPO_CH release
 ENV PSMDB_REPO psmdb-42
 ENV PSMDB_REPO_CH release

diff --git a/percona-backup-mongodb/Dockerfile.ubi9 b/percona-backup-mongodb/Dockerfile.ubi9
@@ -14,7 +14,7 @@ LABEL org.opencontainers.image.title="Percona Backup for MongoDB" \
     low-impact solution for achieving consistent backups of MongoDB Sharded Clusters and Replica Sets." \
     org.opencontainers.image.authors="[email protected]"
 
-ENV PBM_VERSION 2.7.0-1
+ENV PBM_VERSION 2.8.0-1
 ENV PBM_REPO_CH release
 ENV PSMDB_REPO psmdb-60
 ENV PSMDB_REPO_CH release

diff --git a/percona-xtradb-cluster-5.7-backup/Dockerfile b/percona-xtradb-cluster-5.7-backup/Dockerfile
@@ -16,8 +16,8 @@ LABEL org.opencontainers.image.license="GPL"
 
 ENV PXB_VERSION=2.4.29-1
 ENV PXC_VERSION=5.7.44-31.65.1
-ENV KUBECTL_VERSION=v1.30.2
-ENV KUBECTL_SHA512SUM=0e1c51cf19254d8615abb0c2cbc6ed980ee41d0874a90ef47705ee0f2cc787b476fd32d56a926564334f4a01aa34ec480a4edcf60cd1b7fe1d734b2cc805774b
+ENV KUBECTL_VERSION=v1.30.8
+ENV KUBECTL_SHA512SUM=30f65522a55e1545fcdc344ef080313015a4afa8655cb62d4c3a3c3cf831addc03b7023c727a1b2e68388a0318374d5c74e7c32a9e21b68707787f97b6d41dc5
 ENV OS_VER=el9
 ENV FULL_PERCONA_XTRABACKUP_VERSION="$PXB_VERSION.$OS_VER"
 ENV FULL_PERCONA_XTRADBCLUSTER_VERSION="$PXC_VERSION.$OS_VER"
@@ -102,8 +102,8 @@ RUN set -ex; \
 RUN install -d -o 1001 -g 0 -m 0775 /backup; \
 	mkdir /usr/lib/pxc
 
-ENV MC_VERSION=RELEASE.2024-07-08T20-59-24Z
-ENV MC_SHA256SUM=e111d2b4bea05aadbffaa3fc8d2436a3fefedf030cd1318568bccb72810024f0
+ENV MC_VERSION=RELEASE.2024-11-17T19-35-25Z
+ENV MC_SHA256SUM=544d2d11c32cb4ed11b27338935a9cc434e15b692ff3d1529a624d341fe2ffc5
 RUN set -ex; \
     curl -o /usr/bin/mc -O https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.${MC_VERSION} \
 	&& chmod +x /usr/bin/mc \

diff --git a/percona-xtradb-cluster-5.7/Dockerfile b/percona-xtradb-cluster-5.7/Dockerfile
@@ -1,9 +1,3 @@
-FROM golang:1.23 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="[email protected]"
@@ -104,7 +98,6 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga
     cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 
 RUN set -ex; \
     rm -rf /etc/my.cnf.d; \

diff --git a/percona-xtradb-cluster-8.0-backup/Dockerfile b/percona-xtradb-cluster-8.0-backup/Dockerfile
@@ -15,13 +15,13 @@ LABEL org.opencontainers.image.description="Percona XtraDB Cluster is a high ava
 LABEL org.opencontainers.image.license="GPL"
 
 ENV PXB_VERSION=8.0.35-31.1
-ENV PS_VERSION=8.0.37-29.1
+ENV PS_VERSION=8.0.39-30.1
 
-ENV PXC_VERSION=8.0.37-29.1
+ENV PXC_VERSION=8.0.39-30.1
 ENV PXC_REPO=release
 
-ENV KUBECTL_VERSION=v1.30.2
-ENV KUBECTL_SHA512SUM=0e1c51cf19254d8615abb0c2cbc6ed980ee41d0874a90ef47705ee0f2cc787b476fd32d56a926564334f4a01aa34ec480a4edcf60cd1b7fe1d734b2cc805774b
+ENV KUBECTL_VERSION=v1.30.8
+ENV KUBECTL_SHA512SUM=30f65522a55e1545fcdc344ef080313015a4afa8655cb62d4c3a3c3cf831addc03b7023c727a1b2e68388a0318374d5c74e7c32a9e21b68707787f97b6d41dc5
 ENV OS_VER=el9
 ENV FULL_PERCONA_VERSION="$PS_VERSION.$OS_VER"
 ENV FULL_PERCONA_XTRABACKUP_VERSION="$PXB_VERSION.$OS_VER"
@@ -103,8 +103,8 @@ RUN set -ex; \
 RUN install -d -o 1001 -g 0 -m 0775 /backup; \
 	mkdir /usr/lib/pxc
 
-ENV MC_VERSION=RELEASE.2024-07-08T20-59-24Z
-ENV MC_SHA256SUM=e111d2b4bea05aadbffaa3fc8d2436a3fefedf030cd1318568bccb72810024f0
+ENV MC_VERSION=RELEASE.2024-11-17T19-35-25Z
+ENV MC_SHA256SUM=544d2d11c32cb4ed11b27338935a9cc434e15b692ff3d1529a624d341fe2ffc5
 RUN set -ex; \
     curl -o /usr/bin/mc -O https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.${MC_VERSION} \
 	&& chmod +x /usr/bin/mc \

diff --git a/percona-xtradb-cluster-8.0/Dockerfile b/percona-xtradb-cluster-8.0/Dockerfile
@@ -1,9 +1,3 @@
-FROM golang:1.22 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="[email protected]"
@@ -108,7 +102,6 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga
     cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 
 RUN set -ex; \
     rmdir /etc/my.cnf.d; \

diff --git a/percona-xtradb-cluster-8.0/Dockerfile.aarch64 b/percona-xtradb-cluster-8.0/Dockerfile.aarch64
@@ -1,9 +1,3 @@
-FROM golang:1.22 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="[email protected]"
@@ -111,7 +105,6 @@ RUN cp /usr/share/doc/percona-xtradb-cluster-galera/COPYING /licenses/LICENSE.ga
     cp /usr/share/doc/percona-xtradb-cluster-galera/LICENSE.* /licenses/
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 
 RUN set -ex; \
     rmdir /etc/my.cnf.d; \

diff --git a/percona-xtradb-cluster-8.0/Dockerfile.k8s b/percona-xtradb-cluster-8.0/Dockerfile.k8s
@@ -1,11 +1,6 @@
-FROM golang:1.22 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal
 
+
 # Please don't remove old-style LABEL since it's needed for RedHat certification
 LABEL name="Percona XtraBackup" \
       release="8.0" \
@@ -113,7 +108,6 @@ RUN set -ex; \
     echo '!includedir /etc/percona-xtradb-cluster.conf.d/' >> /etc/my.cnf
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 RUN mkdir -p /etc/mysql/conf.d/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d; \
     chown -R 1001:1001 /etc/mysql/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d; \
     chmod -R g=u /etc/mysql/ /var/log/mysql /var/lib/mysql /docker-entrypoint-initdb.d /etc/percona-xtradb-cluster.conf.d

diff --git a/percona-xtradb-cluster-8.4-backup/Dockerfile b/percona-xtradb-cluster-8.4-backup/Dockerfile
@@ -15,13 +15,13 @@ LABEL org.opencontainers.image.description="Percona XtraDB Cluster is a high ava
 LABEL org.opencontainers.image.license="GPL"
 
 ENV PXB_VERSION=8.4.0-1.1
-ENV PS_VERSION=8.4.0-1.1
+ENV PS_VERSION=8.4.2-2.1
 
-ENV PXC_VERSION=8.4.0-1.1
+ENV PXC_VERSION=8.4.2-2.1
 ENV PXC_REPO=release
 
-ENV KUBECTL_VERSION=v1.30.2
-ENV KUBECTL_SHA512SUM=0e1c51cf19254d8615abb0c2cbc6ed980ee41d0874a90ef47705ee0f2cc787b476fd32d56a926564334f4a01aa34ec480a4edcf60cd1b7fe1d734b2cc805774b
+ENV KUBECTL_VERSION=v1.30.8
+ENV KUBECTL_SHA512SUM=30f65522a55e1545fcdc344ef080313015a4afa8655cb62d4c3a3c3cf831addc03b7023c727a1b2e68388a0318374d5c74e7c32a9e21b68707787f97b6d41dc5
 ENV OS_VER=el9
 ENV FULL_PERCONA_VERSION="$PS_VERSION.$OS_VER"
 ENV FULL_PERCONA_XTRABACKUP_VERSION="$PXB_VERSION.$OS_VER"
@@ -103,8 +103,8 @@ RUN set -ex; \
 RUN install -d -o 1001 -g 0 -m 0775 /backup; \
 	mkdir /usr/lib/pxc
 
-ENV MC_VERSION=RELEASE.2024-07-08T20-59-24Z
-ENV MC_SHA256SUM=e111d2b4bea05aadbffaa3fc8d2436a3fefedf030cd1318568bccb72810024f0
+ENV MC_VERSION=RELEASE.2024-11-17T19-35-25Z
+ENV MC_SHA256SUM=544d2d11c32cb4ed11b27338935a9cc434e15b692ff3d1529a624d341fe2ffc5
 RUN set -ex; \
     curl -o /usr/bin/mc -O https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.${MC_VERSION} \
 	&& chmod +x /usr/bin/mc \

diff --git a/proxysql/Dockerfile b/proxysql/Dockerfile
@@ -1,9 +1,3 @@
-FROM golang:1.22 AS go_builder
-
-RUN git clone --branch=main https://github.com/percona/percona-xtradb-cluster-operator.git /go/src/github.com/percona/percona-xtradb-cluster-operator/
-WORKDIR /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list
-RUN go build
-
 FROM redhat/ubi9-minimal AS ubi9
 
 # Please don't remove old-style LABEL since it's needed for RedHat certification
@@ -87,7 +81,6 @@ COPY LICENSE /licenses/LICENSE.Dockerfile
 RUN cp /usr/share/doc/proxysql2/LICENSE /licenses/LICENSE.proxysql
 
 COPY dockerdir /
-COPY --from=go_builder /go/src/github.com/percona/percona-xtradb-cluster-operator/cmd/peer-list /usr/bin/
 RUN chown 1001:1001 /etc/proxysql/proxysql.cnf /etc/proxysql-admin.cnf; \
     chmod 664 /etc/proxysql/proxysql.cnf /etc/proxysql-admin.cnf
 

diff --git a/proxysql/Dockerfile.k8s b/proxysql/Dockerfile.k8s