Merge pull request #91 from ytsarev/app-with-mysql

Integrate App claim with Mysql backend

Makefile

@@ -60,13 +60,15 @@ build.init: $(UP)
 
 # This target requires the following environment variables to be set:
 # - UPTEST_CLOUD_CREDENTIALS, cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat gcp-sa.json)
+SKIP_DELETE ?=
 uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
 	@$(INFO) running automated tests
-	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST) e2e examples/cluster-claim.yaml,examples/postgres-claim.yaml --setup-script=test/setup.sh --default-timeout=3600 || $(FAIL)
+	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST) e2e examples/cluster-claim.yaml,examples/postgres-claim.yaml,examples/mysql-claim.yaml,examples/app-claim.yaml --setup-script=test/setup.sh --default-timeout=3600 $(SKIP_DELETE) || $(FAIL)
 	@$(OK) running automated tests
 
 # This target requires the following environment variables to be set:
 # - UPTEST_CLOUD_CREDENTIALS, cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat gcp-sa.json)
+# Use `make e2e SKIP_DELETE=--skip-delete` to skip deletion of resources created during the test.
 e2e: build controlplane.up local.xpkg.deploy.configuration.$(PROJECT_NAME) uptest
 
 render:

crossplane.yaml

@@ -38,7 +38,7 @@ spec:
       version: "v0.5.0"
     - configuration: xpkg.upbound.io/upbound/configuration-gcp-database
       # renovate: datasource=github-releases depName=upbound/configuration-gcp-database
-      version: "v0.4.0"
+      version: "v0.5.0"
     - configuration: xpkg.upbound.io/upbound/configuration-app
       # renovate: datasource=github-releases depName=upbound/configuration-app
       version: "v0.5.0"

examples/app-claim.yaml

@@ -11,6 +11,6 @@ spec:
     providerConfigName: platform-ref-gcp
     passwordSecretRef:
       namespace: default
-      name: platform-ref-gcp-db-conn-mariadb
+      name: platform-ref-gcp-database-mysql-conn
   writeConnectionSecretToRef:
     name: platform-ref-gcp-ghost-conn

examples/cluster-claim.yaml

@@ -10,7 +10,7 @@ spec:
     region: us-west2
     version: latest
     nodes:
-      count: 3
+      count: 1
       instanceType: n1-standard-4
     gitops:
       git:

examples/mysql-claim.yaml

@@ -0,0 +1,28 @@
+apiVersion: gcp.platform.upbound.io/v1alpha1
+kind: SQLInstance
+metadata:
+  name: platform-ref-gcp-database-mysql
+  namespace: default
+spec:
+  parameters:
+    engine: mysql
+    engineVersion: "8_0"
+    region: us-west2
+    storageGB: 10
+    passwordSecretRef:
+      namespace: default
+      name: mysqlsecret
+      key: password
+    networkRef:
+      id: platform-ref-gcp
+  writeConnectionSecretToRef:
+    name: platform-ref-gcp-database-mysql-conn
+---
+apiVersion: v1
+data:
+  password: dXBiMHVuZHIwY2s1ITMxMzM3
+kind: Secret
+metadata:
+  name: mysqlsecret
+  namespace: default
+type: Opaque