Skip to content

Commit 2748cbe

Browse files
namgknamgk
authored
Merge branch 'v1.12.0_w-o_sec_validation' into v1.11.0_w-o_sec_validation
2 parents 7913f75 + 2c6b91a commit 2748cbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1010
-1298
lines changed

‎.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
Please, answer some short questions which should help us to understand your problem / question better?
1111

12-
- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.11.0
12+
- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.12.0
1313
- **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
1414
- **Are you running Postgres Operator in production?** [yes | no]
1515
- **Type of issue?** [Bug report, question, feature request, etc.]

‎.github/workflows/publish_ghcr_image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v2
2525
with:
26-
go-version: "^1.21.7"
26+
go-version: "^1.22.3"
2727

2828
- name: Run unit tests
2929
run: make deps mocks test
@@ -81,7 +81,7 @@ jobs:
8181
- name: Build and push multiarch logical-backup image to ghcr
8282
uses: docker/build-push-action@v3
8383
with:
84-
context: docker/logical-backup
84+
context: logical-backup
8585
push: true
8686
build-args: BASE_IMAGE=ubuntu:22.04
8787
tags: "${{ steps.image_lb.outputs.BACKUP_IMAGE }}"

‎.github/workflows/run_e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v1
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.21.7"
17+
go-version: "^1.22.3"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Code generation

‎.github/workflows/run_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.21.7"
17+
go-version: "^1.22.3"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Compile

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,5 @@ e2e/tls
102102
*.pot
103103

104104
mocks
105+
106+
ui/.npm/

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ docker: ${DOCKERDIR}/${DOCKERFILE}
6969
docker buildx build --platform linux/amd64 --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" .
7070

7171
indocker-race:
72-
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 bash -c "make linux"
72+
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.22.3 bash -c "make linux"
7373

7474
push:
7575
docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
@@ -78,7 +78,7 @@ mocks:
7878
GO111MODULE=on go generate ./...
7979

8080
tools:
81-
GO111MODULE=on go get -d k8s.io/[email protected].7
81+
GO111MODULE=on go get -d k8s.io/[email protected].10
8282
GO111MODULE=on go install github.com/golang/mock/[email protected]
8383
GO111MODULE=on go mod tidy
8484

‎README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as
2424
* Basic credential and user management on K8s, eases application deployments
2525
* Support for custom TLS certificates
2626
* UI to create and edit Postgres cluster manifests
27-
* Support for AWS EBS gp2 to gp3 migration, supporting iops and throughput configuration
2827
* Compatible with OpenShift
2928

3029
### PostgreSQL features
@@ -58,11 +57,11 @@ production for over five years.
5857

5958
| Release | Postgres versions | K8s versions | Golang |
6059
| :-------- | :---------------: | :---------------: | :-----: |
61-
| v1.11.* | 11 → 16 | 1.21 → 1.28 | 1.21.7 |
62-
| v1.10.* | 10 → 15 | 1.21 → 1.28 | 1.19.8 |
63-
| v1.9.0 | 10 → 15 | 1.21 → 1.28 | 1.18.9 |
64-
| v1.8.* | 9.5 → 14 | 1.20 → 1.24 | 1.17.4 |
65-
| v1.7.1 | 9.5 → 14 | 1.20 → 1.24 | 1.16.9 |
60+
| v1.12.* | 11 → 16 | 1.27+ | 1.22.3 |
61+
| v1.11.0 | 11 → 16 | 1.27+ | 1.21.7 |
62+
| v1.10.* | 10 → 15 | 1.21+ | 1.19.8 |
63+
| v1.9.0 | 10 → 15 | 1.21+ | 1.18.9 |
64+
| v1.8.2 | 9.5 → 14 | 1.20 → 1.24 | 1.17.4 |
6665

6766

6867
## Getting started

‎charts/postgres-operator-ui/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: postgres-operator-ui
3-
version: 1.11.0
4-
appVersion: 1.11.0
3+
version: 1.12.0
4+
appVersion: 1.12.0
55
home: https://github.com/zalando/postgres-operator
66
description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
77
keywords:

‎charts/postgres-operator-ui/index.yaml

Lines changed: 29 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
11
apiVersion: v1
22
entries:
33
postgres-operator-ui:
4+
- apiVersion: v2
5+
appVersion: 1.12.0
6+
created: "2024-05-24T16:34:14.027533755+02:00"
7+
description: Postgres Operator UI provides a graphical interface for a convenient
8+
database-as-a-service user experience
9+
digest: 498b8254dc0e24bc3cdc98e250a5640dc104b75e1dbba5d9fdb90a3b39e7eb8c
10+
home: https://github.com/zalando/postgres-operator
11+
keywords:
12+
- postgres
13+
- operator
14+
- ui
15+
- cloud-native
16+
- patroni
17+
- spilo
18+
maintainers:
19+
- email: [email protected]
20+
name: Zalando
21+
name: postgres-operator-ui
22+
sources:
23+
- https://github.com/zalando/postgres-operator
24+
urls:
25+
- postgres-operator-ui-1.12.0.tgz
26+
version: 1.12.0
427
- apiVersion: v2
528
appVersion: 1.11.0
6-
created: "2024-03-14T17:12:46.692800586+01:00"
29+
created: "2024-05-24T16:34:14.02529813+02:00"
730
description: Postgres Operator UI provides a graphical interface for a convenient
831
database-as-a-service user experience
932
digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2
@@ -26,7 +49,7 @@ entries:
2649
version: 1.11.0
2750
- apiVersion: v2
2851
appVersion: 1.10.1
29-
created: "2024-03-14T17:12:46.691746076+01:00"
52+
created: "2024-05-24T16:34:14.023186291+02:00"
3053
description: Postgres Operator UI provides a graphical interface for a convenient
3154
database-as-a-service user experience
3255
digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce
@@ -49,7 +72,7 @@ entries:
4972
version: 1.10.1
5073
- apiVersion: v2
5174
appVersion: 1.10.0
52-
created: "2024-03-14T17:12:46.690807634+01:00"
75+
created: "2024-05-24T16:34:14.021045516+02:00"
5376
description: Postgres Operator UI provides a graphical interface for a convenient
5477
database-as-a-service user experience
5578
digest: 47413650e3188539ae778a601998efa2c4f80b8aa16e3668a2fc7b72e014b605
@@ -72,7 +95,7 @@ entries:
7295
version: 1.10.0
7396
- apiVersion: v2
7497
appVersion: 1.9.0
75-
created: "2024-03-14T17:12:46.696626932+01:00"
98+
created: "2024-05-24T16:34:14.031516234+02:00"
7699
description: Postgres Operator UI provides a graphical interface for a convenient
77100
database-as-a-service user experience
78101
digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc
@@ -95,7 +118,7 @@ entries:
95118
version: 1.9.0
96119
- apiVersion: v2
97120
appVersion: 1.8.2
98-
created: "2024-03-14T17:12:46.69565936+01:00"
121+
created: "2024-05-24T16:34:14.029536821+02:00"
99122
description: Postgres Operator UI provides a graphical interface for a convenient
100123
database-as-a-service user experience
101124
digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c
@@ -116,50 +139,4 @@ entries:
116139
urls:
117140
- postgres-operator-ui-1.8.2.tgz
118141
version: 1.8.2
119-
- apiVersion: v2
120-
appVersion: 1.8.1
121-
created: "2024-03-14T17:12:46.694691362+01:00"
122-
description: Postgres Operator UI provides a graphical interface for a convenient
123-
database-as-a-service user experience
124-
digest: d26342e385ea51a0fbfbe23477999863e9489664ae803ea5c56da8897db84d24
125-
home: https://github.com/zalando/postgres-operator
126-
keywords:
127-
- postgres
128-
- operator
129-
- ui
130-
- cloud-native
131-
- patroni
132-
- spilo
133-
maintainers:
134-
- email: [email protected]
135-
name: Zalando
136-
name: postgres-operator-ui
137-
sources:
138-
- https://github.com/zalando/postgres-operator
139-
urls:
140-
- postgres-operator-ui-1.8.1.tgz
141-
version: 1.8.1
142-
- apiVersion: v1
143-
appVersion: 1.8.0
144-
created: "2024-03-14T17:12:46.693750873+01:00"
145-
description: Postgres Operator UI provides a graphical interface for a convenient
146-
database-as-a-service user experience
147-
digest: d4a7b40c23fd167841cc28342afdbd5ecc809181913a5c31061c83139187f148
148-
home: https://github.com/zalando/postgres-operator
149-
keywords:
150-
- postgres
151-
- operator
152-
- ui
153-
- cloud-native
154-
- patroni
155-
- spilo
156-
maintainers:
157-
- email: [email protected]
158-
name: Zalando
159-
name: postgres-operator-ui
160-
sources:
161-
- https://github.com/zalando/postgres-operator
162-
urls:
163-
- postgres-operator-ui-1.8.0.tgz
164-
version: 1.8.0
165-
generated: "2024-03-14T17:12:46.689654615+01:00"
142+
generated: "2024-05-24T16:34:14.018381989+02:00"

‎charts/postgres-operator-ui/postgres-operator-ui-1.12.0.tgz

5.11 KB
Binary file not shown.

‎charts/postgres-operator-ui/postgres-operator-ui-1.8.0.tgz

-4.79 KB
Binary file not shown.

‎charts/postgres-operator-ui/postgres-operator-ui-1.8.1.tgz

-4.79 KB
Binary file not shown.

‎charts/postgres-operator-ui/templates/deployment.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,12 @@ spec:
9494
{{- if .Values.extraEnvs }}
9595
{{- .Values.extraEnvs | toYaml | nindent 12 }}
9696
{{- end }}
97+
affinity:
98+
{{ toYaml .Values.affinity | indent 8 }}
99+
nodeSelector:
100+
{{ toYaml .Values.nodeSelector | indent 8 }}
101+
tolerations:
102+
{{ toYaml .Values.tolerations | indent 8 }}
103+
{{- if .Values.priorityClassName }}
104+
priorityClassName: {{ .Values.priorityClassName }}
105+
{{- end }}

‎charts/postgres-operator-ui/values.yaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ replicaCount: 1
66

77
# configure ui image
88
image:
9-
registry: registry.opensource.zalan.do
10-
repository: acid/postgres-operator-ui
11-
tag: v1.11.0
9+
registry: ghcr.io
10+
repository: zalando/postgres-operator-ui
11+
tag: v1.12.0
1212
pullPolicy: "IfNotPresent"
1313

1414
# Optionally specify an array of imagePullSecrets.
@@ -111,3 +111,18 @@ ingress:
111111
# - secretName: ui-tls
112112
# hosts:
113113
# - ui.exmaple.org
114+
115+
# priority class for operator-ui pod
116+
priorityClassName: ""
117+
118+
# Affinity for pod assignment
119+
# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
120+
affinity: {}
121+
122+
# Node labels for pod assignment
123+
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
124+
nodeSelector: {}
125+
126+
# Tolerations for pod assignment
127+
# Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
128+
tolerations: []

‎charts/postgres-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: postgres-operator
3-
version: 1.11.0
4-
appVersion: 1.11.0
3+
version: 1.12.0
4+
appVersion: 1.12.0
55
home: https://github.com/zalando/postgres-operator
66
description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
77
keywords:

‎charts/postgres-operator/crds/operatorconfigurations.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
type: string
6969
docker_image:
7070
type: string
71-
default: "ghcr.io/zalando/spilo-16:3.2-p2"
71+
default: "ghcr.io/zalando/spilo-16:3.2-p3"
7272
enable_crd_registration:
7373
type: boolean
7474
default: true
@@ -211,6 +211,9 @@ spec:
211211
enable_init_containers:
212212
type: boolean
213213
default: true
214+
enable_secrets_deletion:
215+
type: boolean
216+
default: true
214217
enable_persistent_volume_claim_deletion:
215218
type: boolean
216219
default: true
@@ -281,6 +284,9 @@ spec:
281284
oauth_token_secret_name:
282285
type: string
283286
default: "postgresql-operator"
287+
pdb_master_label_selector:
288+
type: boolean
289+
default: true
284290
pdb_name_format:
285291
type: string
286292
default: "postgres-{cluster}-pdb"
@@ -502,7 +508,7 @@ spec:
502508
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
503509
logical_backup_docker_image:
504510
type: string
505-
default: "registry.opensource.zalan.do/acid/logical-backup:v1.11.0"
511+
default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.0"
506512
logical_backup_google_application_credentials:
507513
type: string
508514
logical_backup_job_prefix:
@@ -525,6 +531,8 @@ spec:
525531
type: string
526532
logical_backup_s3_bucket:
527533
type: string
534+
logical_backup_s3_bucket_prefix:
535+
type: string
528536
logical_backup_s3_endpoint:
529537
type: string
530538
logical_backup_s3_region:

‎charts/postgres-operator/crds/postgresqls.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,14 @@ spec:
8787
- mountPath
8888
- volumeSource
8989
properties:
90+
isSubPathExpr:
91+
type: boolean
9092
name:
9193
type: string
9294
mountPath:
9395
type: string
96+
subPath:
97+
type: string
9498
targetContainers:
9599
type: array
96100
nullable: true
@@ -99,8 +103,6 @@ spec:
99103
volumeSource:
100104
type: object
101105
x-kubernetes-preserve-unknown-fields: true
102-
subPath:
103-
type: string
104106
allowedSourceRanges:
105107
type: array
106108
nullable: true
@@ -215,6 +217,8 @@ spec:
215217
items:
216218
type: object
217219
x-kubernetes-preserve-unknown-fields: true
220+
logicalBackupRetention:
221+
type: string
218222
logicalBackupSchedule:
219223
type: string
220224
pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
@@ -632,6 +636,8 @@ spec:
632636
required:
633637
- size
634638
properties:
639+
isSubPathExpr:
640+
type: boolean
635641
iops:
636642
type: integer
637643
selector:

0 commit comments

Comments
 (0)