Skip to content

Commit d3ca0f1

Browse files
horshors
authored
Merge branch 'main' into K8SPG-768_skip_log_creation
2 parents 4e86cc0 + bf2b043 commit d3ca0f1

File tree

32 files changed

+1877
-46
lines changed

32 files changed

+1877
-46
lines changed

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 219 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18376,8 +18376,225 @@ spec:
1837618376
observedGeneration:
1837718377
format: int64
1837818378
type: integer
18379-
patroniVersion:
18380-
type: string
18379+
patroni:
18380+
properties:
18381+
status:
18382+
properties:
18383+
switchover:
18384+
description: Tracks the execution of the switchover requests.
18385+
type: string
18386+
switchoverTimeline:
18387+
description: Tracks the current timeline during switchovers
18388+
format: int64
18389+
type: integer
18390+
systemIdentifier:
18391+
description: The PostgreSQL system identifier reported by
18392+
Patroni.
18393+
type: string
18394+
type: object
18395+
version:
18396+
type: string
18397+
type: object
18398+
pgbackrest:
18399+
description: Status information for pgBackRest
18400+
properties:
18401+
manualBackup:
18402+
description: Status information for manual backups
18403+
properties:
18404+
active:
18405+
description: The number of actively running manual backup
18406+
Pods.
18407+
format: int32
18408+
type: integer
18409+
completionTime:
18410+
description: |-
18411+
Represents the time the manual backup Job was determined by the Job controller
18412+
to be completed. This field is only set if the backup completed successfully.
18413+
Additionally, it is represented in RFC3339 form and is in UTC.
18414+
format: date-time
18415+
type: string
18416+
failed:
18417+
description: The number of Pods for the manual backup Job
18418+
that reached the "Failed" phase.
18419+
format: int32
18420+
type: integer
18421+
finished:
18422+
description: |-
18423+
Specifies whether or not the Job is finished executing (does not indicate success or
18424+
failure).
18425+
type: boolean
18426+
id:
18427+
description: |-
18428+
A unique identifier for the manual backup as provided using the "pgbackrest-backup"
18429+
annotation when initiating a backup.
18430+
type: string
18431+
startTime:
18432+
description: |-
18433+
Represents the time the manual backup Job was acknowledged by the Job controller.
18434+
It is represented in RFC3339 form and is in UTC.
18435+
format: date-time
18436+
type: string
18437+
succeeded:
18438+
description: The number of Pods for the manual backup Job
18439+
that reached the "Succeeded" phase.
18440+
format: int32
18441+
type: integer
18442+
required:
18443+
- finished
18444+
- id
18445+
type: object
18446+
repoHost:
18447+
description: Status information for the pgBackRest dedicated repository
18448+
host
18449+
properties:
18450+
apiVersion:
18451+
description: |-
18452+
APIVersion defines the versioned schema of this representation of an object.
18453+
Servers should convert recognized schemas to the latest internal value, and
18454+
may reject unrecognized values.
18455+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
18456+
type: string
18457+
kind:
18458+
description: |-
18459+
Kind is a string value representing the REST resource this object represents.
18460+
Servers may infer this from the endpoint the client submits requests to.
18461+
Cannot be updated.
18462+
In CamelCase.
18463+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
18464+
type: string
18465+
ready:
18466+
description: Whether or not the pgBackRest repository host
18467+
is ready for use
18468+
type: boolean
18469+
type: object
18470+
repos:
18471+
description: Status information for pgBackRest repositories
18472+
items:
18473+
description: RepoStatus the status of a pgBackRest repository
18474+
properties:
18475+
bound:
18476+
description: Whether or not the pgBackRest repository PersistentVolumeClaim
18477+
is bound to a volume
18478+
type: boolean
18479+
name:
18480+
description: The name of the pgBackRest repository
18481+
type: string
18482+
replicaCreateBackupComplete:
18483+
description: |-
18484+
ReplicaCreateBackupReady indicates whether a backup exists in the repository as needed
18485+
to bootstrap replicas.
18486+
type: boolean
18487+
repoOptionsHash:
18488+
description: |-
18489+
A hash of the required fields in the spec for defining an Azure, GCS or S3 repository,
18490+
Utilized to detect changes to these fields and then execute pgBackRest stanza-create
18491+
commands accordingly.
18492+
type: string
18493+
stanzaCreated:
18494+
description: Specifies whether or not a stanza has been
18495+
successfully created for the repository
18496+
type: boolean
18497+
volume:
18498+
description: The name of the volume the containing the pgBackRest
18499+
repository
18500+
type: string
18501+
required:
18502+
- name
18503+
type: object
18504+
type: array
18505+
x-kubernetes-list-map-keys:
18506+
- name
18507+
x-kubernetes-list-type: map
18508+
restore:
18509+
description: Status information for in-place restores
18510+
properties:
18511+
active:
18512+
description: The number of actively running manual backup
18513+
Pods.
18514+
format: int32
18515+
type: integer
18516+
completionTime:
18517+
description: |-
18518+
Represents the time the manual backup Job was determined by the Job controller
18519+
to be completed. This field is only set if the backup completed successfully.
18520+
Additionally, it is represented in RFC3339 form and is in UTC.
18521+
format: date-time
18522+
type: string
18523+
failed:
18524+
description: The number of Pods for the manual backup Job
18525+
that reached the "Failed" phase.
18526+
format: int32
18527+
type: integer
18528+
finished:
18529+
description: |-
18530+
Specifies whether or not the Job is finished executing (does not indicate success or
18531+
failure).
18532+
type: boolean
18533+
id:
18534+
description: |-
18535+
A unique identifier for the manual backup as provided using the "pgbackrest-backup"
18536+
annotation when initiating a backup.
18537+
type: string
18538+
startTime:
18539+
description: |-
18540+
Represents the time the manual backup Job was acknowledged by the Job controller.
18541+
It is represented in RFC3339 form and is in UTC.
18542+
format: date-time
18543+
type: string
18544+
succeeded:
18545+
description: The number of Pods for the manual backup Job
18546+
that reached the "Succeeded" phase.
18547+
format: int32
18548+
type: integer
18549+
required:
18550+
- finished
18551+
- id
18552+
type: object
18553+
scheduledBackups:
18554+
description: Status information for scheduled backups
18555+
items:
18556+
properties:
18557+
active:
18558+
description: The number of actively running manual backup
18559+
Pods.
18560+
format: int32
18561+
type: integer
18562+
completionTime:
18563+
description: |-
18564+
Represents the time the manual backup Job was determined by the Job controller
18565+
to be completed. This field is only set if the backup completed successfully.
18566+
Additionally, it is represented in RFC3339 form and is in UTC.
18567+
format: date-time
18568+
type: string
18569+
cronJobName:
18570+
description: The name of the associated pgBackRest scheduled
18571+
backup CronJob
18572+
type: string
18573+
failed:
18574+
description: The number of Pods for the manual backup Job
18575+
that reached the "Failed" phase.
18576+
format: int32
18577+
type: integer
18578+
repo:
18579+
description: The name of the associated pgBackRest repository
18580+
type: string
18581+
startTime:
18582+
description: |-
18583+
Represents the time the manual backup Job was acknowledged by the Job controller.
18584+
It is represented in RFC3339 form and is in UTC.
18585+
format: date-time
18586+
type: string
18587+
succeeded:
18588+
description: The number of Pods for the manual backup Job
18589+
that reached the "Succeeded" phase.
18590+
format: int32
18591+
type: integer
18592+
type:
18593+
description: The pgBackRest backup type for this Job
18594+
type: string
18595+
type: object
18596+
type: array
18597+
type: object
1838118598
pgbouncer:
1838218599
properties:
1838318600
ready:

‎build/postgres-operator/install-extensions.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@ if [[ ${STORAGE_FORCE_PATH_STYLE} == "true" ]]; then
2424
args+=(-force-path-style)
2525
fi
2626

27-
for key in "${extensions[@]}"; do
28-
if [ -f "${PGDATA_EXTENSIONS}"/"${key}".installed ]; then
29-
echo "Extension ${key} already installed"
30-
continue
31-
fi
32-
33-
echo "Installing extension: ${key}"
34-
/usr/local/bin/extension-installer \
35-
"${args[@]}" \
36-
-key "${key}" \
37-
-install
38-
done
39-
4027
for installed in "${PGDATA_EXTENSIONS}"/*.installed; do
4128
filename=$(basename -- "${installed}")
4229
key=${filename%.*}
@@ -53,3 +40,16 @@ for installed in "${PGDATA_EXTENSIONS}"/*.installed; do
5340
rm -f "${installed}"
5441
fi
5542
done
43+
44+
for key in "${extensions[@]}"; do
45+
if [ -f "${PGDATA_EXTENSIONS}"/"${key}".installed ]; then
46+
echo "Extension ${key} already installed"
47+
continue
48+
fi
49+
50+
echo "Installing extension: ${key}"
51+
/usr/local/bin/extension-installer \
52+
"${args[@]}" \
53+
-key "${key}" \
54+
-install
55+
done

0 commit comments

Comments
 (0)