openmcp-project · wchomik · May 22, 2025 · May 22, 2025 · May 22, 2025 · May 22, 2025
diff --git a/.github/workflows/git-pr-status-checks.yml b/.github/workflows/git-pr-status-checks.yml
@@ -22,4 +22,4 @@ permissions:
 
 jobs:
   pr-status-check:
-    uses: "openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@main"
+    uses: "openmcp-project/blueprint-workflows/.github/workflows/git-pr-status-checks.yml@feat/multi-values"
diff --git a/...brella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/.ci.config.yaml b/...brella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/.ci.config.yaml
@@ -0,0 +1,24 @@
+# pipeline feature flags obsolete (Bash Scripts)
+jfrog.sh:
+  enabled: true
+
+# pipeline feature flags
+helm-docs:
+  enable: true
+helm-chart-linting:
+  enable: true
+helm-chart-validation:
+  enable: true
+helm-chart-version-bump:
+  enable: true
+helm-chart-dependency-update:
+  enable: true
+k8s-manifest-templating:
+  enable: true
+  helm-charts: 
+    default-manifest-templating: true # disables stanard helm mainfest templating
+    additional-manifest-templating: # define this if you want additional helm manifest folder e.g. dev....
+    - prefix-manifest-folder-name: "dev"
+      value-files:
+        - "values.network.yaml"
+        - "values.dev.yaml"
diff --git a/helm/umbrella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/Chart.yaml b/helm/umbrella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/Chart.yaml
@@ -17,7 +17,7 @@ icon: "https://avatars.githubusercontent.com/u/2531208?s=200&v=4"
 # This is the chart version. This version number should be incremented each time
 # you make changes to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.25
+version: 0.0.26
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
 # Versions are not expected to follow Semantic Versioning. They should reflect

diff --git a/...la/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/README.md b/...la/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/README.md
@@ -2,7 +2,7 @@
 
 # btp-cf-env-runtime
 
-![Version: 0.0.25](https://img.shields.io/badge/Version-0.0.25-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+![Version: 0.0.26](https://img.shields.io/badge/Version-0.0.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
 
 A Umbrealla Helm chart which demonstrate orchestration of SAP BTP Cloud Foundry Environment.
 

diff --git a/...brella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.dev.yaml b/...brella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.dev.yaml
@@ -0,0 +1,104 @@
+---
+######################################################################################################################################
+tags: # see ./Chart.yaml @url: https://helm.sh/docs/topics/charts/#tags-and-condition-fields-in-dependencies
+  external-secrets-config: true
+  crossplane-provider-configs: true
+  crossplane-provider-sap-btp-account: true
+  crossplane-provider-sap-btp-environment: true
+######################################################################################################################################
+external-secrets-config:
+  secretStores:
+  - name: "hashicorp-vault"
+    namespace: "default"
+    provider:
+      vault:
+        server: "https://vault.example/"
+        namespace: "openmcp/blueprints"
+        path: "mcps"
+        version: "v2"
+        auth:
+          kubernetes:
+            mountPath: "k8s-openmcp-blueprints"
+            role: "k8s-openmcp-role"
+            secretRef:
+              name: "vault-tokenreview-service-account"
+              namespace: "default"
+              key: "token"
+  externalSecret:
+    - name: "btp-account-mcp-blueprints"
+      namespace: "default"
+      refreshInterval: "15m"
+      targetSecretName: "btp-account-credentials"
+      secretStore:
+        name: "hashicorp-vault"
+      data:
+        - secretKey: btp-cis-provider-credentials
+          remoteRef:
+            key: "btp-endpoint.example/btp-account"
+            property: btp-cis-provider-credentials
+        - secretKey: btp-service-account-provider-credentials
+          remoteRef:
+            key: "btp-endpoint.example/btp-account"
+            property: btp-service-account-provider-credentials
+######################################################################################################################################
+crossplane-provider-configs:
+  providerConfigs:
+    btpSapCrossplane:
+      - providerConfigRefName: "btp-account-provider-config"
+        globalAccountSubDomain: "exmpl"
+        cliServerUrl: "https://cli.btp.cloud.sap"
+        cisCredentials:
+          source: "Secret"
+          secretRef:
+            namespace: default
+            name: "btp-account-mcp-blueprints"
+            key: btp-cis-provider-credentials
+        serviceAccountSecret:
+          source: "Secret"
+          secretRef:
+            namespace: default
+            name: "btp-account-mcp-blueprints"
+            key: btp-service-account-provider-credentials
+#########################################################################################################
+crossplane-provider-sap-btp-account:
+  cfAdminEmails: &cfAdminEmails []
+  subaccountAdminEmails: &subaccountAdminEmails []
+  #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#        
+  btpEntitlements: &btpEntitlements    
+  - name: "cis-local"
+    serviceName: cis
+    servicePlanName: local
+    permitNumericQuota: false
+    amount: 1
+  #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#        
+  accounts:
+    - btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
+      #-------------------------------------------------------------------------------------------------------------------------#
+      #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
+      subAccounts:
+        #-------------------------------------------------------------------------------------------------------------------------#
+        - name: "subAccount1"
+          forProvider:
+            displayName: "exmpl dev eu01"
+            description: "Open Orchestrator Managed Control Plane Blueprint PoC"
+            subdomain: "exmpl-dev-eu01"
+            region: "eu01"
+            subaccountAdminEmails: *subaccountAdminEmails
+          entitlements: *btpEntitlements
+          services:
+            serviceManager: true
+            cloudManagement: true
+        #-------------------------------------------------------------------------------------------------------------------------#                                     
+#########################################################################################################
+crossplane-provider-sap-btp-environment:
+  cloudFoundryEnvironments:
+  - btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
+    name: "test"
+    forProvider:
+      initialOrgManagers: *cfAdminEmails
+      landscape: "eu01"
+    cloudManagementRef:
+      name: "dev-eu01"
+    subaccountRef:
+      name: "dev-eu01"
+#########################################################################################################
diff --git a/...la/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.network.yaml b/...la/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.network.yaml
@@ -0,0 +1,104 @@
+---
+######################################################################################################################################
+tags: # see ./Chart.yaml @url: https://helm.sh/docs/topics/charts/#tags-and-condition-fields-in-dependencies
+  external-secrets-config: true
+  crossplane-provider-configs: true
+  crossplane-provider-sap-btp-account: true
+  crossplane-provider-sap-btp-environment: true
+######################################################################################################################################
+external-secrets-config:
+  secretStores:
+  - name: "hashicorp-vault"
+    namespace: "default"
+    provider:
+      vault:
+        server: "https://vault.example/"
+        namespace: "openmcp/blueprints"
+        path: "mcps"
+        version: "v2"
+        auth:
+          kubernetes:
+            mountPath: "k8s-openmcp-blueprints"
+            role: "k8s-openmcp-role"
+            secretRef:
+              name: "vault-tokenreview-service-account"
+              namespace: "default"
+              key: "token"
+  externalSecret:
+    - name: "btp-account-mcp-blueprints"
+      namespace: "default"
+      refreshInterval: "15m"
+      targetSecretName: "btp-account-credentials"
+      secretStore:
+        name: "hashicorp-vault"
+      data:
+        - secretKey: btp-cis-provider-credentials
+          remoteRef:
+            key: "btp-endpoint.example/btp-account"
+            property: btp-cis-provider-credentials
+        - secretKey: btp-service-account-provider-credentials
+          remoteRef:
+            key: "btp-endpoint.example/btp-account"
+            property: btp-service-account-provider-credentials
+######################################################################################################################################
+crossplane-provider-configs:
+  providerConfigs:
+    btpSapCrossplane:
+      - providerConfigRefName: "btp-account-provider-config"
+        globalAccountSubDomain: "exmpl"
+        cliServerUrl: "https://cli.btp.cloud.sap"
+        cisCredentials:
+          source: "Secret"
+          secretRef:
+            namespace: default
+            name: "btp-account-mcp-blueprints"
+            key: btp-cis-provider-credentials
+        serviceAccountSecret:
+          source: "Secret"
+          secretRef:
+            namespace: default
+            name: "btp-account-mcp-blueprints"
+            key: btp-service-account-provider-credentials
+#########################################################################################################
+crossplane-provider-sap-btp-account:
+  cfAdminEmails: &cfAdminEmails []
+  subaccountAdminEmails: &subaccountAdminEmails []
+  #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#        
+  btpEntitlements: &btpEntitlements    
+  - name: "cis-local"
+    serviceName: cis
+    servicePlanName: local
+    permitNumericQuota: false
+    amount: 1
+  #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#        
+  accounts:
+    - btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
+      #-------------------------------------------------------------------------------------------------------------------------#
+      #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
+      subAccounts:
+        #-------------------------------------------------------------------------------------------------------------------------#
+        - name: "subAccount1"
+          forProvider:
+            displayName: "exmpl dev eu01"
+            description: "Open Orchestrator Managed Control Plane Blueprint PoC"
+            subdomain: "exmpl-dev-eu01"
+            region: "eu01"
+            subaccountAdminEmails: *subaccountAdminEmails
+          entitlements: *btpEntitlements
+          services:
+            serviceManager: true
+            cloudManagement: true
+        #-------------------------------------------------------------------------------------------------------------------------#                                     
+#########################################################################################################
+crossplane-provider-sap-btp-environment:
+  cloudFoundryEnvironments:
+  - btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
+    name: "test"
+    forProvider:
+      initialOrgManagers: *cfAdminEmails
+      landscape: "eu01"
+    cloudManagementRef:
+      name: "dev-eu01"
+    subaccountRef:
+      name: "dev-eu01"
+#########################################################################################################
diff --git a/...roviderConfigs/btp.sap.crossplane.io.yaml → ...roviderConfigs/btp.sap.crossplane.io.yaml b/...roviderConfigs/btp.sap.crossplane.io.yaml → ...roviderConfigs/btp.sap.crossplane.io.yaml
@@ -1,15 +1,15 @@
 ---
-# Source: provider-btp-accounts/charts/crossplane-provider-configs/templates/mcp/providerConfigs/btp.sap.crossplane.io.yaml
+# Source: btp-cf-env-runtime/charts/crossplane-provider-configs/templates/mcp/providerConfigs/btp.sap.crossplane.io.yaml
 apiVersion: btp.sap.crossplane.io/v1alpha1
 kind: ProviderConfig
 metadata:
-  name: "provider-config-ref-name-btp-account-mcp-blueprints"
+  name: "btp-account-provider-config"
   labels:
     openmcp.cloud/blueprint-building-block: "crossplane-provider-configs"
     openmcp.cloud/blueprint-building-block-version: "0.0.18"
 spec:
   cliServerUrl: "https://cli.btp.cloud.sap"
-  globalAccount: "globalaccountsubdomain"
+  globalAccount: "exmpl"
   cisCredentials:
     secretRef:
       key: btp-cis-provider-credentials

diff --git a/...plates/mcp/btp-accounts/sub-accounts.yaml → ...plates/mcp/btp-accounts/sub-accounts.yaml b/...plates/mcp/btp-accounts/sub-accounts.yaml → ...plates/mcp/btp-accounts/sub-accounts.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: landscape-definition/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-accounts/sub-accounts.yaml
+# Source: btp-cf-env-runtime/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-accounts/sub-accounts.yaml
 apiVersion: account.btp.sap.crossplane.io/v1alpha1
 kind: Subaccount
 metadata:
@@ -9,10 +9,10 @@ metadata:
     openmcp.cloud/blueprint-building-block-version: "0.0.9"
 spec:
   forProvider:
-    description: Sub Account managed by Open MCP & IaD
-    displayName: Open Managed Control Plane Blueprint Sub-Account
+    description: Open Orchestrator Managed Control Plane Blueprint PoC
+    displayName: exmpl dev eu01
     region: eu01
     subaccountAdminEmails: []
-    subdomain: dev-eu01
+    subdomain: exmpl-dev-eu01
   providerConfigRef:
-    name: "provider-config-ref-name-btp-account-mcp-blueprints"
+    name: "btp-account-provider-config"
diff --git a/...p/btp-subscriptions/cloud-management.yaml → ...p/btp-subscriptions/cloud-management.yaml b/...p/btp-subscriptions/cloud-management.yaml → ...p/btp-subscriptions/cloud-management.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: migration-test-provider-btp-accounts/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/cloud-management.yaml
+# Source: btp-cf-env-runtime/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/cloud-management.yaml
 apiVersion: account.btp.sap.crossplane.io/v1alpha1
 kind: CloudManagement
 metadata:

diff --git a/...s/mcp/btp-subscriptions/entitlements.yaml → ...s/mcp/btp-subscriptions/entitlements.yaml b/...s/mcp/btp-subscriptions/entitlements.yaml → ...s/mcp/btp-subscriptions/entitlements.yaml
@@ -1,18 +1,18 @@
 ---
-# Source: landscape-definition/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/entitlements.yaml
+# Source: btp-cf-env-runtime/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/entitlements.yaml
 apiVersion: account.btp.sap.crossplane.io/v1alpha1
 kind: Entitlement
 metadata:  
-  name: auditlog-oauth2  
+  name: cis-local  
   labels:
     openmcp.cloud/blueprint-building-block: "crossplane-provider-sap-btp-account"
     openmcp.cloud/blueprint-building-block-version: "0.0.9"
 spec:
   forProvider:    
-    serviceName: auditlog-management
-    servicePlanName: default
-    amount: 1
+    serviceName: cis
+    servicePlanName: local
+    enable: true
     subaccountRef:
       name: subaccount1
   providerConfigRef:
-    name: "provider-config-ref-name-btp-account-mcp-blueprints"
+    name: "btp-account-provider-config"
diff --git a/...mcp/btp-subscriptions/servicemanager.yaml → ...mcp/btp-subscriptions/servicemanager.yaml b/...mcp/btp-subscriptions/servicemanager.yaml → ...mcp/btp-subscriptions/servicemanager.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: migration-test-provider-btp-accounts/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/servicemanager.yaml
+# Source: btp-cf-env-runtime/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/servicemanager.yaml
 apiVersion: account.btp.sap.crossplane.io/v1beta1
 kind: ServiceManager
 metadata:

diff --git a/...e/charts/crossplane-provider-sap-btp-environment/templates/cloud-foundry-environment.yaml b/...e/charts/crossplane-provider-sap-btp-environment/templates/cloud-foundry-environment.yaml
@@ -0,0 +1,19 @@
+---
+# Source: btp-cf-env-runtime/charts/crossplane-provider-sap-btp-environment/templates/cloud-foundry-environment.yaml
+apiVersion: environment.btp.sap.crossplane.io/v1alpha1
+kind: CloudFoundryEnvironment
+metadata:
+  name: btp-account-provider-config-test
+  labels:
+    openmcp.cloud/blueprint-building-block: "crossplane-provider-sap-btp-environment"
+    openmcp.cloud/blueprint-building-block-version: "0.0.15"
+spec:
+  providerConfigRef:
+    name: btp-account-provider-config
+  forProvider:
+    initialOrgManagers: []
+    landscape: eu01
+  cloudManagementRef:
+    name: dev-eu01    
+  subaccountRef:
+    name: dev-eu01
diff --git a/...ets-config/templates/external-secret.yaml → ...ets-config/templates/external-secret.yaml b/...ets-config/templates/external-secret.yaml → ...ets-config/templates/external-secret.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: provider-btp-accounts/charts/external-secrets-config/templates/external-secret.yaml
+# Source: btp-cf-env-runtime/charts/external-secrets-config/templates/external-secret.yaml
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
@@ -14,7 +14,7 @@ spec:
     name: "hashicorp-vault"    
     kind: "SecretStore"
   target:
-    name: "btp-account-mcp-blueprints"
+    name: "btp-account-credentials"
   data:
     - remoteRef:
         key: btp-endpoint.example/btp-account