Skip to content

Commit 6bd5de1

Browse files
wchomikwchomik
committed
feat: Testing support for multiple values files
1 parent c34e818 commit 6bd5de1

File tree

2 files changed

+165
-8
lines changed

2 files changed

+165
-8
lines changed

‎helm/umbrella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.dev.yaml‎

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ external-secrets-config:
1212
namespace: "default"
1313
provider:
1414
vault:
15-
server: "https://test.example/"
15+
server: "https://vault.example/"
1616
namespace: "openmcp/blueprints"
1717
path: "mcps"
1818
version: "v2"
@@ -21,6 +21,84 @@ external-secrets-config:
2121
mountPath: "k8s-openmcp-blueprints"
2222
role: "k8s-openmcp-role"
2323
secretRef:
24-
name: "test-tokenreview-service-account"
24+
name: "vault-tokenreview-service-account"
2525
namespace: "default"
26-
key: "token"
26+
key: "token"
27+
externalSecret:
28+
- name: "btp-account-mcp-blueprints"
29+
namespace: "default"
30+
refreshInterval: "15m"
31+
targetSecretName: "btp-account-credentials"
32+
secretStore:
33+
name: "hashicorp-vault"
34+
data:
35+
- secretKey: btp-cis-provider-credentials
36+
remoteRef:
37+
key: "btp-endpoint.example/btp-account"
38+
property: btp-cis-provider-credentials
39+
- secretKey: btp-service-account-provider-credentials
40+
remoteRef:
41+
key: "btp-endpoint.example/btp-account"
42+
property: btp-service-account-provider-credentials
43+
######################################################################################################################################
44+
crossplane-provider-configs:
45+
providerConfigs:
46+
btpSapCrossplane:
47+
- providerConfigRefName: "btp-account-provider-config"
48+
globalAccountSubDomain: "exmpl"
49+
cliServerUrl: "https://cli.btp.cloud.sap"
50+
cisCredentials:
51+
source: "Secret"
52+
secretRef:
53+
namespace: default
54+
name: "btp-account-mcp-blueprints"
55+
key: btp-cis-provider-credentials
56+
serviceAccountSecret:
57+
source: "Secret"
58+
secretRef:
59+
namespace: default
60+
name: "btp-account-mcp-blueprints"
61+
key: btp-service-account-provider-credentials
62+
#########################################################################################################
63+
crossplane-provider-sap-btp-account:
64+
cfAdminEmails: &cfAdminEmails []
65+
subaccountAdminEmails: &subaccountAdminEmails []
66+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
67+
btpEntitlements: &btpEntitlements
68+
- name: "cis-local"
69+
serviceName: cis
70+
servicePlanName: local
71+
permitNumericQuota: false
72+
amount: 1
73+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
74+
accounts:
75+
- btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
76+
#-------------------------------------------------------------------------------------------------------------------------#
77+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
78+
subAccounts:
79+
#-------------------------------------------------------------------------------------------------------------------------#
80+
- name: "subAccount1"
81+
forProvider:
82+
displayName: "exmpl dev eu01"
83+
description: "Open Orchestrator Managed Control Plane Blueprint PoC"
84+
subdomain: "exmpl-dev-eu01"
85+
region: "eu01"
86+
subaccountAdminEmails: *subaccountAdminEmails
87+
entitlements: *btpEntitlements
88+
services:
89+
serviceManager: true
90+
cloudManagement: true
91+
#-------------------------------------------------------------------------------------------------------------------------#
92+
#########################################################################################################
93+
crossplane-provider-sap-btp-environment:
94+
cloudFoundryEnvironments:
95+
- btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
96+
name: "test"
97+
forProvider:
98+
initialOrgManagers: *cfAdminEmails
99+
landscape: "eu01"
100+
cloudManagementRef:
101+
name: "dev-eu01"
102+
subaccountRef:
103+
name: "dev-eu01"
104+
#########################################################################################################

‎helm/umbrella/blueprints/btp-cf-env-runtime.abc.shoot.live.k8s-hana.ondemand.com/values.network.yaml‎

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,93 @@ external-secrets-config:
1212
namespace: "default"
1313
provider:
1414
vault:
15+
server: "https://vault.example/"
16+
namespace: "openmcp/blueprints"
17+
path: "mcps"
18+
version: "v2"
1519
auth:
1620
kubernetes:
21+
mountPath: "k8s-openmcp-blueprints"
22+
role: "k8s-openmcp-role"
1723
secretRef:
18-
name: "ASDA-tokenreview-service-account"
24+
name: "vault-tokenreview-service-account"
25+
namespace: "default"
26+
key: "token"
1927
externalSecret:
20-
- name: "ASDA-btp-account-mcp-blueprints"
21-
namespace: "ASDA-default"
22-
refreshInterval: "30m"
23-
targetSecretName: "ASDA-btp-account-credentials"
28+
- name: "btp-account-mcp-blueprints"
29+
namespace: "default"
30+
refreshInterval: "15m"
31+
targetSecretName: "btp-account-credentials"
2432
secretStore:
2533
name: "hashicorp-vault"
34+
data:
35+
- secretKey: btp-cis-provider-credentials
36+
remoteRef:
37+
key: "btp-endpoint.example/btp-account"
38+
property: btp-cis-provider-credentials
39+
- secretKey: btp-service-account-provider-credentials
40+
remoteRef:
41+
key: "btp-endpoint.example/btp-account"
42+
property: btp-service-account-provider-credentials
43+
######################################################################################################################################
44+
crossplane-provider-configs:
45+
providerConfigs:
46+
btpSapCrossplane:
47+
- providerConfigRefName: "btp-account-provider-config"
48+
globalAccountSubDomain: "exmpl"
49+
cliServerUrl: "https://cli.btp.cloud.sap"
50+
cisCredentials:
51+
source: "Secret"
52+
secretRef:
53+
namespace: default
54+
name: "btp-account-mcp-blueprints"
55+
key: btp-cis-provider-credentials
56+
serviceAccountSecret:
57+
source: "Secret"
58+
secretRef:
59+
namespace: default
60+
name: "btp-account-mcp-blueprints"
61+
key: btp-service-account-provider-credentials
62+
#########################################################################################################
63+
crossplane-provider-sap-btp-account:
64+
cfAdminEmails: &cfAdminEmails []
65+
subaccountAdminEmails: &subaccountAdminEmails []
66+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
67+
btpEntitlements: &btpEntitlements
68+
- name: "cis-local"
69+
serviceName: cis
70+
servicePlanName: local
71+
permitNumericQuota: false
72+
amount: 1
73+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
74+
accounts:
75+
- btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
76+
#-------------------------------------------------------------------------------------------------------------------------#
77+
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
78+
subAccounts:
79+
#-------------------------------------------------------------------------------------------------------------------------#
80+
- name: "subAccount1"
81+
forProvider:
82+
displayName: "exmpl dev eu01"
83+
description: "Open Orchestrator Managed Control Plane Blueprint PoC"
84+
subdomain: "exmpl-dev-eu01"
85+
region: "eu01"
86+
subaccountAdminEmails: *subaccountAdminEmails
87+
entitlements: *btpEntitlements
88+
services:
89+
serviceManager: true
90+
cloudManagement: true
91+
#-------------------------------------------------------------------------------------------------------------------------#
92+
#########################################################################################################
93+
crossplane-provider-sap-btp-environment:
94+
cloudFoundryEnvironments:
95+
- btpSapCrossplaneProviderConfigRefName: "btp-account-provider-config"
96+
name: "test"
97+
forProvider:
98+
initialOrgManagers: *cfAdminEmails
99+
landscape: "eu01"
100+
cloudManagementRef:
101+
name: "dev-eu01"
102+
subaccountRef:
103+
name: "dev-eu01"
104+
#########################################################################################################

0 commit comments

Comments
 (0)