Skip to content

Commit 909644a

Browse files
committed
Update postgres in config samples and bkp/restore
Update postgres to 15 in CR samples, bkp and restore controllers. This is a workaround to be able to make the CI green and publish version 1.3.0 while we work on the issue with postgres 13 upgrade. [noissue]
1 parent fd02f02 commit 909644a

19 files changed

+19
-5
lines changed

.ci/scripts/prepare-object-storage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#!/usr/bin/env bash
33

44
if [[ "$COMPONENT_TYPE" == "azure" ]]; then
5-
docker run -d -p 10000:10000 --name pulp-azurite mcr.microsoft.com/azure-storage/azurite azurite-blob --blobHost 0.0.0.0
5+
docker run -d -p 10000:10000 --name pulp-azurite mcr.microsoft.com/azure-storage/azurite azurite-blob --blobHost 0.0.0.0 --skipApiVersionCheck
66
sleep 5
77
AZURE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://pulp-azurite:10000/devstoreaccount1;"
88
echo $(minikube ip) pulp-azurite | sudo tee -a /etc/hosts
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Create a remote that syncs some versions of django into your repository.
22
pulp ansible remote -t "collection" create \
33
--name "cbar" \
4-
--url "https://galaxy-dev.ansible.com/" \
4+
--url "https://galaxy.ansible.com/" \
55
--requirements $'collections:\n - testing.ansible_testing_content'
66
# If requirements are in a file
77
# you can use the option '--requirements @<file_name>' instead.

config/samples/external_db.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ spec:
4949
spec:
5050
containers:
5151
- name: postgres
52-
image: postgres:13
52+
image: postgres:15
5353
imagePullPolicy: "IfNotPresent"
5454
envFrom:
5555
- secretRef:

config/samples/k8s_versions_ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ spec:
3636
web:
3737
replicas: 1
3838
database:
39+
postgres_image: postgres:15
3940
postgres_storage_class: standard
4041
postgres_storage_requirements: "1Gi"
4142
cache:

config/samples/minimal.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: example-pulp
66
spec:
77
database:
8+
postgres_image: postgres:15
89
postgres_storage_class: standard
910

1011
file_storage_storage_class: standard

config/samples/pulp-with-hpa.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555

5656
# Database configuration
5757
database:
58+
postgres_image: postgres:15
5859
postgres_storage_requirements: "8Gi"
5960

6061
# Cache configuration

config/samples/repo-manager.pulpproject.org_v1_pulp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ spec:
3333
replicas: 1
3434

3535
database:
36+
postgres_image: postgres:15
3637
postgres_storage_class: standard
3738

3839
file_storage_access_mode: "ReadWriteMany"

config/samples/simple-ocp.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ spec:
2424
admin_password_secret: "example-pulp-admin-password"
2525

2626
database:
27+
postgres_image: postgres:15
2728
postgres_storage_class: managed-csi
2829

2930
file_storage_access_mode: "ReadWriteOnce"

config/samples/simple-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ spec:
2929
replicas: 1
3030

3131
database:
32+
postgres_image: postgres:15
3233
postgres_storage_class: standard
3334

3435
file_storage_access_mode: "ReadWriteOnce"

config/samples/simple-trust-manager.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ spec:
5858
mount_trusted_ca_configmap_key: "example-pulp-trusted-ca-bundle:ca-bundle.crt"
5959

6060
database:
61+
postgres_image: postgres:15
6162
postgres_storage_class: standard
6263

6364
file_storage_access_mode: "ReadWriteOnce"

0 commit comments

Comments
 (0)