Skip to content

Commit fed825f

Browse files
namgknamgk
authored
Merge pull request #6 from zalando/master
sync upstream
2 parents 28c27ef + 6ddafad commit fed825f

File tree

150 files changed

+2906
-1621
lines changed

Some content is hidden

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

150 files changed

+2906
-1621
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.10.0
12+
- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.11.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: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
name: Publish multiarch postgres-operator image on ghcr.io
1+
name: Publish multiarch postgres-operator images on ghcr.io
22

33
env:
44
REGISTRY: ghcr.io
55
IMAGE_NAME: ${{ github.repository }}
6+
IMAGE_NAME_UI: ${{ github.repository }}-ui
67

78
on:
89
push:
910
tags:
1011
- '*'
12+
1113
jobs:
1214
publish:
1315
name: Build, test and push image
@@ -21,16 +23,28 @@ jobs:
2123

2224
- uses: actions/setup-go@v2
2325
with:
24-
go-version: "^1.19.8"
26+
go-version: "^1.21.7"
2527

2628
- name: Run unit tests
2729
run: make deps mocks test
2830

2931
- name: Define image name
3032
id: image
3133
run: |
32-
IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}"
33-
echo "NAME=$IMAGE" >> $GITHUB_OUTPUT
34+
OPERATOR_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_REF/refs\/tags\//}"
35+
echo "OPERATOR_IMAGE=$OPERATOR_IMAGE" >> $GITHUB_OUTPUT
36+
37+
- name: Define UI image name
38+
id: image_ui
39+
run: |
40+
UI_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME_UI }}:${GITHUB_REF/refs\/tags\//}"
41+
echo "UI_IMAGE=$UI_IMAGE" >> $GITHUB_OUTPUT
42+
43+
- name: Define logical backup image name
44+
id: image_lb
45+
run: |
46+
BACKUP_IMAGE="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/logical-backup:${GITHUB_REF_NAME}"
47+
echo "BACKUP_IMAGE=$BACKUP_IMAGE" >> $GITHUB_OUTPUT
3448
3549
- name: Set up QEMU
3650
uses: docker/setup-qemu-action@v2
@@ -45,12 +59,30 @@ jobs:
4559
username: ${{ github.actor }}
4660
password: ${{ secrets.GITHUB_TOKEN }}
4761

48-
- name: Build and push multiarch image to ghcr
62+
- name: Build and push multiarch operator image to ghcr
4963
uses: docker/build-push-action@v3
5064
with:
5165
context: .
5266
file: docker/Dockerfile
5367
push: true
5468
build-args: BASE_IMAGE=alpine:3.15
55-
tags: "${{ steps.image.outputs.NAME }}"
69+
tags: "${{ steps.image.outputs.OPERATOR_IMAGE }}"
70+
platforms: linux/amd64,linux/arm64
71+
72+
- name: Build and push multiarch ui image to ghcr
73+
uses: docker/build-push-action@v3
74+
with:
75+
context: ui
76+
push: true
77+
build-args: BASE_IMAGE=alpine:3.15
78+
tags: "${{ steps.image_ui.outputs.UI_IMAGE }}"
79+
platforms: linux/amd64,linux/arm64
80+
81+
- name: Build and push multiarch logical-backup image to ghcr
82+
uses: docker/build-push-action@v3
83+
with:
84+
context: docker/logical-backup
85+
push: true
86+
build-args: BASE_IMAGE=ubuntu:22.04
87+
tags: "${{ steps.image_lb.outputs.BACKUP_IMAGE }}"
5688
platforms: linux/amd64,linux/arm64

‎.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.19.8"
17+
go-version: "^1.21.7"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Code generation

‎.github/workflows/run_tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-go@v2
1616
with:
17-
go-version: "^1.19.8"
17+
go-version: "^1.21.7"
1818
- name: Make dependencies
1919
run: make deps mocks
2020
- name: Compile
2121
run: make linux
2222
- name: Run unit tests
2323
run: go test -race -covermode atomic -coverprofile=coverage.out ./...
2424
- name: Convert coverage to lcov
25-
uses: jandelgado/[email protected].8
25+
uses: jandelgado/[email protected].9
2626
- name: Coveralls
2727
uses: coverallsapp/github-action@master
2828
with:

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# global owners
2-
* @sdudoladov @Jan-M @FxKu @jopadi @idanovinda @hughcapet
2+
* @sdudoladov @Jan-M @FxKu @jopadi @idanovinda @hughcapet @macedigital

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2023 Zalando SE
3+
Copyright (c) 2024 Zalando SE
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ Felix Kunde <[email protected]>
33
Jan Mussler <[email protected]>
44
Jociele Padilha <[email protected]>
55
Ida Novindasari <[email protected]>
6-
Polina Bungina <[email protected]>
6+
Polina Bungina <[email protected]>
7+
Matthias Adler <[email protected]>

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ docker: ${DOCKERDIR}/${DOCKERFILE}
6969
docker build --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.19.8 bash -c "make linux"
72+
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.21.7 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/client-go@kubernetes-1.25.9
81+
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.28.7
8282
GO111MODULE=on go install github.com/golang/mock/[email protected]
8383
GO111MODULE=on go mod tidy
8484

‎README.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as
2929

3030
### PostgreSQL features
3131

32-
* Supports PostgreSQL 15, starting from 10+
32+
* Supports PostgreSQL 16, starting from 11+
3333
* Streaming replication cluster via Patroni
3434
* Point-In-Time-Recovery with
35-
[pg_basebackup](https://www.postgresql.org/docs/11/app-pgbasebackup.html) /
35+
[pg_basebackup](https://www.postgresql.org/docs/16/app-pgbasebackup.html) /
3636
[WAL-E](https://github.com/wal-e/wal-e) via [Spilo](https://github.com/zalando/spilo)
3737
* Preload libraries: [bg_mon](https://github.com/CyberDem0n/bg_mon),
38-
[pg_stat_statements](https://www.postgresql.org/docs/15/pgstatstatements.html),
38+
[pg_stat_statements](https://www.postgresql.org/docs/16/pgstatstatements.html),
3939
[pgextwlist](https://github.com/dimitri/pgextwlist),
4040
[pg_auth_mon](https://github.com/RafiaSabih/pg_auth_mon)
4141
* Incl. popular Postgres extensions such as
@@ -45,6 +45,7 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as
4545
[pg_partman](https://github.com/pgpartman/pg_partman),
4646
[pg_stat_kcache](https://github.com/powa-team/pg_stat_kcache),
4747
[pgq](https://github.com/pgq/pgq),
48+
[pgvector](https://github.com/pgvector/pgvector),
4849
[plpgsql_check](https://github.com/okbob/plpgsql_check),
4950
[postgis](https://postgis.net/),
5051
[set_user](https://github.com/pgaudit/set_user) and
@@ -57,8 +58,9 @@ production for over five years.
5758

5859
| Release | Postgres versions | K8s versions | Golang |
5960
| :-------- | :---------------: | :---------------: | :-----: |
60-
| v1.10.* | 10 &rarr; 15 | 1.21+ | 1.19.8 |
61-
| v1.9.0 | 10 &rarr; 15 | 1.21+ | 1.18.9 |
61+
| v1.11.* | 11 &rarr; 16 | 1.21 &rarr; 1.28 | 1.21.7 |
62+
| v1.10.* | 10 &rarr; 15 | 1.21 &rarr; 1.28 | 1.19.8 |
63+
| v1.9.0 | 10 &rarr; 15 | 1.21 &rarr; 1.28 | 1.18.9 |
6264
| v1.8.* | 9.5 &rarr; 14 | 1.20 &rarr; 1.24 | 1.17.4 |
6365
| v1.7.1 | 9.5 &rarr; 14 | 1.20 &rarr; 1.24 | 1.16.9 |
6466

@@ -70,7 +72,8 @@ For a quick first impression follow the instructions of this
7072

7173
## Supported setups of Postgres and Applications
7274

73-
![Features](docs/diagrams/neutral_operator.png)
75+
![Features](docs/diagrams/neutral_operator_dark.png#gh-dark-mode-only)
76+
![Features](docs/diagrams/neutral_operator_light.png#gh-light-mode-only)
7477

7578
## Documentation
7679

@@ -86,9 +89,3 @@ There is a browser-friendly version of this documentation at
8689
* [Configuration options](docs/reference/operator_parameters.md)
8790
* [Postgres manifest reference](docs/reference/cluster_manifest.md)
8891
* [Command-line options and environment variables](docs/reference/command_line_and_environment.md)
89-
90-
## Community
91-
92-
There are two places to get in touch with the community:
93-
1. The [GitHub issue tracker](https://github.com/zalando/postgres-operator/issues)
94-
2. The **#postgres-operator** [slack channel](https://postgres-slack.herokuapp.com)

‎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.10.0
4-
appVersion: 1.10.0
3+
version: 1.11.0
4+
appVersion: 1.11.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: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apiVersion: v1
22
entries:
33
postgres-operator-ui:
44
- apiVersion: v2
5-
appVersion: 1.10.0
6-
created: "2023-04-20T17:43:19.406989589+02:00"
5+
appVersion: 1.11.0
6+
created: "2024-03-14T17:12:46.692800586+01:00"
77
description: Postgres Operator UI provides a graphical interface for a convenient
88
database-as-a-service user experience
9-
digest: 47413650e3188539ae778a601998efa2c4f80b8aa16e3668a2fc7b72e014b605
9+
digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2
1010
home: https://github.com/zalando/postgres-operator
1111
keywords:
1212
- postgres
@@ -22,14 +22,14 @@ entries:
2222
sources:
2323
- https://github.com/zalando/postgres-operator
2424
urls:
25-
- postgres-operator-ui-1.10.0.tgz
26-
version: 1.10.0
25+
- postgres-operator-ui-1.11.0.tgz
26+
version: 1.11.0
2727
- apiVersion: v2
28-
appVersion: 1.9.0
29-
created: "2023-04-20T17:43:19.412696022+02:00"
28+
appVersion: 1.10.1
29+
created: "2024-03-14T17:12:46.691746076+01:00"
3030
description: Postgres Operator UI provides a graphical interface for a convenient
3131
database-as-a-service user experience
32-
digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc
32+
digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce
3333
home: https://github.com/zalando/postgres-operator
3434
keywords:
3535
- postgres
@@ -45,14 +45,14 @@ entries:
4545
sources:
4646
- https://github.com/zalando/postgres-operator
4747
urls:
48-
- postgres-operator-ui-1.9.0.tgz
49-
version: 1.9.0
48+
- postgres-operator-ui-1.10.1.tgz
49+
version: 1.10.1
5050
- apiVersion: v2
51-
appVersion: 1.8.2
52-
created: "2023-04-20T17:43:19.412121611+02:00"
51+
appVersion: 1.10.0
52+
created: "2024-03-14T17:12:46.690807634+01:00"
5353
description: Postgres Operator UI provides a graphical interface for a convenient
5454
database-as-a-service user experience
55-
digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c
55+
digest: 47413650e3188539ae778a601998efa2c4f80b8aa16e3668a2fc7b72e014b605
5656
home: https://github.com/zalando/postgres-operator
5757
keywords:
5858
- postgres
@@ -68,14 +68,14 @@ entries:
6868
sources:
6969
- https://github.com/zalando/postgres-operator
7070
urls:
71-
- postgres-operator-ui-1.8.2.tgz
72-
version: 1.8.2
71+
- postgres-operator-ui-1.10.0.tgz
72+
version: 1.10.0
7373
- apiVersion: v2
74-
appVersion: 1.8.1
75-
created: "2023-04-20T17:43:19.411558436+02:00"
74+
appVersion: 1.9.0
75+
created: "2024-03-14T17:12:46.696626932+01:00"
7676
description: Postgres Operator UI provides a graphical interface for a convenient
7777
database-as-a-service user experience
78-
digest: d26342e385ea51a0fbfbe23477999863e9489664ae803ea5c56da8897db84d24
78+
digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc
7979
home: https://github.com/zalando/postgres-operator
8080
keywords:
8181
- postgres
@@ -91,14 +91,14 @@ entries:
9191
sources:
9292
- https://github.com/zalando/postgres-operator
9393
urls:
94-
- postgres-operator-ui-1.8.1.tgz
95-
version: 1.8.1
96-
- apiVersion: v1
97-
appVersion: 1.8.0
98-
created: "2023-04-20T17:43:19.41042838+02:00"
94+
- postgres-operator-ui-1.9.0.tgz
95+
version: 1.9.0
96+
- apiVersion: v2
97+
appVersion: 1.8.2
98+
created: "2024-03-14T17:12:46.69565936+01:00"
9999
description: Postgres Operator UI provides a graphical interface for a convenient
100100
database-as-a-service user experience
101-
digest: d4a7b40c23fd167841cc28342afdbd5ecc809181913a5c31061c83139187f148
101+
digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c
102102
home: https://github.com/zalando/postgres-operator
103103
keywords:
104104
- postgres
@@ -114,14 +114,14 @@ entries:
114114
sources:
115115
- https://github.com/zalando/postgres-operator
116116
urls:
117-
- postgres-operator-ui-1.8.0.tgz
118-
version: 1.8.0
119-
- apiVersion: v1
120-
appVersion: 1.7.1
121-
created: "2023-04-20T17:43:19.409317912+02:00"
117+
- postgres-operator-ui-1.8.2.tgz
118+
version: 1.8.2
119+
- apiVersion: v2
120+
appVersion: 1.8.1
121+
created: "2024-03-14T17:12:46.694691362+01:00"
122122
description: Postgres Operator UI provides a graphical interface for a convenient
123123
database-as-a-service user experience
124-
digest: 97aed1a1d37cd5f8441eea9522f38e56cc829786ad2134c437a5e6a15c995869
124+
digest: d26342e385ea51a0fbfbe23477999863e9489664ae803ea5c56da8897db84d24
125125
home: https://github.com/zalando/postgres-operator
126126
keywords:
127127
- postgres
@@ -137,14 +137,14 @@ entries:
137137
sources:
138138
- https://github.com/zalando/postgres-operator
139139
urls:
140-
- postgres-operator-ui-1.7.1.tgz
141-
version: 1.7.1
140+
- postgres-operator-ui-1.8.1.tgz
141+
version: 1.8.1
142142
- apiVersion: v1
143-
appVersion: 1.7.0
144-
created: "2023-04-20T17:43:19.40859522+02:00"
143+
appVersion: 1.8.0
144+
created: "2024-03-14T17:12:46.693750873+01:00"
145145
description: Postgres Operator UI provides a graphical interface for a convenient
146146
database-as-a-service user experience
147-
digest: 37fba1968347daad393dbd1c6ee6e5b6a24d1095f972c0102197531c62dcada8
147+
digest: d4a7b40c23fd167841cc28342afdbd5ecc809181913a5c31061c83139187f148
148148
home: https://github.com/zalando/postgres-operator
149149
keywords:
150150
- postgres
@@ -160,6 +160,6 @@ entries:
160160
sources:
161161
- https://github.com/zalando/postgres-operator
162162
urls:
163-
- postgres-operator-ui-1.7.0.tgz
164-
version: 1.7.0
165-
generated: "2023-04-20T17:43:19.40598429+02:00"
163+
- postgres-operator-ui-1.8.0.tgz
164+
version: 1.8.0
165+
generated: "2024-03-14T17:12:46.689654615+01:00"

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

4.9 KB
Binary file not shown.

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

5 KB
Binary file not shown.

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

-29.7 KB
Binary file not shown.

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

-4.64 KB
Binary file not shown.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ spec:
8484
"limit_iops": 16000,
8585
"limit_throughput": 1000,
8686
"postgresql_versions": [
87+
"16",
8788
"15",
8889
"14",
8990
"13",
90-
"12",
91-
"11"
91+
"12"
9292
]
9393
}
9494
{{- if .Values.extraEnvs }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
{{- range .paths }}
4545
- path: {{ . }}
4646
{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
47-
pathType: ImplementationSpecific
47+
pathType: Prefix
4848
backend:
4949
service:
5050
name: {{ $fullName }}

0 commit comments

Comments
 (0)