Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate App claim with Mysql backend #91

Merged
merged 2 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion crossplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/app-claim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/cluster-claim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
region: us-west2
version: latest
nodes:
count: 3
count: 1
instanceType: n1-standard-4
gitops:
git:
Expand Down
28 changes: 28 additions & 0 deletions examples/mysql-claim.yaml
Original file line number Diff line number Diff line change
@@ -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