Skip to content

Commit 8f3a64a

Browse files
stafotstafot
authored
Merge pull request #34 from mattermost/chore/MM-40713
Upgrade postgres engine version
2 parents e430ce2 + 7b98bdf commit 8f3a64a

File tree

6 files changed

+29
-13
lines changed

6 files changed

+29
-13
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
################################################################################
44

55
## Docker Build Versions
6-
DOCKER_BUILD_IMAGE = golang:1.14.1
7-
DOCKER_BASE_IMAGE = alpine:3.11
6+
DOCKER_BUILD_IMAGE = golang:1.17
7+
DOCKER_BASE_IMAGE = alpine:3.14
88

99
## Tool Versions
1010
TERRAFORM_VERSION=0.14.5

‎build/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build the mattermost cloud
2-
ARG DOCKER_BUILD_IMAGE=golang:1.14.2
3-
ARG DOCKER_BASE_IMAGE=alpine:3.11.3
2+
ARG DOCKER_BUILD_IMAGE=golang:1.17
3+
ARG DOCKER_BASE_IMAGE=alpine:3.14
44

55
FROM ${DOCKER_BUILD_IMAGE} AS build
66
WORKDIR /mattermost-cloud-database-factory/

‎go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/sirupsen/logrus v1.8.1
1414
github.com/spf13/cobra v1.1.3
1515
github.com/stretchr/testify v1.7.0
16-
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
17-
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
18-
golang.org/x/tools v0.1.7 // indirect
16+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
17+
golang.org/x/tools v0.1.8 // indirect
1918
)

‎go.sum‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
895895
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
896896
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
897897
github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
898-
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
898+
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
899899
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
900900
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
901901
gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
@@ -998,6 +998,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
998998
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
999999
golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
10001000
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1001+
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
10011002
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
10021003
golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
10031004
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1055,6 +1056,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
10551056
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
10561057
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
10571058
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1059+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
1060+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
10581061
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
10591062
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
10601063
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1151,6 +1154,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
11511154
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11521155
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
11531156
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1157+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
1158+
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
11541159
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
11551160
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
11561161
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1160,6 +1165,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11601165
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
11611166
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
11621167
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
1168+
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
1169+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
11631170
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11641171
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
11651172
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -1227,8 +1234,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
12271234
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
12281235
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
12291236
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1230-
golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
1231-
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
1237+
golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
1238+
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
12321239
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
12331240
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
12341241
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎terraform/aws/database-factory-postgresql/variables.tf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ variable "engine" {
2929
}
3030

3131
variable "engine_version" {
32-
default = "11.9"
32+
default = "12.7"
3333
description = "The engine version to use"
3434
type = string
3535
}
@@ -188,8 +188,10 @@ variable "max_postgresql_connections_map" {
188188
default = {
189189
"db.t3.small" = "198"
190190
"db.t3.medium" = "415"
191+
"db.t3.large" = "683"
191192
"db.t4g.small" = "198"
192193
"db.t4g.medium" = "415"
194+
"db.t4g.large" = "683"
193195
"db.r5.large" = "1675"
194196
"db.r5.xlarge" = "3355"
195197
"db.r5.2xlarge" = "6710"
@@ -209,8 +211,10 @@ variable "ram_memory_bytes" {
209211
default = {
210212
"db.t3.small" = "2147483648"
211213
"db.t3.medium" = "4294967296"
214+
"db.t3.large" = "8589934592"
212215
"db.t4g.small" = "2147483648"
213216
"db.t4g.medium" = "4294967296"
217+
"db.t4g.large" = "8589934592"
214218
"db.r5.large" = "17179869184"
215219
"db.r5.xlarge" = "34359738368"
216220
"db.r5.2xlarge" = "68719476736"

‎terraform/aws/modules/rds-aurora-postgresql/main.tf‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ resource "aws_cloudwatch_metric_alarm" "db_instances_alarm_memory" {
202202
resource "aws_db_parameter_group" "db_parameter_group_postgresql" {
203203

204204
name = format("rds-cluster-multitenant-%s-%s-pg", split("-", var.vpc_id)[1], local.database_id)
205-
family = "aurora-postgresql11"
205+
family = "aurora-postgresql12"
206206

207207
parameter {
208208
apply_method = "pending-reboot"
@@ -241,7 +241,7 @@ resource "aws_db_parameter_group" "db_parameter_group_postgresql" {
241241
resource "aws_rds_cluster_parameter_group" "cluster_parameter_group_postgresql" {
242242

243243
name = format("rds-cluster-multitenant-%s-%s-cluster-pg", split("-", var.vpc_id)[1], local.database_id)
244-
family = "aurora-postgresql11"
244+
family = "aurora-postgresql12"
245245

246246

247247
parameter {
@@ -285,6 +285,12 @@ resource "aws_lambda_permission" "rds-cluster-cloudwatch-allow" {
285285
function_name = var.lambda_name
286286
principal = var.cwl_endpoint
287287
source_arn = format("arn:aws:logs:${local.account_details}:log-group:/aws/rds/cluster/rds-cluster-multitenant-%s-%s/postgresql:*", split("-", var.vpc_id)[1], local.database_id)
288+
depends_on = [aws_rds_cluster.provisioning_rds_cluster]
289+
}
290+
291+
resource "aws_cloudwatch_log_group" "rds-cluster-log-group" {
292+
name = format("rds-cluster-multitenant-%s-%s/postgresql", split("-", var.vpc_id)[1], local.database_id)
293+
depends_on = [aws_rds_cluster.provisioning_rds_cluster]
288294
}
289295

290296
resource "aws_cloudwatch_log_subscription_filter" "rds-cluster-cloudwatch-logs-to-es" {

0 commit comments

Comments
 (0)