Merge pull request oracle#422 in OKE/oci-cloud-controller-manager from NONE/oc5_oc7_ccm_flock_onboarding to internal

Shiva Bala Rakavi A · Shiva Bala Rakavi A · commit 6aafb2cd2f4b · 2022-11-21T15:34:56.000Z
* commit '522863799cb3767994b3b436e3324b9ecfe37651':
  updated for regional values
diff --git a/shepherd/limits/shared_modules/properties_values/oc7/ccm-image-version-mapping_oc7.json b/shepherd/limits/shared_modules/properties_values/oc7/ccm-image-version-mapping_oc7.json
diff --git a/shepherd/limits/shared_modules/properties_values/oc7/csi-bv-expansion-enabled_oc7.json b/shepherd/limits/shared_modules/properties_values/oc7/csi-bv-expansion-enabled_oc7.json
diff --git a/shepherd/limits/shared_modules/properties_values/oc7/csi-image-version-mapping_oc7.json b/shepherd/limits/shared_modules/properties_values/oc7/csi-image-version-mapping_oc7.json
diff --git a/shepherd/limits/shared_modules/properties_values/oc7/fss-csi-driver-enabled_oc7.json b/shepherd/limits/shared_modules/properties_values/oc7/fss-csi-driver-enabled_oc7.json
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/ccm-image-version-mapping-tiw.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/ccm-image-version-mapping-tiw.tpl
@@ -1,6 +1,7 @@
 {
   "realms" : [ "oc5" ],
   "name": "ccm-image-version-mapping",
+  "region":  "${region}",
   "values" : [ {
     "ad" : "all",
     "value" : "{\"default\": \"oke-19bdf56-1656@sha256:86465e66107436fdb6b1a8085ea09ce228ca28308203a26f0910389b6680b48c\", \"v1.21\": \"oke-1.19-2e70006-228@sha256:c88b320657c7156b059ba26b40048f54ef2009e0b76e1adb20641e39d18c57ad\",  \"v1.22\": \"oke-1.22-a1cf63e-108@sha256:2603d88a95fce6790386f18dc85d59bb5a7d2a48059ee9a3ff44f3b6e05a8886\", \"v1.23\": \"oke-1.23-a4df04a-35@sha256:daff962dd8f46a18f4fb82301e010e48642444b2f4cb50a47f8a9af23d26ab16\"}"
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/csi-bv-expansion-enabled-tiw.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/csi-bv-expansion-enabled-tiw.tpl
@@ -1,8 +1,8 @@
 {
   "realms" : [ "oc5" ],
   "name" : "csi-bv-expansion-enabled",
+  "region":  "${region}",
   "values" : [ {
-    "region" : "all",
     "ad" : "all",
     "value" : "true"
   } ]
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/csi-image-version-mapping-tiw.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/csi-image-version-mapping-tiw.tpl
@@ -3,6 +3,7 @@
     "oc5"
   ],
   "name": "csi-image-version-mapping",
+  "region":  "${region}",
   "values": [
     {
       "ad": "all",
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/fss-csi-driver-enabled-tiw.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc5/prd/tiw/fss-csi-driver-enabled-tiw.tpl
@@ -1,8 +1,8 @@
 {
   "realms" : [ "oc5" ],
   "name" : "fss-csi-driver-enabled",
+  "region":  "${region}",
   "values" : [ {
-    "region" : "all",
     "ad" : "all",
     "value" : "true"
   } ]
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/ccm-image-version-mapping-bwi.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/ccm-image-version-mapping-bwi.tpl
@@ -0,0 +1,9 @@
+{
+    "realms" : [ "oc7" ],
+    "name": "ccm-image-version-mapping",
+    "region":  "${region}",
+    "values" : [ {
+      "ad" : "all",
+      "value" : "{\"default\": \"oke-19bdf56-1656@sha256:86465e66107436fdb6b1a8085ea09ce228ca28308203a26f0910389b6680b48c\", \"v1.21\": \"oke-1.19-2e70006-228@sha256:c88b320657c7156b059ba26b40048f54ef2009e0b76e1adb20641e39d18c57ad\",  \"v1.22\": \"oke-1.22-a1cf63e-108@sha256:2603d88a95fce6790386f18dc85d59bb5a7d2a48059ee9a3ff44f3b6e05a8886\", \"v1.23\": \"oke-1.23-a4df04a-35@sha256:daff962dd8f46a18f4fb82301e010e48642444b2f4cb50a47f8a9af23d26ab16\"}"
+    } ]
+  }
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/csi-bv-expansion-enabled-bwi.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/csi-bv-expansion-enabled-bwi.tpl
@@ -0,0 +1,9 @@
+{
+    "realms" : [ "oc5" ],
+    "name" : "csi-bv-expansion-enabled",
+    "region":  "${region}",
+    "values" : [ {
+      "ad" : "all",
+      "value" : "true"
+    } ]
+  }
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/csi-image-version-mapping-bwi.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/csi-image-version-mapping-bwi.tpl
@@ -0,0 +1,11 @@
+{
+    "realms": ["oc7"],
+    "name": "csi-image-version-mapping",
+    "region":  "${region}",
+    "values": [
+      {
+        "ad": "all",
+        "value": "{\"default\": \"oke-19bdf56-1656@sha256:86465e66107436fdb6b1a8085ea09ce228ca28308203a26f0910389b6680b48c\", \"v1.21\": \"oke-1.19-2e70006-228@sha256:c88b320657c7156b059ba26b40048f54ef2009e0b76e1adb20641e39d18c57ad\",  \"v1.22\": \"oke-1.22-a1cf63e-108@sha256:2603d88a95fce6790386f18dc85d59bb5a7d2a48059ee9a3ff44f3b6e05a8886\", \"v1.23\": \"oke-1.23-a4df04a-35@sha256:daff962dd8f46a18f4fb82301e010e48642444b2f4cb50a47f8a9af23d26ab16\"}"
+      }
+    ]
+  }
diff --git a/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/fss-csi-driver-enabled-bwi.tpl b/shepherd/limits/shared_modules/properties_values/regional_values/oc7/prd/bwi/fss-csi-driver-enabled-bwi.tpl
@@ -0,0 +1,9 @@
+{
+    "realms" : [ "oc5" ],
+    "name" : "fss-csi-driver-enabled",
+    "region":  "${region}",
+    "values" : [ {
+      "ad" : "all",
+      "value" : "true"
+    } ]
+}
diff --git a/shepherd/limits/shared_modules/spectre/properties.tf b/shepherd/limits/shared_modules/spectre/properties.tf
@@ -10,7 +10,7 @@ locals {
   ## global/realm level before limits started blocking global updates. It is to main backward 
   ## compatibility so that TF/Shepherd does not try to delete them. Any new realm will not have these
   ## properties created at realm level
-  current_realms = ["oc1", "oc2", "oc3", "oc4", "oc5", "oc6", "oc7", "oc8", "oc9", "oc10"]
+  current_realms = ["oc1", "oc2", "oc3", "oc4", "oc6", "oc8", "oc9", "oc10"]
 
   property_defs = {
     "csi-image-version-mapping" = {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"realms" : [ "oc5" ],`
`3`	`3`	`"name": "ccm-image-version-mapping",`
	`4`	`+ "region": "${region}",`
`4`	`5`	`"values" : [ {`
`5`	`6`	`"ad" : "all",`
`6`	`7`	`"value" : "{\"default\": \"oke-19bdf56-1656@sha256:86465e66107436fdb6b1a8085ea09ce228ca28308203a26f0910389b6680b48c\", \"v1.21\": \"oke-1.19-2e70006-228@sha256:c88b320657c7156b059ba26b40048f54ef2009e0b76e1adb20641e39d18c57ad\", \"v1.22\": \"oke-1.22-a1cf63e-108@sha256:2603d88a95fce6790386f18dc85d59bb5a7d2a48059ee9a3ff44f3b6e05a8886\", \"v1.23\": \"oke-1.23-a4df04a-35@sha256:daff962dd8f46a18f4fb82301e010e48642444b2f4cb50a47f8a9af23d26ab16\"}"`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"oc5"`
`4`	`4`	`],`
`5`	`5`	`"name": "csi-image-version-mapping",`
	`6`	`+ "region": "${region}",`
`6`	`7`	`"values": [`
`7`	`8`	`{`
`8`	`9`	`"ad": "all",`