From 84c61bdafd1c1c8570fc3a3886eb3a443046d6cb Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Fri, 23 Feb 2024 17:04:08 +0100
Subject: [PATCH] arm-compatible pooler image
---
charts/postgres-operator/crds/operatorconfigurations.yaml | 2 +-
charts/postgres-operator/values.yaml | 2 +-
docker/DebugDockerfile | 6 +++++-
manifests/configmap.yaml | 2 +-
manifests/minimal-fake-pooler-deployment.yaml | 2 +-
manifests/operatorconfiguration.crd.yaml | 2 +-
manifests/postgresql-operator-default-configuration.yaml | 2 +-
ui/Dockerfile | 2 +-
8 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml
index b0d3966f..29e768d4 100644
--- a/charts/postgres-operator/crds/operatorconfigurations.yaml
+++ b/charts/postgres-operator/crds/operatorconfigurations.yaml
@@ -649,7 +649,7 @@ spec:
default: "pooler"
connection_pooler_image:
type: string
- default: "registry.opensource.zalan.do/acid/pgbouncer:master-32"
+ default: "container-registry.zalando.net/acid/pgbouncer:master-33"
connection_pooler_max_db_connections:
type: integer
default: 60
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
index 3449b47a..408ca593 100644
--- a/charts/postgres-operator/values.yaml
+++ b/charts/postgres-operator/values.yaml
@@ -426,7 +426,7 @@ configConnectionPooler:
# db user for pooler to use
connection_pooler_user: "pooler"
# docker image
- connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-32"
+ connection_pooler_image: "container-registry.zalando.net/acid/pgbouncer:master-33"
# max db connections the pooler should hold
connection_pooler_max_db_connections: 60
# default pooling mode
diff --git a/docker/DebugDockerfile b/docker/DebugDockerfile
index 7c7ee8ae..2523be15 100644
--- a/docker/DebugDockerfile
+++ b/docker/DebugDockerfile
@@ -1,4 +1,8 @@
-FROM registry.opensource.zalan.do/library/alpine-3.15:latest
+ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest
+ARG VERSION=latest
+
+FROM ubuntu:20.04 as builder
+
LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
# We need root certificates to deal with teams api over https
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 6a10ade2..de64d0c2 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -17,7 +17,7 @@ data:
connection_pooler_default_cpu_request: "500m"
connection_pooler_default_memory_limit: 100Mi
connection_pooler_default_memory_request: 100Mi
- connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-32"
+ connection_pooler_image: "container-registry.zalando.net/acid/pgbouncer:master-33"
# connection_pooler_max_db_connections: 60
# connection_pooler_mode: "transaction"
# connection_pooler_number_of_instances: 2
diff --git a/manifests/minimal-fake-pooler-deployment.yaml b/manifests/minimal-fake-pooler-deployment.yaml
index 59a32ad0..b729df29 100644
--- a/manifests/minimal-fake-pooler-deployment.yaml
+++ b/manifests/minimal-fake-pooler-deployment.yaml
@@ -23,7 +23,7 @@ spec:
serviceAccountName: postgres-operator
containers:
- name: postgres-operator
- image: registry.opensource.zalan.do/acid/pgbouncer:master-32
+ image: container-registry.zalando.net/acid/pgbouncer:master-33
imagePullPolicy: IfNotPresent
resources:
requests:
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 73e66782..469d49ea 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@@ -647,7 +647,7 @@ spec:
default: "pooler"
connection_pooler_image:
type: string
- default: "registry.opensource.zalan.do/acid/pgbouncer:master-32"
+ default: "container-registry.zalando.net/acid/pgbouncer:master-33"
connection_pooler_max_db_connections:
type: integer
default: 60
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index 04484133..11992b4a 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -208,7 +208,7 @@ configuration:
connection_pooler_default_cpu_request: "500m"
connection_pooler_default_memory_limit: 100Mi
connection_pooler_default_memory_request: 100Mi
- connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-32"
+ connection_pooler_image: "container-registry.zalando.net/acid/pgbouncer:master-33"
# connection_pooler_max_db_connections: 60
connection_pooler_mode: "transaction"
connection_pooler_number_of_instances: 2
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 30c2d77f..56a25bf0 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3.15:latest
+ARG BASE_IMAGE=registry.opensource.zalan.do/library/alpine-3:latest
ARG NODE_IMAGE=node:14.21.2-alpine
FROM $NODE_IMAGE AS build
--
GitLab