diff --git a/examples/kubecondemo/README.md b/examples/kubecondemo/README.md index 537af13c5..d89e7f9a7 100644 --- a/examples/kubecondemo/README.md +++ b/examples/kubecondemo/README.md @@ -55,7 +55,7 @@ Also the examples are based on Alibaba Cloud settings * Add cloud provider: `kubectl crossplane install provider crossplane/provider-alibaba:v0.3.0` * Create provider secret: `kubectl create secret generic alibaba-creds --from-literal=accessKeyId= --from-literal=accessKeySecret= -n crossplane-system` * Configure the provider: `kubectl apply -f script/provider.yaml` -* Configure infrastructure: `kubectl crossplane install configuration crossplane/getting-started-with-alibaba:master` +* Configure infrastructure: `kubectl crossplane install configuration crossplane/getting-started-with-alibaba:v0.13` ### Import the database workload definition diff --git a/examples/kubecondemo/charts/crossplane/Chart.yaml b/examples/kubecondemo/charts/crossplane/Chart.yaml index 6ec6bc9a1..68f0b25eb 100755 --- a/examples/kubecondemo/charts/crossplane/Chart.yaml +++ b/examples/kubecondemo/charts/crossplane/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 0.14.0-rc.18.g99c02be +appVersion: 0.13.0 description: Crossplane is an open source Kubernetes add-on that extends any cluster with the ability to provision and manage cloud infrastructure, services, and applications using kubectl, GitOps, or any tool that works with the Kubernetes API. @@ -33,4 +33,4 @@ maintainers: - email: info@crossplane.io name: Crossplane Maintainers name: crossplane -version: 0.14.0-rc.18.g99c02be +version: 0.13.0 diff --git a/examples/kubecondemo/charts/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml b/examples/kubecondemo/charts/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml index 5e0557724..84e90068c 100755 --- a/examples/kubecondemo/charts/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml +++ b/examples/kubecondemo/charts/crossplane/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml @@ -9,12 +9,6 @@ metadata: name: compositeresourcedefinitions.apiextensions.crossplane.io spec: additionalPrinterColumns: - - JSONPath: .status.conditions[?(@.type=='Established')].status - name: ESTABLISHED - type: string - - JSONPath: .status.conditions[?(@.type=='Offered')].status - name: OFFERED - type: string - JSONPath: .metadata.creationTimestamp name: AGE type: date diff --git a/examples/kubecondemo/charts/crossplane/requirements.lock b/examples/kubecondemo/charts/crossplane/requirements.lock index e1ae12dd0..5e77c7887 100755 --- a/examples/kubecondemo/charts/crossplane/requirements.lock +++ b/examples/kubecondemo/charts/crossplane/requirements.lock @@ -3,4 +3,4 @@ dependencies: repository: https://charts.crossplane.io/alpha version: 0.2.2 digest: sha256:c719dbcb1845241851f2b55ada9975b862885c1cecd5bae19e6b5339291fc81b -generated: "2020-10-15T18:06:57.634676207Z" +generated: "2020-10-10T01:47:45.31055709Z" diff --git a/examples/kubecondemo/charts/crossplane/requirements.yaml b/examples/kubecondemo/charts/crossplane/requirements.yaml index f9cf700e9..703955e1f 100755 --- a/examples/kubecondemo/charts/crossplane/requirements.yaml +++ b/examples/kubecondemo/charts/crossplane/requirements.yaml @@ -1,2 +1 @@ dependencies: - diff --git a/examples/kubecondemo/charts/crossplane/values.yaml b/examples/kubecondemo/charts/crossplane/values.yaml index 32d5c913a..4a2f2ca28 100755 --- a/examples/kubecondemo/charts/crossplane/values.yaml +++ b/examples/kubecondemo/charts/crossplane/values.yaml @@ -4,7 +4,7 @@ deploymentStrategy: RollingUpdate image: repository: crossplane/crossplane - tag: v0.14.0-rc.18.g99c02be + tag: v0.13.0 pullPolicy: Always args: {} diff --git a/examples/kubecondemo/script/def_db.yaml b/examples/kubecondemo/script/def_db.yaml index ba09b2e39..b8a42fa81 100644 --- a/examples/kubecondemo/script/def_db.yaml +++ b/examples/kubecondemo/script/def_db.yaml @@ -1,39 +1,35 @@ ---- apiVersion: core.oam.dev/v1alpha2 kind: WorkloadDefinition metadata: - name: postgresqlinstances + name: rds annotations: definition.oam.dev/apiVersion: "database.example.org/v1alpha1" definition.oam.dev/kind: "PostgreSQLInstance" - definition.oam.dev/description: "Ali Cloud RDS resource" + definition.oam.dev/description: "RDS on Ali Cloud" spec: definitionRef: - name: postgresqlinstances - extension: + name: rds.apps + extension: template: | output: { - apiVersion: "database.example.org/v1alpha1" - kind: "PostgreSQLInstance" - metadata: - name: "app-postgresql" - spec: { + apiVersion: "database.example.org/v1alpha1" + kind: "PostgreSQLInstance" + metadata: + name: context.name + spec: { parameters: storageGB: 20 compositionSelector: { matchLabels: - provider: "alibaba" + provider: parameter.provider } writeConnectionSecretToRef: - name: "db-conn" - + name: parameter.secretname } } - #rds: { - env: [...{ - name: string - value: string - }] + + parameter: { + secretname: *"db-conn" | string + provider: *"alibaba" | string } - parameter: #rds - +