Skip to content

Commit

Permalink
Update pgVersions for dbgate; Add disableSSLSessionResumption (#1542
Browse files Browse the repository at this point in the history
)

Signed-off-by: souravbiswassanto <[email protected]>
  • Loading branch information
souravbiswassanto authored Feb 5, 2025
1 parent e3fc1cf commit a248ed5
Show file tree
Hide file tree
Showing 50 changed files with 473 additions and 27 deletions.
4 changes: 2 additions & 2 deletions catalog/VersionMatrix.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@
| 13.13 |||||||||||||||||||||||||||||||||||||||||||
| 13.13-bookworm |||||||||||||||||||||||||||||||||||||||||||
| 13-bullseye-postgis |||||||||||||||||||||||||||||||||||||||||||
| timescaledb-2.14.2-pg13 ||||||||||||| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| timescaledb-2.14.2-pg13 ||||||||||||| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| 13.18 |||||||||||||||||||||||||||||||||||||||||||
| 13.18-bookworm |||||||||||||||||||||||||||||||||||||||||||
| 14.10 |||||||||||||||||||||||||||||||||||||||||||
| 14.10-bookworm |||||||||||||||||||||||||||||||||||||||||||
| 14-bullseye-postgis |||||||||||||||||||||||||||||||||||||||||||
| timescaledb-2.14.2-pg14 ||||||||||||||||||| | | | | | | | | | | | | | | | | | | | | | | | |
| timescaledb-2.14.2-pg14 ||||||||||||||||||| | | | | | | | | | | | | | | | | | | | | | | | |
| 14.13 |||||||||||||||||||||||||||||||||||||||||||
| 14.13-bookworm |||||||||||||||||||||||||||||||||||||||||||
| 14.15 |||||||||||||||||||||||||||||||||||||||||||
Expand Down
3 changes: 3 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-13.14-timescaledb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@ spec:
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 13.14'
version: "13.14"
3 changes: 3 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-14.11-timescaledb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@ spec:
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 14.11'
version: "14.11"
4 changes: 4 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-14.13-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
name: postgres-backup-14.0
restoreTask:
name: postgres-restore-14.0
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down Expand Up @@ -93,6 +95,8 @@ spec:
name: postgres-backup-14.0
restoreTask:
name: postgres-restore-14.0
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
4 changes: 4 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-15.8-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
name: postgres-backup-15.1
restoreTask:
name: postgres-restore-15.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down Expand Up @@ -93,6 +95,8 @@ spec:
name: postgres-backup-15.1
restoreTask:
name: postgres-restore-15.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
2 changes: 2 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-16.1-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.1'
Expand Down
6 changes: 6 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-16.4-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ spec:
name: postgres-backup-16.1
restoreTask:
name: postgres-restore-16.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.4'
Expand Down Expand Up @@ -91,6 +95,8 @@ spec:
name: postgres-backup-16.1
restoreTask:
name: postgres-restore-16.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
2 changes: 2 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-16.6-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.6'
Expand Down
2 changes: 2 additions & 0 deletions catalog/kubedb/raw/postgres/postgres-17.2-official.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 17.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ spec:
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 13.14'
version: "13.14"
{{ end }}
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ spec:
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 14.11'
version: "14.11"
{{ end }}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ spec:
name: postgres-backup-14.0
restoreTask:
name: postgres-restore-14.0
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down Expand Up @@ -105,6 +107,8 @@ spec:
name: postgres-backup-14.0
restoreTask:
name: postgres-restore-14.0
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ spec:
name: postgres-backup-15.1
restoreTask:
name: postgres-restore-15.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down Expand Up @@ -105,6 +107,8 @@ spec:
name: postgres-backup-15.1
restoreTask:
name: postgres-restore-15.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,13 @@ spec:
name: postgres-backup-16.1
restoreTask:
name: postgres-restore-16.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.4'
Expand Down Expand Up @@ -103,6 +107,8 @@ spec:
name: postgres-backup-16.1
restoreTask:
name: postgres-restore-16.1
tls:
disableSSLSessionResumption: true
ui:
- name: pgadmin
version: v2024.4.27
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 16.6'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ spec:
ui:
- name: pgadmin
version: v2024.4.27
- name: dbgate
version: v2024.4.27
updateConstraints:
allowlist:
- '>= 17.2'
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ require (
kmodules.xyz/client-go v0.30.44
kmodules.xyz/go-containerregistry v0.0.12
kmodules.xyz/image-packer v0.0.0-20241213044824-5b4eb7f75cf4
kmodules.xyz/resource-metadata v0.24.2
kmodules.xyz/resource-metadata v0.24.3
kmodules.xyz/schema-checker v0.4.1
kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068
kubedb.dev/apimachinery v0.51.1-0.20250205090719-b05f97094efd
kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627
sigs.k8s.io/yaml v1.4.0
stash.appscode.dev/installer v0.12.2-0.20250108183814-50ebd27eef9c
Expand Down Expand Up @@ -98,7 +98,7 @@ require (
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/time v0.6.0 // indirect
gomodules.xyz/encoding v0.0.8 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gomodules.xyz/jsonpath v0.0.2 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
Expand Down Expand Up @@ -325,12 +325,12 @@ kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+a
kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
kmodules.xyz/resource-metadata v0.24.2 h1:PBVfWCVzjlG5LaxKO3YhfLpgLQctXDFG/pYpnznjWbE=
kmodules.xyz/resource-metadata v0.24.2/go.mod h1:rPUZSMR0e1Vi+gONQ2ZhOFW+GvUeK+1AI7h9fzTZoKI=
kmodules.xyz/resource-metadata v0.24.3 h1:yGXm6G1YIXru3mgDqDWsCPhGfotT3xBTKy+jd0bpF+E=
kmodules.xyz/resource-metadata v0.24.3/go.mod h1:rPUZSMR0e1Vi+gONQ2ZhOFW+GvUeK+1AI7h9fzTZoKI=
kmodules.xyz/schema-checker v0.4.1 h1:V5UEjR6UMAXf307lTgw+9rDRfHLTNA8g/q9DngqYI9M=
kmodules.xyz/schema-checker v0.4.1/go.mod h1:BRXLB3Osuc9raHRJxHOgZFGecZ2aZumLXCHAOa5NPdA=
kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068 h1:UcPj/qrwoUSXGXxM2AFA06Y1p3BGRwtruF9TvxP6aVI=
kubedb.dev/apimachinery v0.51.1-0.20250128115333-e5366d526068/go.mod h1:pbuXlEZM70Uw1SnSGH7bbzcAiwEYq4NX0CRG8ugODNY=
kubedb.dev/apimachinery v0.51.1-0.20250205090719-b05f97094efd h1:jiSPtW4enbq1z+2Mlm4WsOvo8wO+FdVT30fQTinypwo=
kubedb.dev/apimachinery v0.51.1-0.20250205090719-b05f97094efd/go.mod h1:RhOv3GMkMT1GtYE8WTqF7QZAuENDBObKKN4lTJr8YDM=
kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627 h1:Lox/QR6RSJ1CogZ/NMsL3xHaBX2pvuctZuL2kOqm+Ew=
kubeops.dev/installer v0.0.0-20250131122006-8354eb35b627/go.mod h1:7Jc6/7UyPCDUE0CC5B93K2lr1bHJZ51rxKgPp76BrNE=
kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
Expand Down
4 changes: 2 additions & 2 deletions vendor/golang.org/x/time/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,12 @@ func (m MariaDBVersion) ValidateSpecs() error {
if m.Spec.Version == "" ||
m.Spec.DB.Image == "" ||
m.Spec.Exporter.Image == "" ||
m.Spec.Maxscale.Image == "" ||
m.Spec.InitContainer.Image == "" ||
m.Spec.Coordinator.Image == "" {
return fmt.Errorf(`atleast one of the following specs is not set for mariadbversion "%v":
spec.version,
spec.db.image,
spec.exporter.image,
spec.maxscale.image,
spec.initContainer.image,
spec.coordinator.image.`, m.Name)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type MariaDBVersionSpec struct {
// Database Image
DB MariaDBVersionDatabase `json:"db"`
// Maxscale Image
// +optional
Maxscale MariaDBVersionMaxscale `json:"maxscale"`
// Exporter Image
Exporter MariaDBVersionExporter `json:"exporter"`
Expand Down
Loading

0 comments on commit a248ed5

Please sign in to comment.