From 1ecc1235e3b02835f58672d87fd9cc33cae381de Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Mon, 19 Aug 2024 10:00:00 -0400 Subject: [PATCH 1/4] Bump EDB used by IM to stable-v1.22 channel --- controllers/constant/odlm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go index b962aa997..128e34819 100644 --- a/controllers/constant/odlm.go +++ b/controllers/constant/odlm.go @@ -291,7 +291,7 @@ metadata: status-monitored-services: {{ .StatusMonitoredServices }} spec: operators: - - channel: stable + - channel: stable-v1.22 installPlanApproval: {{ .ApprovalMode }} name: common-service-postgresql namespace: "{{ .CPFSNs }}" From 444d44487102d0f85924cd699982c6c86d8315f2 Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Mon, 19 Aug 2024 11:01:35 -0400 Subject: [PATCH 2/4] Update EDB operand image --- controllers/constant/cloudNativePostgresql.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/controllers/constant/cloudNativePostgresql.go b/controllers/constant/cloudNativePostgresql.go index 47e56c86e..4affd7ff5 100644 --- a/controllers/constant/cloudNativePostgresql.go +++ b/controllers/constant/cloudNativePostgresql.go @@ -27,10 +27,10 @@ metadata: annotations: version: {{ .Version }} data: - ibm-postgresql-16-operand-image: icr.io/cpopen/edb/postgresql:16.2@sha256:5390227d36006c0cd7ac4b957411707adb49ca40125156ceef44f8b593838e94 - ibm-postgresql-15-operand-image: icr.io/cpopen/edb/postgresql:15.6@sha256:370e20dd2cb68b88bfd5a5ff5147d6a638e20952d4fda6215880a03dbfc77517 - ibm-postgresql-14-operand-image: icr.io/cpopen/edb/postgresql:14.11@sha256:5f825e253f330006144895af8a8c8cd0cc91a95937652fb094b3244302aaa469 - ibm-postgresql-13-operand-image: icr.io/cpopen/edb/postgresql:13.14@sha256:60328994ab265ca367b67259a1faacc349cf57f7bcccdb2c1494244a5663940d - ibm-postgresql-12-operand-image: icr.io/cpopen/edb/postgresql:12.18@sha256:287c28ca4584e92bc1fae545c813c6e9a6723f978f0d3f8c2f29e40a0b15853f - edb-postgres-license-provider-image: cp.icr.io/cp/cpd/edb-postgres-license-provider@sha256:c1670e7dd93c1e65a6659ece644e44aa5c2150809ac1089e2fd6be37dceae4ce + ibm-postgresql-16-operand-image: icr.io/cpopen/edb/postgresql:16.3@sha256:0fd61248ef26dc90b72f7bd7df1c094c6ba8b216fb398f8878765fd425b286e9 + ibm-postgresql-15-operand-image: icr.io/cpopen/edb/postgresql:15.7@sha256:0328e8cbf635a0da828fb70300bfe10ac22e1686261f71a75bfc32f8505c7dfe + ibm-postgresql-14-operand-image: icr.io/cpopen/edb/postgresql:14.12@sha256:2ccccce28ed1cdb15b21f7fcb083570e3dbc98159f064ae84c4c9a9d4b9e4d53 + ibm-postgresql-13-operand-image: icr.io/cpopen/edb/postgresql:13.15@sha256:063879a85c8ea1cf38df2043a00e9db490ed7660a652885c634a7f4e7c39d0be + ibm-postgresql-12-operand-image: icr.io/cpopen/edb/postgresql:12.19@sha256:ed4da158d8551759d3f5994237b2c7f3ac7a1c8d01510e04d1a394a04279811a + edb-postgres-license-provider-image: cp.icr.io/cp/cpd/edb-postgres-license-provider@sha256:6b5c69987f8967f5d0256a38e8759dad15480cf3c0eada9eb5fc71c51ed1cee9 ` From 42d57c04a431971d0de94b4fa4538fc6a263699c Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Wed, 28 Aug 2024 19:34:47 -0700 Subject: [PATCH 3/4] update internal EDB OperandRequest to 1.22 Signed-off-by: Daniel Fan --- controllers/constant/odlm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/constant/odlm.go b/controllers/constant/odlm.go index 128e34819..502af7754 100644 --- a/controllers/constant/odlm.go +++ b/controllers/constant/odlm.go @@ -1128,7 +1128,7 @@ spec: spec: requests: - operands: - - name: cloud-native-postgresql + - name: cloud-native-postgresql-v1.22 registry: common-service registryNamespace: {{ .ServicesNs }} force: true From a39edd5f387372835a7d916c8cef3741c6ff8643 Mon Sep 17 00:00:00 2001 From: Daniel Fan Date: Fri, 30 Aug 2024 11:35:27 -0700 Subject: [PATCH 4/4] Update EDB operand version Signed-off-by: Daniel Fan --- controllers/constant/cloudNativePostgresql.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/constant/cloudNativePostgresql.go b/controllers/constant/cloudNativePostgresql.go index 4affd7ff5..34aff1648 100644 --- a/controllers/constant/cloudNativePostgresql.go +++ b/controllers/constant/cloudNativePostgresql.go @@ -27,10 +27,10 @@ metadata: annotations: version: {{ .Version }} data: - ibm-postgresql-16-operand-image: icr.io/cpopen/edb/postgresql:16.3@sha256:0fd61248ef26dc90b72f7bd7df1c094c6ba8b216fb398f8878765fd425b286e9 - ibm-postgresql-15-operand-image: icr.io/cpopen/edb/postgresql:15.7@sha256:0328e8cbf635a0da828fb70300bfe10ac22e1686261f71a75bfc32f8505c7dfe - ibm-postgresql-14-operand-image: icr.io/cpopen/edb/postgresql:14.12@sha256:2ccccce28ed1cdb15b21f7fcb083570e3dbc98159f064ae84c4c9a9d4b9e4d53 - ibm-postgresql-13-operand-image: icr.io/cpopen/edb/postgresql:13.15@sha256:063879a85c8ea1cf38df2043a00e9db490ed7660a652885c634a7f4e7c39d0be - ibm-postgresql-12-operand-image: icr.io/cpopen/edb/postgresql:12.19@sha256:ed4da158d8551759d3f5994237b2c7f3ac7a1c8d01510e04d1a394a04279811a + ibm-postgresql-16-operand-image: icr.io/cpopen/edb/postgresql:16.4@sha256:40f729ded0e488271950daf010c55963e5745c97a5d674dead80e7d2c4d24aeb + ibm-postgresql-15-operand-image: icr.io/cpopen/edb/postgresql:15.8@sha256:63c1bfc431fba3eba7a2e803d5d24c48425dbe7d1e9b1dec9832b30717ce8753 + ibm-postgresql-14-operand-image: icr.io/cpopen/edb/postgresql:14.13@sha256:11317eb23ce45d74e35fd2471d96a32e4a28c29a0367734eb61f5a3d6aff2cff + ibm-postgresql-13-operand-image: icr.io/cpopen/edb/postgresql:13.16@sha256:ffb17e14727dbea67533decb12eed011a6138e191c947eda0c136443b823b867 + ibm-postgresql-12-operand-image: icr.io/cpopen/edb/postgresql:12.20@sha256:a4960e2d7350ab6beccd37e5e977ce3e3e06145216fc3c07f6df866fa9927b2f edb-postgres-license-provider-image: cp.icr.io/cp/cpd/edb-postgres-license-provider@sha256:6b5c69987f8967f5d0256a38e8759dad15480cf3c0eada9eb5fc71c51ed1cee9 `