diff --git a/apis/app/composition.yaml b/apis/app/composition.yaml deleted file mode 100644 index f2f1cc2..0000000 --- a/apis/app/composition.yaml +++ /dev/null @@ -1,89 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: xapps.azure.platformref.upbound.io - labels: - provider: helm -spec: - writeConnectionSecretsToNamespace: upbound-system - compositeTypeRef: - apiVersion: azure.platformref.upbound.io/v1alpha1 - kind: XApp - resources: - - name: helmRelease - base: - apiVersion: helm.crossplane.io/v1beta1 - kind: Release - spec: - rollbackLimit: 3 - forProvider: - namespace: ghost - chart: - name: ghost - repository: https://charts.bitnami.com/bitnami - version: "19.3.10" - values: - persistence: - enabled: false - mysql: - enabled: false - externalDatabase: - database: upbound - port: 3306 - ghostHost: upboundrocks.cloud - ghostBlogTitle: Upbound Rocks! - set: - - name: externalDatabase.host - valueFrom: - secretKeyRef: - key: host - - name: externalDatabase.user - valueFrom: - secretKeyRef: - key: username - - name: externalDatabase.password - valueFrom: - secretKeyRef: - key: password - patches: - # All Helm releases derive their labels and annotations from the XR. - - fromFieldPath: metadata.labels - toFieldPath: metadata.labels - - fromFieldPath: metadata.annotations - toFieldPath: metadata.annotations - # All Helm releases derive the ProviderConfig to use from the XR. - - fromFieldPath: spec.parameters.providerConfigName - toFieldPath: spec.providerConfigRef.name - - fromFieldPath: spec.parameters.deletionPolicy - toFieldPath: spec.deletionPolicy - - fromFieldPath: spec.parameters.helm.chart.version - toFieldPath: spec.forProvider.chart.version - - fromFieldPath: spec.parameters.passwordSecretRef.namespace - toFieldPath: spec.forProvider.set[0].valueFrom.secretKeyRef.namespace - - fromFieldPath: spec.parameters.passwordSecretRef.name - toFieldPath: spec.forProvider.set[0].valueFrom.secretKeyRef.name - - fromFieldPath: spec.parameters.passwordSecretRef.namespace - toFieldPath: spec.forProvider.set[1].valueFrom.secretKeyRef.namespace - - fromFieldPath: spec.parameters.passwordSecretRef.name - toFieldPath: spec.forProvider.set[1].valueFrom.secretKeyRef.name - - fromFieldPath: spec.parameters.passwordSecretRef.namespace - toFieldPath: spec.forProvider.set[2].valueFrom.secretKeyRef.namespace - - fromFieldPath: spec.parameters.passwordSecretRef.name - toFieldPath: spec.forProvider.set[2].valueFrom.secretKeyRef.name - - - name: usageXEksByXApp - base: - apiVersion: apiextensions.crossplane.io/v1alpha1 - kind: Usage - spec: - of: - apiVersion: azure.platformref.upbound.io/v1alpha1 - kind: XAKS - by: - apiVersion: helm.crossplane.io/v1beta1 - kind: Release - resourceSelector: - matchControllerRef: true - patches: - - fromFieldPath: spec.parameters.providerConfigName - toFieldPath: spec.of.resourceSelector.matchLabels[xaks.azure.platformref.upbound.io/cluster-id] diff --git a/apis/app/definition.yaml b/apis/app/definition.yaml deleted file mode 100644 index 549ad36..0000000 --- a/apis/app/definition.yaml +++ /dev/null @@ -1,72 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: xapps.azure.platformref.upbound.io -spec: - # We require Foreground Deletion - # in such situations, XApp is deleted right away, - # taking the Usage and XAKS with it, - # which causes issues for Release.helm's deletion process. - defaultCompositeDeletePolicy: Foreground - group: azure.platformref.upbound.io - names: - kind: XApp - plural: xapps - claimNames: - kind: App - plural: apps - versions: - - name: v1alpha1 - served: true - referenceable: true - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - parameters: - type: object - description: App configuration parameters. - properties: - deletionPolicy: - description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete - enum: - - Delete - - Orphan - type: string - default: Delete - providerConfigName: - description: Crossplane ProviderConfig to use for provisioning this resources - type: string - helm: - type: object - description: Configuration for operators. - properties: - chart: - type: object - description: Configuration for the Helm Chart - properties: - name: - type: string - description: chart name - repo: - type: string - description: chart repo - version: - type: string - description: chart version - passwordSecretRef: - type: object - description: "A reference to the Secret object containing database credentials" - properties: - namespace: - type: string - name: - type: string - required: - - namespace - - name - required: - - providerConfigName diff --git a/apis/cluster/aks/composition.yaml b/apis/cluster/aks/composition.yaml index 5ad9e48..50b4988 100644 --- a/apis/cluster/aks/composition.yaml +++ b/apis/cluster/aks/composition.yaml @@ -51,9 +51,9 @@ spec: string: fmt: "%s-aks" - fromFieldPath: spec.parameters.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] + toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platform.upbound.io/network-id] - fromFieldPath: spec.parameters.id - toFieldPath: spec.forProvider.defaultNodePool[0].vnetSubnetIdSelector.matchLabels[azure.platformref.upbound.io/network-id] + toFieldPath: spec.forProvider.defaultNodePool[0].vnetSubnetIdSelector.matchLabels[azure.platform.upbound.io/network-id] - fromFieldPath: spec.parameters.id toFieldPath: spec.forProvider.dnsPrefix - fromFieldPath: spec.parameters.nodes.instanceType @@ -92,25 +92,3 @@ spec: fmt: "%s-akscluster" readinessChecks: - type: None - - name: providerConfigKubernetes - base: - apiVersion: kubernetes.crossplane.io/v1alpha1 - kind: ProviderConfig - spec: - credentials: - source: Secret - secretRef: - key: kubeconfig - patches: - - fromFieldPath: spec.parameters.id - toFieldPath: metadata.name - - fromFieldPath: spec.writeConnectionSecretToRef.namespace - toFieldPath: spec.credentials.secretRef.namespace - - fromFieldPath: metadata.uid - toFieldPath: spec.credentials.secretRef.name - transforms: - - type: string - string: - fmt: "%s-akscluster" - readinessChecks: - - type: None diff --git a/apis/cluster/composition.yaml b/apis/cluster/composition.yaml index f42ede3..e6b471b 100644 --- a/apis/cluster/composition.yaml +++ b/apis/cluster/composition.yaml @@ -10,7 +10,7 @@ spec: resources: - name: compositeNetworkAKS base: - apiVersion: azure.platformref.upbound.io/v1alpha1 + apiVersion: azure.platform.upbound.io/v1alpha1 kind: XNetwork patches: - fromFieldPath: spec.parameters.id @@ -93,3 +93,22 @@ spec: kind: XServices resourceSelector: matchControllerRef: true + + - name: usageXAksByArbitraryLabeledRelease + base: + apiVersion: apiextensions.crossplane.io/v1alpha1 + kind: Usage + spec: + of: + apiVersion: aws.platform.upbound.io/v1alpha1 + kind: XAKS + resourceSelector: + matchControllerRef: true + by: + apiVersion: helm.crossplane.io/v1beta1 + kind: Release + resourceSelector: + matchLabels: + platform.upbound.io/deletion-ordering: enabled + readinessChecks: + - type: None diff --git a/apis/cluster/network/default/composition.yaml b/apis/cluster/network/default/composition.yaml deleted file mode 100644 index a4707bf..0000000 --- a/apis/cluster/network/default/composition.yaml +++ /dev/null @@ -1,99 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: xnetworks.azure.platformref.upbound.io - labels: - provider: azure - type: basic -spec: - writeConnectionSecretsToNamespace: upbound-system - compositeTypeRef: - apiVersion: azure.platformref.upbound.io/v1alpha1 - kind: XNetwork - patchSets: - - name: providerConfigRef - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.providerConfigName - toFieldPath: spec.providerConfigRef.name - - name: deletionPolicy - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.deletionPolicy - toFieldPath: spec.deletionPolicy - - name: network-id - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.id - toFieldPath: metadata.labels[azure.platformref.upbound.io/network-id] - - name: region - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.region - toFieldPath: spec.forProvider.location - resources: - - name: resourceGroup - base: - apiVersion: azure.upbound.io/v1beta1 - kind: ResourceGroup - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - type: PatchSet - patchSetName: network-id - - type: PatchSet - patchSetName: region - - name: virtualNetwork - base: - apiVersion: network.azure.upbound.io/v1beta1 - kind: VirtualNetwork - spec: - forProvider: - resourceGroupNameSelector: - matchControllerRef: true - addressSpace: - - 192.168.0.0/16 - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - type: PatchSet - patchSetName: network-id - - type: PatchSet - patchSetName: region - - fromFieldPath: spec.parameters.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-vnet" - - name: subnet - base: - apiVersion: network.azure.upbound.io/v1beta1 - kind: Subnet - spec: - forProvider: - resourceGroupNameSelector: - matchControllerRef: true - virtualNetworkNameSelector: - matchControllerRef: true - addressPrefixes: - - 192.168.1.0/24 - serviceEndpoints: - - Microsoft.Sql - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - type: PatchSet - patchSetName: network-id - - fromFieldPath: spec.parameters.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-sn" diff --git a/apis/cluster/network/definition.yaml b/apis/cluster/network/definition.yaml deleted file mode 100644 index 3221009..0000000 --- a/apis/cluster/network/definition.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: xnetworks.azure.platformref.upbound.io -spec: - group: azure.platformref.upbound.io - names: - kind: XNetwork - plural: xnetworks - versions: - - name: v1alpha1 - served: true - referenceable: true - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - parameters: - description: Network Parameters - properties: - id: - type: string - description: ID of this Network that other objects will use to refer to it. - region: - type: string - description: Region is the region you'd like your resource to be created in. - deletionPolicy: - description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete - enum: - - Delete - - Orphan - type: string - default: Delete - providerConfigName: - description: Crossplane ProviderConfig to use for provisioning this resources - type: string - default: default - required: - - deletionPolicy - - providerConfigName - - id - - region - type: object - required: - - parameters diff --git a/apis/database/sqlinstance/definition.yaml b/apis/database/sqlinstance/definition.yaml deleted file mode 100644 index dbb98f9..0000000 --- a/apis/database/sqlinstance/definition.yaml +++ /dev/null @@ -1,75 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: xsqlinstances.azure.platformref.upbound.io -spec: - group: azure.platformref.upbound.io - names: - kind: XSQLInstance - plural: xsqlinstances - claimNames: - kind: SQLInstance - plural: sqlinstances - connectionSecretKeys: - - username - - password - - port - - host - versions: - - name: v1alpha1 - served: true - referenceable: true - schema: - openAPIV3Schema: - type: object - properties: - spec: - type: object - properties: - parameters: - type: object - properties: - region: - type: string - description: Region is the region you'd like your resource to be created in. - deletionPolicy: - description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete - enum: - - Delete - - Orphan - type: string - default: Delete - providerConfigName: - description: Crossplane ProviderConfig to use for provisioning this resources - type: string - default: default - storageGB: - type: integer - passwordSecretRef: - type: object - description: "A reference to the Secret object containing database password" - properties: - namespace: - type: string - name: - type: string - key: - type: string - required: - - namespace - - name - - key - clusterRef: - type: object - description: "A reference to the Network object that this postgres should be connected to." - properties: - id: - type: string - description: ID of the Network object this ref points to. - required: - - id - required: - - storageGB - - passwordSecretRef - required: - - parameters diff --git a/apis/database/sqlinstance/mariadb/composition.yaml b/apis/database/sqlinstance/mariadb/composition.yaml deleted file mode 100644 index 5fcf8ca..0000000 --- a/apis/database/sqlinstance/mariadb/composition.yaml +++ /dev/null @@ -1,140 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: xmariadbinstances.azure.platformref.upbound.io - labels: - dbengine: mariadb - provider: azure -spec: - writeConnectionSecretsToNamespace: upbound-system - compositeTypeRef: - apiVersion: azure.platformref.upbound.io/v1alpha1 - kind: XSQLInstance - patchSets: - - name: providerConfigRef - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.providerConfigName - toFieldPath: spec.providerConfigRef.name - - name: deletionPolicy - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.deletionPolicy - toFieldPath: spec.deletionPolicy - - name: region - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.region - toFieldPath: spec.forProvider.location - resources: - - name: mariadlserver - base: - apiVersion: dbformariadb.azure.upbound.io/v1beta1 - kind: Server - spec: - forProvider: - version: "10.3" - administratorLogin: xp-admin - skuName: GP_Gen5_2 - storageMb: 5120 - sslEnforcementEnabled: false - sslMinimalTlsVersionEnforced: TLSEnforcementDisabled - identity: - - type: SystemAssigned - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - type: PatchSet - patchSetName: region - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-mariadb" - - fromFieldPath: spec.writeConnectionSecretToRef.namespace - toFieldPath: spec.writeConnectionSecretToRef.namespace - - fromFieldPath: metadata.uid - toFieldPath: spec.writeConnectionSecretToRef.name - transforms: - - type: string - string: - fmt: "%s-mariadb" - - fromFieldPath: spec.parameters.storageGB - toFieldPath: spec.forProvider.storageMb - transforms: - - type: math - math: - multiply: 1024 - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] - - fromFieldPath: spec.parameters.passwordSecretRef.namespace - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.namespace - - fromFieldPath: spec.parameters.passwordSecretRef.name - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.name - - fromFieldPath: spec.parameters.passwordSecretRef.key - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.key - connectionDetails: - - type: FromFieldPath - name: host - fromFieldPath: status.atProvider.fqdn - - type: FromConnectionSecretKey - name: username - fromConnectionSecretKey: username - - type: FromConnectionSecretKey - name: password - fromConnectionSecretKey: password - - type: FromConnectionSecretKey - name: port - fromConnectionSecretKey: port - - name: vnetrule - base: - apiVersion: dbformariadb.azure.upbound.io/v1beta1 - kind: VirtualNetworkRule - spec: - forProvider: - serverNameSelector: - matchControllerRef: true - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-sn-rule" - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.subnetIdSelector.matchLabels[azure.platformref.upbound.io/network-id] - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] - - name: database - base: - apiVersion: dbformariadb.azure.upbound.io/v1beta1 - kind: Database - spec: - forProvider: - charset: utf8 - collation: utf8_general_ci - serverNameSelector: - matchControllerRef: true - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: metadata.name - transforms: - - type: match - match: - patterns: - - type: regexp - regexp: '.*' - result: upbound - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] diff --git a/apis/database/sqlinstance/postgresql/composition.yaml b/apis/database/sqlinstance/postgresql/composition.yaml deleted file mode 100644 index 370b49e..0000000 --- a/apis/database/sqlinstance/postgresql/composition.yaml +++ /dev/null @@ -1,116 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: xpostgresqlinstances.azure.platformref.upbound.io - labels: - dbengine: postgresql - provider: azure -spec: - writeConnectionSecretsToNamespace: upbound-system - compositeTypeRef: - apiVersion: azure.platformref.upbound.io/v1alpha1 - kind: XSQLInstance - patchSets: - - name: providerConfigRef - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.providerConfigName - toFieldPath: spec.providerConfigRef.name - - name: deletionPolicy - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.deletionPolicy - toFieldPath: spec.deletionPolicy - - name: region - patches: - - type: FromCompositeFieldPath - fromFieldPath: spec.parameters.region - toFieldPath: spec.forProvider.location - resources: - - name: postgresqlserver - base: - apiVersion: dbforpostgresql.azure.upbound.io/v1beta1 - kind: Server - spec: - forProvider: - version: "11" - administratorLogin: psqladmin - skuName: GP_Gen5_2 - storageMb: 5120 - sslEnforcementEnabled: false - sslMinimalTlsVersionEnforced: TLSEnforcementDisabled - identity: - - type: SystemAssigned - # due to: https://github.com/Azure/azure-rest-api-specs/issues/9571 - infrastructureEncryptionEnabled: false - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - type: PatchSet - patchSetName: region - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-postgresql" - - fromFieldPath: spec.writeConnectionSecretToRef.namespace - toFieldPath: spec.writeConnectionSecretToRef.namespace - - fromFieldPath: metadata.uid - toFieldPath: spec.writeConnectionSecretToRef.name - transforms: - - type: string - string: - fmt: "%s-postgresql" - - fromFieldPath: spec.parameters.storageGB - toFieldPath: spec.forProvider.storageMb - transforms: - - type: math - math: - multiply: 1024 - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] - - fromFieldPath: spec.parameters.passwordSecretRef.namespace - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.namespace - - fromFieldPath: spec.parameters.passwordSecretRef.name - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.name - - fromFieldPath: spec.parameters.passwordSecretRef.key - toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.key - connectionDetails: - - type: FromFieldPath - name: host - fromFieldPath: status.atProvider.fqdn - - type: FromConnectionSecretKey - name: username - fromConnectionSecretKey: username - - type: FromConnectionSecretKey - name: password - fromConnectionSecretKey: password - - type: FromConnectionSecretKey - name: port - fromConnectionSecretKey: port - - name: vnetrule - base: - apiVersion: dbforpostgresql.azure.upbound.io/v1beta1 - kind: VirtualNetworkRule - spec: - forProvider: - serverNameSelector: - matchControllerRef: true - patches: - - type: PatchSet - patchSetName: providerConfigRef - - type: PatchSet - patchSetName: deletionPolicy - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: metadata.name - transforms: - - type: string - string: - fmt: "%s-sn-rule" - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.subnetIdSelector.matchLabels[azure.platformref.upbound.io/network-id] - - fromFieldPath: spec.parameters.clusterRef.id - toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id] diff --git a/crossplane.yaml b/crossplane.yaml index ecff72d..b7ca5fe 100644 --- a/crossplane.yaml +++ b/crossplane.yaml @@ -37,16 +37,12 @@ spec: version: ">=v1.12.1-0" dependsOn: - provider: xpkg.upbound.io/upbound/provider-family-azure - version: "v0.37.0" + version: "v0.37.1" - provider: xpkg.upbound.io/upbound/provider-azure-containerservice - version: "v0.37.0" - - provider: xpkg.upbound.io/upbound/provider-azure-dbformariadb - version: "v0.37.0" - - provider: xpkg.upbound.io/upbound/provider-azure-dbforpostgresql - version: "v0.37.0" - - provider: xpkg.upbound.io/upbound/provider-azure-network - version: "v0.37.0" - - provider: xpkg.upbound.io/crossplane-contrib/provider-helm - version: ">=v0.15.0" - - provider: xpkg.upbound.io/crossplane-contrib/provider-kubernetes - version: ">=v0.9.0" + version: "v0.37.1" + - configuration: xpkg.upbound.io/upbound/configuration-azure-network + version: "v0.2.0" + - configuration: xpkg.upbound.io/upbound/configuration-azure-database + version: "v0.2.0" + - configuration: xpkg.upbound.io/upbound/configuration-app + version: "v0.1.0" diff --git a/examples/app-claim.yaml b/examples/app-claim.yaml index b19b1d3..bc862c6 100644 --- a/examples/app-claim.yaml +++ b/examples/app-claim.yaml @@ -1,8 +1,10 @@ -apiVersion: azure.platformref.upbound.io/v1alpha1 +apiVersion: platform.upbound.io/v1alpha1 kind: App metadata: name: platform-ref-azure-ghost namespace: default + labels: + platform.upbound.io/deletion-ordering: enabled spec: compositeDeletePolicy: Foreground parameters: diff --git a/examples/mariadb-claim.yaml b/examples/mariadb-claim.yaml index c46a4b2..6ea02a2 100644 --- a/examples/mariadb-claim.yaml +++ b/examples/mariadb-claim.yaml @@ -1,4 +1,4 @@ -apiVersion: azure.platformref.upbound.io/v1alpha1 +apiVersion: azure.platform.upbound.io/v1alpha1 kind: SQLInstance metadata: name: platform-ref-azure-db-mariadb @@ -12,9 +12,9 @@ spec: storageGB: 5 #Minimum value is 5 passwordSecretRef: namespace: default - name: psqlsecret + name: mariadbsecret key: password - clusterRef: + networkRef: id: platform-ref-azure #This field must match the cluster XR spec.id writeConnectionSecretToRef: name: platform-ref-azure-db-conn-mariadb #Must be unique for each instance diff --git a/examples/postgres-claim.yaml b/examples/postgres-claim.yaml index 626beae..f4c6568 100644 --- a/examples/postgres-claim.yaml +++ b/examples/postgres-claim.yaml @@ -1,4 +1,4 @@ -apiVersion: azure.platformref.upbound.io/v1alpha1 +apiVersion: azure.platform.upbound.io/v1alpha1 kind: SQLInstance metadata: name: platform-ref-azure-db-postgresql @@ -6,7 +6,7 @@ metadata: spec: compositionSelector: matchLabels: - dbengine: postgresql + dbengine: postgres parameters: region: westus storageGB: 5 #Minimum value is 5 @@ -14,7 +14,7 @@ spec: namespace: default name: psqlsecret key: password - clusterRef: + networkRef: id: platform-ref-azure #This field must match the cluster XR spec.id writeConnectionSecretToRef: name: platform-ref-azure-db-conn-postgresql #Must be unique for each instance diff --git a/test/setup.sh b/test/setup.sh index b8a3f51..c1e8c34 100755 --- a/test/setup.sh +++ b/test/setup.sh @@ -2,9 +2,9 @@ set -aeuo pipefail echo "Running setup.sh" -echo "Waiting until configuration package is healthy/installed..." -"${KUBECTL}" wait configuration.pkg platform-ref-azure --for=condition=Healthy --timeout 5m -"${KUBECTL}" wait configuration.pkg platform-ref-azure --for=condition=Installed --timeout 5m +echo "Waiting until all configuration packages are healthy/installed..." +"${KUBECTL}" wait configuration.pkg --all --for=condition=Healthy --timeout 5m +"${KUBECTL}" wait configuration.pkg --all --for=condition=Installed --timeout 5m echo "Creating cloud credential secret..." "${KUBECTL}" -n upbound-system create secret generic azure-creds --from-literal=credentials="${UPTEST_CLOUD_CREDENTIALS}" \