diff --git a/README.md b/README.md index f53d017..b4e904a 100644 --- a/README.md +++ b/README.md @@ -56,9 +56,9 @@ If you cluster doesn't have the Application CRD, you'll need it. [Install the Ap [2]: https://cloud.google.com/marketplace/docs/partners/integrated-saas#checklist [3]: https://codelabs.developers.google.com/codelabs/gcp-marketplace-integrated-saas/#0 [4]: https://cloud.google.com/solutions/using-gke-applications-page-cloud-console#preparing_gke -[5]: ./required-infra/create-isv-backend-infra-3.sh -[6]: ./required-infra/create-isv-public-infra-1.sh -[7]: ./required-infra/create-isv-public-infra-2.sh +[5]: ./required-infra/3-create-isv-backend-infra.sh +[6]: ./required-infra/1-create-isv-public-infra.sh +[7]: ./required-infra/2-create-isv-public-infra.sh [8]:https://cloud.google.com/marketplace/docs/partners/integrated-saas/technical-integration-setup [9]: https://cloud.google.com/marketplace/docs/partners/integrated-saas/backend-integration#producer-portal-service-accounts [10]: ./docs/install-mpdev.md \ No newline at end of file diff --git a/docs/install-mpdev.md b/docs/install-mpdev.md index b7b2cd3..1ee10f3 100644 --- a/docs/install-mpdev.md +++ b/docs/install-mpdev.md @@ -16,10 +16,11 @@ SUBSCRIPTION_ID="projects/ISV-public/subscriptions/backend-integration-dev" GOOGLE_SERVICE_ACCOUNT_EMAIL="saas-codelab@ISV-public.iam.gserviceaccount.com" DEPLOYMENT_SERVICE_ACCOUNT="mp-ksa" - # TODO: this needs to be our marketplace image once published - IMAGE="gcr.io/doit-public/doit-easily/deployer:v0.0.1-alpha5" - mpdev install --deployer=$IMAGE --parameters="{\"app_instance_name\":\"${APP_INSTANCE_NAME}\",\"namespace\":\"${NAMESPACE}\",\"is_codelab\":${IS_CODELAB},\"marketplace_project\":\"${MARKETPLACE_PROJECT}\",\"backend_project\":\"${BACKEND_PROJECT}\",\"log_level\":\"${LOG_LEVEL}\",\"slack_webhook\":\"${SLACK_WEBHOOK}\",\"event_topic\":\"${EVENT_TOPIC}\",\"subscription_id\":\"${SUBSCRIPTION_ID}\",\"google_service_account_email\":\"${GOOGLE_SERVICE_ACCOUNT_EMAIL}\",\"deployment_service_account\":\"${DEPLOYMENT_SERVICE_ACCOUNT}\"}" + # support running this as an executable + TAG=${1:-"v0.0.0"} + echo $TAG + mpdev install --deployer=gcr.io/doit-public/doit-easily/deployer:${TAG} --parameters="{\"app_instance_name\":\"${APP_INSTANCE_NAME}\",\"namespace\":\"${NAMESPACE}\",\"is_codelab\":${IS_CODELAB},\"marketplace_project\":\"${MARKETPLACE_PROJECT}\",\"backend_project\":\"${BACKEND_PROJECT}\",\"log_level\":\"${LOG_LEVEL}\",\"slack_webhook\":\"${SLACK_WEBHOOK}\",\"event_topic\":\"${EVENT_TOPIC}\",\"subscription_id\":\"${SUBSCRIPTION_ID}\",\"google_service_account_email\":\"${GOOGLE_SERVICE_ACCOUNT_EMAIL}\",\"deployment_service_account\":\"${DEPLOYMENT_SERVICE_ACCOUNT}\"}" 3. Verify the backend by curling the API 1. list entitlements diff --git a/required-infra/create-isv-public-infra-1.sh b/required-infra/1-create-isv-public-infra.sh similarity index 100% rename from required-infra/create-isv-public-infra-1.sh rename to required-infra/1-create-isv-public-infra.sh diff --git a/required-infra/create-isv-public-infra-2.sh b/required-infra/2-create-isv-public-infra.sh similarity index 100% rename from required-infra/create-isv-public-infra-2.sh rename to required-infra/2-create-isv-public-infra.sh diff --git a/required-infra/create-isv-backend-infra-3.sh b/required-infra/3-create-isv-backend-infra.sh similarity index 100% rename from required-infra/create-isv-backend-infra-3.sh rename to required-infra/3-create-isv-backend-infra.sh diff --git a/schema.yaml b/schema.yaml index 473388c..e52a344 100644 --- a/schema.yaml +++ b/schema.yaml @@ -3,7 +3,7 @@ x-google-marketplace: applicationApiVersion: v1beta1 # The published version is required and MUST match the tag # of the deployer image - publishedVersion: '0.0.1' + publishedVersion: 'v0.0.1-alpha7' publishedVersionMetadata: releaseNote: >- A first release.