Merge pull request noobaa#1483 from achouhan09/region-fix

Bug-fix for fetching region from AWS cluster obj in GetAWSRegion() Signed-off-by: Vinayak Hariharmath <[email protected]>
vh05 · Dec 11, 2024 · 0b2701b · 0b2701b
2 parents 88aef43 + 00c3d88
commit 0b2701b
Show file tree

Hide file tree

Showing 7 changed files with 345 additions and 33 deletions.
diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml
@@ -183,3 +183,11 @@ rules:
       - delete
       - update
       - create
+  - apiGroups:
+      - config.openshift.io
+    resources:
+      - infrastructures
+    verbs:
+      - get
+      - list
+      - watch
diff --git a/deploy/crds/noobaa.io_noobaas.yaml b/deploy/crds/noobaa.io_noobaas.yaml
@@ -1911,6 +1911,10 @@ spec:
                 description: Phase is a simple, high-level summary of where the System
                   is in its lifecycle
                 type: string
+              postgresMajorVersion:
+                description: PostgresMajorVersion is the major version of postgress
+                  db image
+                type: string
               postgresUpdatePhase:
                 description: Upgrade reports the status of the ongoing postgres upgrade
                   process

diff --git a/pkg/apis/noobaa/v1alpha1/noobaa_types.go b/pkg/apis/noobaa/v1alpha1/noobaa_types.go
@@ -385,6 +385,10 @@ type NooBaaStatus struct {
 	// BeforeUpgradeDbImage is the db image used before last db upgrade
 	// +optional
 	BeforeUpgradeDbImage *string `json:"beforeUpgradeDbImage,omitempty"`
+
+	// PostgresMajorVersion is the major version of postgress db image
+	// +optional
+	PostgresMajorVersion PostgresMajorVersion `json:"postgresMajorVersion,omitempty"`
 }
 
 // SystemPhase is a string enum type for system phases
@@ -514,6 +518,12 @@ type EndpointsStatus struct {
 	VirtualHosts []string `json:"virtualHosts"`
 }
 
+type PostgresMajorVersion string
+
+const (
+	PostgresMajorVersionV16 PostgresMajorVersion = "16"
+)
+
 // UpgradePhase is a string enum type for upgrade phases
 type UpgradePhase string
 
@@ -525,7 +535,7 @@ const (
 
 	UpgradePhaseMigrate UpgradePhase = "Migrating"
 
-	UpgradePhaseClean UpgradePhase = "Cleanning"
+	UpgradePhaseClean UpgradePhase = "Cleaning"
 
 	UpgradePhaseFinished UpgradePhase = "DoneUpgrade"
 

diff --git a/pkg/bundle/deploy.go b/pkg/bundle/deploy.go
@@ -2,7 +2,7 @@ package bundle
 
 const Version = "5.18.0"
 
-const Sha256_deploy_cluster_role_yaml = "3f8118853db73926c4f9d14be84ac8f81833c3a7a94a52ecf1e9ebcf712eee93"
+const Sha256_deploy_cluster_role_yaml = "31fc622ff7fa66617be3895bddcb6cfdb97883b75b20bdb2bf04052bd14221a8"
 
 const File_deploy_cluster_role_yaml = `apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -189,6 +189,14 @@ rules:
       - delete
       - update
       - create
+  - apiGroups:
+      - config.openshift.io
+    resources:
+      - infrastructures
+    verbs:
+      - get
+      - list
+      - watch
 `
 
 const Sha256_deploy_cluster_role_binding_yaml = "15c78355aefdceaf577bd96b4ae949ae424a3febdc8853be0917cf89a63941fc"
@@ -1415,7 +1423,7 @@ spec:
       status: {}
 `
 
-const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "e862d263d097ed43f774784eaaf9a616967746b67608fadbe4ca71d93b220ab6"
+const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "5bfeed22b7201dfc6d56cda47e573dc0f5cac7350806b142c76509ad73b070b0"
 
 const File_deploy_crds_noobaa_io_noobaas_yaml = `---
 apiVersion: apiextensions.k8s.io/v1
@@ -3330,6 +3338,10 @@ spec:
                 description: Phase is a simple, high-level summary of where the System
                   is in its lifecycle
                 type: string
+              postgresMajorVersion:
+                description: PostgresMajorVersion is the major version of postgress
+                  db image
+                type: string
               postgresUpdatePhase:
                 description: Upgrade reports the status of the ongoing postgres upgrade
                   process

diff --git a/pkg/options/options.go b/pkg/options/options.go
@@ -4,6 +4,7 @@ import (
 	"github.com/noobaa/noobaa-operator/v5/pkg/util"
 	"github.com/noobaa/noobaa-operator/v5/version"
 
+	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
@@ -72,7 +73,11 @@ var NooBaaImage = ContainerImage
 
 // DBImage is the default db image url
 // it can be overridden for testing or different registry locations.
-var DBImage = "quay.io/sclorg/postgresql-15-c9s"
+var DBImage = "quay.io/sclorg/postgresql-16-c9s"
+
+// Postgress Major version is the major version of Postgress image
+// This is referred for postgres upgrade.
+var PostgresMajorVersion = nbv1.PostgresMajorVersionV16
 
 // Psql12Image is the default postgres12 db image url
 // currently it can not be overridden.