Skip to content

Commit 9d35c95

Browse files
committed
Merge branch 'chore/os_preparations' into test_workflows
2 parents 862e05b + 39dd825 commit 9d35c95

File tree

11 files changed

+24
-24
lines changed
  • helm/umbrella/blueprints
    • btp-service-operator.abc.shoot.live.k8s-hana.ondemand.com
    • example-nested.zzz.shoot.live.k8s-hana.ondemand.com/landscape-provider-cfgs-credentials
    • include-custom-helm-charts.abc.shoot.live.k8s-hana.ondemand.com
    • ocm-package-provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com
    • provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com
    • provider-gardener-existing.abc.shoot.live.k8s-hana.ondemand.com
    • provider-gardener.abc.shoot.live.k8s-hana.ondemand.com
  • manifests/helm/umbrella/blueprints
    • ocm-package-provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/ocm-package-provider-btp-accounts/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-accounts
    • provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/provider-btp-accounts/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-accounts

11 files changed

+24
-24
lines changed

helm/umbrella/blueprints/btp-service-operator.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ external-secrets-config:
3434
data:
3535
- secretKey: btp-cis-provider-credentials
3636
remoteRef:
37-
key: ""
37+
key: "btp-endpoint.example/btp-account"
3838
property: btp-cis-provider-credentials
3939
- secretKey: btp-service-account-provider-credentials
4040
remoteRef:
41-
key: ""
41+
key: "btp-endpoint.example/btp-account"
4242
property: btp-service-account-provider-credentials
4343
######################################################################################################################################
4444
crossplane-provider-configs:

helm/umbrella/blueprints/example-nested.zzz.shoot.live.k8s-hana.ondemand.com/landscape-provider-cfgs-credentials/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ external-secrets-config:
2020
mountPath: "kubernetes"
2121
role: "mcp-blueprints"
2222
secretRef:
23-
name: ""
23+
name: "vault-token-sa"
2424
namespace: "default"
2525
key: "token"
2626
externalSecret:
@@ -33,11 +33,11 @@ external-secrets-config:
3333
data:
3434
- secretKey: btp-cis-provider-credentials
3535
remoteRef:
36-
key: ""
36+
key: "btp-endpoint.example/btp-account"
3737
property: btp-cis-provider-credentials
3838
- secretKey: btp-service-account-provider-credentials
3939
remoteRef:
40-
key: ""
40+
key: "btp-endpoint.example/btp-account"
4141
property: btp-service-account-provider-credentials
4242
######################################################################################################################################
4343
crossplane-provider-configs:

helm/umbrella/blueprints/include-custom-helm-charts.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ external-secrets-config:
2121
mountPath: "kubernetes"
2222
role: "mcp-blueprints"
2323
secretRef:
24-
name: ""
24+
name: "vault-token-sa"
2525
namespace: "default"
2626
key: "token"
2727
externalSecret:
@@ -34,11 +34,11 @@ external-secrets-config:
3434
data:
3535
- secretKey: btp-cis-provider-credentials
3636
remoteRef:
37-
key: ""
37+
key: "btp-endpoint.example/btp-account"
3838
property: btp-cis-provider-credentials
3939
- secretKey: btp-service-account-provider-credentials
4040
remoteRef:
41-
key: ""
41+
key: "btp-endpoint.example/btp-account"
4242
property: btp-service-account-provider-credentials
4343
######################################################################################################################################
4444
crossplane-provider-configs:

helm/umbrella/blueprints/ocm-package-provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ This template umbrella Helm Chart demonstrates the orchestration of BTP resource
5858
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].permitNumericQuota | bool | `true` | |
5959
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].serviceName | string | `"auditlog-management"` | |
6060
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].servicePlanName | string | `"default"` | |
61-
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.description | string | `"Sub Account managed by CO MCP & IaD"` | |
61+
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.description | string | `"Sub Account managed by OpenMCP & IaD"` | |
6262
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.displayName | string | `"CO Managed Control Plane Blueprint Sub-Account"` | |
6363
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.region | string | `""` | |
6464
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.subaccountAdminEmails | list | `[]` | |

helm/umbrella/blueprints/ocm-package-provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ external-secrets-config:
2222
mountPath: "kubernetes"
2323
role: "mcp-blueprints"
2424
secretRef:
25-
name: ""
25+
name: "vault-token-sa"
2626
namespace: "default"
2727
key: "token"
2828
externalSecret:
@@ -35,11 +35,11 @@ external-secrets-config:
3535
data:
3636
- secretKey: btp-cis-provider-credentials
3737
remoteRef:
38-
key: ""
38+
key: "btp-endpoint.example/btp-account"
3939
property: btp-cis-provider-credentials
4040
- secretKey: btp-service-account-provider-credentials
4141
remoteRef:
42-
key: ""
42+
key: "btp-endpoint.example/btp-account"
4343
property: btp-service-account-provider-credentials
4444
######################################################################################################################################
4545
crossplane-provider-pkgs:
@@ -113,7 +113,7 @@ crossplane-provider-sap-btp-account:
113113
- name: "subAccount1"
114114
forProvider:
115115
displayName: "CO Managed Control Plane Blueprint Sub-Account"
116-
description: "Sub Account managed by CO MCP & IaD"
116+
description: "Sub Account managed by OpenMCP & IaD"
117117
subdomain: mcp-blueprint-test-1
118118
region: ""
119119
subaccountAdminEmails: *subaccountAdminEmails

helm/umbrella/blueprints/provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This template umbrella Helm Chart demonstrates the orchestration of BTP resource
3737
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].permitNumericQuota | bool | `true` | |
3838
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].serviceName | string | `"auditlog-management"` | |
3939
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].entitlements[0].servicePlanName | string | `"default"` | |
40-
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.description | string | `"Sub Account managed by CO MCP & IaD"` | |
40+
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.description | string | `"Sub Account managed by OpenMCP & IaD"` | |
4141
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.displayName | string | `"CO Managed Control Plane Blueprint Sub-Account"` | |
4242
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.region | string | `""` | |
4343
| crossplane-provider-sap-btp-account.accounts[0].subAccounts[0].forProvider.subaccountAdminEmails | list | `[]` | |

helm/umbrella/blueprints/provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ external-secrets-config:
2121
mountPath: "kubernetes"
2222
role: "mcp-blueprints"
2323
secretRef:
24-
name: ""
24+
name: "vault-token-sa"
2525
namespace: "default"
2626
key: "token"
2727
externalSecret:
@@ -34,11 +34,11 @@ external-secrets-config:
3434
data:
3535
- secretKey: btp-cis-provider-credentials
3636
remoteRef:
37-
key: ""
37+
key: "btp-endpoint.example/btp-account"
3838
property: btp-cis-provider-credentials
3939
- secretKey: btp-service-account-provider-credentials
4040
remoteRef:
41-
key: ""
41+
key: "btp-endpoint.example/btp-account"
4242
property: btp-service-account-provider-credentials
4343
######################################################################################################################################
4444
crossplane-provider-configs:
@@ -79,7 +79,7 @@ crossplane-provider-sap-btp-account:
7979
- name: "subAccount1"
8080
forProvider:
8181
displayName: "CO Managed Control Plane Blueprint Sub-Account"
82-
description: "Sub Account managed by CO MCP & IaD"
82+
description: "Sub Account managed by OpenMCP & IaD"
8383
subdomain: mcp-blueprint-test-1
8484
region: ""
8585
subaccountAdminEmails: *subaccountAdminEmails

helm/umbrella/blueprints/provider-gardener-existing.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ external-secrets-config:
2121
mountPath: ""
2222
role: ""
2323
secretRef:
24-
name: ""
24+
name: "vault-token-sa"
2525
namespace: "default"
2626
key: "token"
2727
externalSecret:
@@ -34,7 +34,7 @@ external-secrets-config:
3434
data:
3535
- secretKey: kubeconfig
3636
remoteRef:
37-
key: ""
37+
key: "btp-endpoint.example/btp-account"
3838
property: kubeconfig
3939
######################################################################################################################################
4040
crossplane-provider-configs:

helm/umbrella/blueprints/provider-gardener.abc.shoot.live.k8s-hana.ondemand.com/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ external-secrets-config:
2121
mountPath: ""
2222
role: ""
2323
secretRef:
24-
name: ""
24+
name: "vault-token-sa"
2525
namespace: "default"
2626
key: "token"
2727
externalSecret:
@@ -34,7 +34,7 @@ external-secrets-config:
3434
data:
3535
- secretKey: kubeconfig
3636
remoteRef:
37-
key: ""
37+
key: "btp-endpoint.example/btp-account"
3838
property: kubeconfig
3939
######################################################################################################################################
4040
crossplane-provider-configs:

manifests/helm/umbrella/blueprints/ocm-package-provider-btp-accounts.abc.shoot.live.k8s-hana.ondemand.com/ocm-package-provider-btp-accounts/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-accounts/sub-accounts.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
openmcp.cloud/blueprint-building-block-version: "0.0.6"
1010
spec:
1111
forProvider:
12-
description: Sub Account managed by CO MCP & IaD
12+
description: Sub Account managed by OpenMCP & IaD
1313
displayName: CO Managed Control Plane Blueprint Sub-Account
1414
region: ""
1515
subaccountAdminEmails: []

0 commit comments

Comments
 (0)