diff --git a/helm/charts/crossplane-provider-sap-btp-account/Chart.yaml b/helm/charts/crossplane-provider-sap-btp-account/Chart.yaml index b01c04e..cb1177c 100644 --- a/helm/charts/crossplane-provider-sap-btp-account/Chart.yaml +++ b/helm/charts/crossplane-provider-sap-btp-account/Chart.yaml @@ -16,7 +16,7 @@ icon: "https://avatars.githubusercontent.com/u/45158470?s=48&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.11 +version: 0.0.12 # 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 the version the application is using. diff --git a/helm/charts/crossplane-provider-sap-btp-account/README.md b/helm/charts/crossplane-provider-sap-btp-account/README.md index ecb6ef7..0262d8b 100644 --- a/helm/charts/crossplane-provider-sap-btp-account/README.md +++ b/helm/charts/crossplane-provider-sap-btp-account/README.md @@ -2,7 +2,7 @@ # crossplane-provider-sap-btp-account -![Version: 0.0.11](https://img.shields.io/badge/Version-0.0.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square) +![Version: 0.0.12](https://img.shields.io/badge/Version-0.0.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.2](https://img.shields.io/badge/AppVersion-1.1.2-informational?style=flat-square) A Helm chart to template crossplane manifests to manage SAP BTP resources. @@ -18,7 +18,7 @@ A Helm chart to template crossplane manifests to manage SAP BTP resources. | Key | Type | Default | Description | |-----|------|---------|-------------| | accounts | list | {} | accounts contains information and configuration about a specifig [BTP Global Account](https://help.sap.com/docs/btp/sap-business-technology-platform/getting-global-account). :exclamation::exclamation: Managing BTP Global Accounts is NOT possible at the moment :exclamation::exclamation: | -| accounts[0] | object | `{"btpSapCrossplaneProviderConfigRefName":"","subAccounts":[{"entitlements":[{"amount":0,"name":"","permitNumericQuota":false,"serviceName":"","servicePlanName":""}],"forProvider":{"betaEnabled":null,"description":"","displayName":"","region":"eu01","subaccountAdmins":["your.name@sap.com"],"subdomain":"dev-eu01","usedForProduction":"NOT_USED_FOR_PRODUCTION"},"metadata":{"annotations":{"CloudManagement":{"crossplane.io/external-name":"..."},"ServiceManager":{"crossplane.io/external-name":"..."}}},"name":"","services":{"cloudManagement":false,"serviceManager":false},"subscriptions":[{"appName":"","name":"","planName":"","writeConnectionSecretToRef":{"name":"","namespace":"ns1"}}]}]}` | btpSapCrossplaneProviderConfigRefName defines crossplane provider configuration reference name (identifier) of a [BTP Global Account](https://help.sap.com/docs/btp/sap-business-technology-platform/getting-global-account)! | +| accounts[0] | object | `{"btpSapCrossplaneProviderConfigRefName":"","subAccounts":[{"entitlements":[{"amount":0,"name":"","permitNumericQuota":false,"serviceName":"","servicePlanName":""}],"forProvider":{"betaEnabled":null,"description":"","displayName":"","region":"eu01","subaccountAdmins":["your.name@sap.com"],"subdomain":"dev-eu01","usedForProduction":"NOT_USED_FOR_PRODUCTION"},"metadata":{"annotations":{"CloudManagement":{"crossplane.io/external-name":"..."},"ServiceManager":{"crossplane.io/external-name":"..."}}},"name":"","services":{"cloudManagement":false,"serviceManager":false},"subscriptions":[{"appName":"","name":"","parameters":{},"planName":"","writeConnectionSecretToRef":{"name":"","namespace":"ns1"}}]}]}` | btpSapCrossplaneProviderConfigRefName defines crossplane provider configuration reference name (identifier) of a [BTP Global Account](https://help.sap.com/docs/btp/sap-business-technology-platform/getting-global-account)! | | accounts[0].subAccounts | list | {} | subAccounts contains information and configuration about [BTP Sub-Accounts](https://help.sap.com/docs/btp/sap-business-technology-platform/account-model#loio8d6e3a0fa4ab43e4a421d3ed08128afa). | | accounts[0].subAccounts[0].entitlements | list | {} | entitlements defines [BTP Entitlements](https://help.sap.com/docs/btp/sap-business-technology-platform/entitlements-and-quotas) for this [BTP Sub-Account](https://help.sap.com/docs/btp/sap-business-technology-platform/account-model#loio8d6e3a0fa4ab43e4a421d3ed08128afa). Learn more about managing BTP Entitlement with crossplane [here](https://doc.crds.dev/github.com/SAP/crossplane-provider-btp/account.btp.sap.crossplane.io/Entitlement/v1alpha1@v1.1.2). | | accounts[0].subAccounts[0].entitlements[0].amount | int | `0` | Used when permitNumericQuota=true. Only set amount for multitenant applications and services that do not permit a numeric quota assignment! | @@ -40,6 +40,7 @@ A Helm chart to template crossplane manifests to manage SAP BTP resources. | accounts[0].subAccounts[0].subscriptions | list | {} | Define Subscriptions for this [BTP Sub-Account](https://help.sap.com/docs/btp/sap-business-technology-platform/account-model#loio8d6e3a0fa4ab43e4a421d3ed08128afa) to subscribe to [BTP Services](https://help.sap.com/docs/btp/sap-business-technology-platform/solutions-and-services?locale=en-US&q=Subscription#services). | | accounts[0].subAccounts[0].subscriptions[0].appName | string | `""` | AppName of the app to subscribe to | | accounts[0].subAccounts[0].subscriptions[0].name | string | `""` | Name of the Subscription resource - [CRD Browser](https://doc.crds.dev/github.com/SAP/crossplane-provider-btp/account.btp.sap.crossplane.io/Subscription/v1alpha1@v1.1.2). | +| accounts[0].subAccounts[0].subscriptions[0].parameters | object | `{}` | Parameters for the plan to be subscribed - [Reference](https://doc.crds.dev/github.com/SAP/crossplane-provider-btp/account.btp.sap.crossplane.io/Subscription/v1alpha1@v1.2.1) | | accounts[0].subAccounts[0].subscriptions[0].planName | string | `""` | PlanName to subscribe to | | accounts[0].subAccounts[0].subscriptions[0].writeConnectionSecretToRef | object | [] | *optional* - When a Crossplane Provider creates a managed resource it may generate resource-specific details, like usernames, passwords or connection details like an IP address. Crossplane stores these details in a Kubernetes Secret object specified by the `writeConnectionSecretToRef` values. Learn more about Crossplane concept [Managed Resources Fields](https://docs.crossplane.io/latest/concepts/managed-resources/#writeconnectionsecrettoref)! | | directories | list | object | `directories[].` orchestrate [`kind: Directory`](https://doc.crds.dev/github.com/SAP/crossplane-provider-btp/account.btp.sap.crossplane.io/Directory/v1alpha1@v1.1.2) of [BTP Accounts](https://help.sap.com/docs/btp/sap-business-technology-platform/account-model). | diff --git a/helm/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/subscription.yaml b/helm/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/subscription.yaml index 47d08a0..199c19c 100644 --- a/helm/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/subscription.yaml +++ b/helm/charts/crossplane-provider-sap-btp-account/templates/mcp/btp-subscriptions/subscription.yaml @@ -21,6 +21,10 @@ spec: forProvider: appName: {{required "A valid value is required! (.Values.accounts[].subAccounts[].subscriptions[].appName)" $subscription.appName }} planName: {{required "A valid value is required! (.Values.accounts[].subAccounts[].subscriptions[].planName)" $subscription.planName }} + {{- if $subscription.parameters}} + parameters: + {{- $subscription.parameters | toYaml | nindent 6 }} + {{- end }} cloudManagementRef: name: {{required "A valid value is required! (.Values.accounts[].subAccounts[].name)" $item.name | lower }} {{- if $subscription.writeConnectionSecretToRef}} @@ -31,4 +35,4 @@ spec: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/charts/crossplane-provider-sap-btp-account/values.ci.yaml b/helm/charts/crossplane-provider-sap-btp-account/values.ci.yaml index 602e960..9c7a3df 100644 --- a/helm/charts/crossplane-provider-sap-btp-account/values.ci.yaml +++ b/helm/charts/crossplane-provider-sap-btp-account/values.ci.yaml @@ -123,6 +123,11 @@ accounts: writeConnectionSecretToRef: name: "name" namespace: "namespace" + - name: test-identity + appName: sap-identity-services-onboarding + planName: additional-tenant + parameters: + "cloud_service": "TEST" - name: "test3" forProvider: displayName: "sub-account2" @@ -144,4 +149,4 @@ accounts: servicePlanName: "service-plan-name" permitNumericQuota: false amount: 1 -######################################################################################################### \ No newline at end of file +######################################################################################################### diff --git a/helm/charts/crossplane-provider-sap-btp-account/values.yaml b/helm/charts/crossplane-provider-sap-btp-account/values.yaml index acf12b2..2d4a975 100644 --- a/helm/charts/crossplane-provider-sap-btp-account/values.yaml +++ b/helm/charts/crossplane-provider-sap-btp-account/values.yaml @@ -50,6 +50,8 @@ accounts: appName: "" # -- PlanName to subscribe to planName: "" + # -- Parameters for the plan to be subscribed - [Reference](https://doc.crds.dev/github.com/SAP/crossplane-provider-btp/account.btp.sap.crossplane.io/Subscription/v1alpha1@v1.2.1) + parameters: {} # -- *optional* - When a Crossplane Provider creates a managed resource it may generate resource-specific details, like usernames, passwords or connection details like an IP address. # Crossplane stores these details in a Kubernetes Secret object specified by the `writeConnectionSecretToRef` values. Learn more about Crossplane concept [Managed Resources Fields](https://docs.crossplane.io/latest/concepts/managed-resources/#writeconnectionsecrettoref)! # @default -- [] @@ -122,4 +124,4 @@ subaccountServiceBrokers: # -- *optional* - When a Crossplane Provider creates a managed resource it may generate resource-specific details, like usernames, passwords or connection details like an IP address. # Crossplane stores these details in a Kubernetes Secret object specified by the `writeConnectionSecretToRef` values. Learn more about Crossplane concept [Managed Resources Fields](https://docs.crossplane.io/latest/concepts/managed-resources/#writeconnectionsecrettoref)! writeConnectionSecretToRef: [] -######################################################################################################### \ No newline at end of file +#########################################################################################################