Updating Rule Config to Comply with the Docs

kyma-project · Feb 5, 2025 · 6e87240 · 6e87240
1 parent 2908f2d
commit 6e87240
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/resources/keb/templates/app-config.yaml b/resources/keb/templates/app-config.yaml
@@ -27,3 +27,5 @@ data:
 {{- with .Values.freemiumWhitelistedGlobalAccountIds }}
 {{ tpl . $ | indent 4 }}
 {{- end }}
+  hapRule.yaml: |-
+{{ toYaml .Values.hap.rule | indent 4  }}
diff --git a/resources/keb/values.yaml b/resources/keb/values.yaml
@@ -242,11 +242,21 @@ sapConvergedCloudPlanRegionMappings: |-
 disableSapConvergedCloud: false
 disableProcessOperationsInProgress: "false"
 enablePlans: "azure,gcp,azure_lite,trial"
-hap: 
-  platformRegionRule: "gcp:cf-sa30"
-  clusterRegionRule: "sap-converged-cloud"
-  sharedRule: "trial;sap-converged-cloud"
-  euAccessRule: "azure:cf-ch20;aws:cf-eu11"
+hap:
+ rule: 
+  - aws                             # pool: hyperscalerType: aws
+  - aws(PR=cf-eu11) -> EU           # pool: hyperscalerType: aws_cf-eu11; euAccess: true 
+  - azure                           # pool: hyperscalerType: azure
+  - azure(PR=cf-ch20) -> EU         # pool: hyperscalerType: azure_cf-ch20; euAccess: true 
+  - gcp                             # pool: hyperscalerType: gcp
+  - gcp(PR=cf-sa30)                 # pool: hyperscalerType: gcp_cf-sa30
+  - trial -> S                      # pool: hyperscalerType: azure; shared: true - TRIAL POOL
+                                    # pool: hyperscalerType: aws; shared: true - TRIAL POOL 
+  - sap-converged-cloud(HR=*) -> S  # pool: hyperscalerType: openstack_<HYPERSCALER_REGION>; shared: true
+  - azure_lite                      # pool: hyperscalerType: azure
+  - preview                         # pool: hyperscalerType: aws
+  - free                            # pool: hyperscalerType: aws
+                                    # pool: hyperscalerType: azure
 onlySingleTrialPerGA: "true"
 enableKubeconfigURLLabel: "false"
 includeAdditionalParamsInSchema: "false"