From bc9997303b87e7e9469e781077dc86d431078508 Mon Sep 17 00:00:00 2001 From: Sebastian Woehrl Date: Tue, 28 Jan 2025 14:35:54 +0100 Subject: [PATCH] Update python version and dependencies --- Dockerfile | 4 ++-- hybridcloud/backends/azure_postgresqlflexible.py | 7 +++---- requirements.txt | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index adafec3..34214a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 as build +FROM alpine:3.21 AS build # Download helm binary and charts, use extra stage to keep final image small RUN wget -O - https://get.helm.sh/helm-v3.8.1-linux-amd64.tar.gz | tar -xzO linux-amd64/helm > /helm RUN chmod +x /helm \ @@ -7,7 +7,7 @@ RUN chmod +x /helm \ && /helm repo add yugabytedb https://charts.yugabyte.com \ && /helm pull yugabytedb/yugabyte --untar --version 2.13.0 --destination /charts -FROM python:3.10-slim +FROM python:3.13-slim RUN mkdir /operator WORKDIR /operator diff --git a/hybridcloud/backends/azure_postgresqlflexible.py b/hybridcloud/backends/azure_postgresqlflexible.py index 87fe5bf..dd59fda 100644 --- a/hybridcloud/backends/azure_postgresqlflexible.py +++ b/hybridcloud/backends/azure_postgresqlflexible.py @@ -377,13 +377,12 @@ def _map_version(version: str): return ServerVersion.TWELVE elif version.startswith("13"): return ServerVersion.THIRTEEN - # versions 14-16 are not directly exposed in the API but as strings are still accepted elif version.startswith("14"): - return "14" + return ServerVersion.FOURTEEN elif version.startswith("15"): - return "15" + return ServerVersion.FIFTEEN elif version.startswith("16"): - return "16" + return ServerVersion.SIXTEEN else: return ServerVersion.THIRTEEN diff --git a/requirements.txt b/requirements.txt index 5736757..b879d8c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -kubernetes==31.0.0 -kopf==1.37.2 +kubernetes==32.0.0 +kopf==1.37.4 # Do not use newest version as it removes some fields from the flexible server Configuration class (e.g. is_read_only) azure-mgmt-rdbms==10.2.0b17 azure-identity==1.19.0 -azure-mgmt-resource==23.1.1 -psycopg2-binary==2.9.10 +azure-mgmt-resource==23.2.0 azure-mgmt-privatedns==1.2.0 -azure-mgmt-network==27.0.0 +azure-mgmt-network==28.1.0 +psycopg2-binary==2.9.10 pyyaml==6.0.2 -boto3==1.35.43 +boto3==1.36.7