From c9a508465e263e513c1a0c5629d3378752fb8cc0 Mon Sep 17 00:00:00 2001 From: Nicholas Karsky Date: Wed, 13 Jan 2021 16:26:32 -0500 Subject: [PATCH 1/2] Added fixes for urls, etc of various services --- charts/README.md | 4 ++-- docs/code-mirroring.md | 20 ++++++++++---------- docs/service-automation.md | 34 ++++++++++++++++++++++++++++++++++ docs/service-onboarding.md | 2 +- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/charts/README.md b/charts/README.md index dd1d919a..6ebbf3cd 100644 --- a/charts/README.md +++ b/charts/README.md @@ -224,8 +224,8 @@ git clone https://community.opengroup.org/osdu/platform/system/indexer-service.g git clone https://community.opengroup.org/osdu/platform/system/search-service.git $SRC_DIR/search-service git clone https://community.opengroup.org/osdu/platform/system/file.git $SRC_DIR/file-service git clone https://community.opengroup.org/osdu/platform/system/delivery.git $SRC_DIR/delivery -git clone https://community.opengroup.org/osdu/platform/system/unit-service.git $SRC_DIR/unit-service -git clone https://community.opengroup.org/osdu/platform/system/crs-catalog-service.git $SRC_DIR/crs-catalog-service +git clone https://community.opengroup.org/osdu/platform/system/reference/unit-service.git $SRC_DIR/unit-service +git clone https://community.opengroup.org/osdu/platform/system/reference/crs-catalog-service.git $SRC_DIR/crs-catalog-service git clone https://community.opengroup.org/osdu/platform/system/reference/crs-conversion-service.git $SRC_DIR/crs-conversion-service git clone https://community.opengroup.org/osdu/platform/system/notification.git $SRC_DIR/notification git clone https://community.opengroup.org/osdu/platform/data-flow/enrichment/wks.git $SRC_DIR/wks diff --git a/docs/code-mirroring.md b/docs/code-mirroring.md index 8eb74c69..14db1391 100644 --- a/docs/code-mirroring.md +++ b/docs/code-mirroring.md @@ -266,18 +266,18 @@ jobs: destinationGitRepositoryPersonalAccessToken: $(ACCESS_TOKEN) - task: swellaby.mirror-git-repository.mirror-git-repository-vsts-task.mirror-git-repository-vsts-task@1 - displayName: 'notification' - inputs: - sourceGitRepositoryUri: 'https://community.opengroup.org/osdu/platform/system/notification.git' - destinationGitRepositoryUri: '$(NOTIFICATION_REPO)' - destinationGitRepositoryPersonalAccessToken: $(ACCESS_TOKEN) + displayName: 'notification' + inputs: + sourceGitRepositoryUri: 'https://community.opengroup.org/osdu/platform/system/notification.git' + destinationGitRepositoryUri: '$(NOTIFICATION_REPO)' + destinationGitRepositoryPersonalAccessToken: $(ACCESS_TOKEN) - task: swellaby.mirror-git-repository.mirror-git-repository-vsts-task.mirror-git-repository-vsts-task@1 - displayName: 'schema-service' - inputs: - sourceGitRepositoryUri: 'https://community.opengroup.org/osdu/platform/system/schema-service.git' - destinationGitRepositoryUri: '$(SCHEMA_REPO)' - destinationGitRepositoryPersonalAccessToken: $(ACCESS_TOKEN) + displayName: 'schema-service' + inputs: + sourceGitRepositoryUri: 'https://community.opengroup.org/osdu/platform/system/schema-service.git' + destinationGitRepositoryUri: '$(SCHEMA_REPO)' + destinationGitRepositoryPersonalAccessToken: $(ACCESS_TOKEN) EOF diff --git a/docs/service-automation.md b/docs/service-automation.md index c2a26bca..7161d0aa 100644 --- a/docs/service-automation.md +++ b/docs/service-automation.md @@ -510,6 +510,23 @@ az pipelines variable-group create \ -ojson ``` +__Setup and Configure the ADO Library `Azure Service Release - crs-catalog-service`__ + +This variable group is the service specific variables necessary for testing and deploying the `crs-catalog` service. + +| Variable | Value | +|----------|-------| +| MAVEN_DEPLOY_POM_FILE_PATH | `drop/provider/crs-catalog-azure/crs-catalog-aks` | + +```bash +az pipelines variable-group create \ + --name "Azure Service Release - crs-catalog-service" \ + --authorize true \ + --variables \ + MAVEN_DEPLOY_POM_FILE_PATH="drop/provider/crs-catalog-azure/crs-catalog-aks" + -ojson +``` + __Create the Chart Pipelines__ Create the pipelines and run things in this exact order. @@ -749,6 +766,8 @@ az pipelines create \ ``` + + 11. Add a Pipeline for __register__ to deploy the Register Service. _Repo:_ `register` @@ -812,3 +831,18 @@ az pipelines create \ --yaml-path /devops/azure/pipeline.yml \ -ojson ``` +15. Add a Pipeline for __crs-catalog__ to deploy the CRS-Catalog Service. + + _Repo:_ `crs-catalog-service` + _Path:_ `/devops/azure/pipeline.yml` + _Validate:_ https:///api/crs/catalog/swagger-ui.html is alive. + +```bash +az pipelines create \ + --name 'service-crs-catalog' \ + --repository crs-catalog-service \ + --branch master \ + --repository-type tfsgit \ + --yaml-path /devops/azure/pipeline.yml \ + -ojson +``` \ No newline at end of file diff --git a/docs/service-onboarding.md b/docs/service-onboarding.md index e0ceb9da..85410374 100644 --- a/docs/service-onboarding.md +++ b/docs/service-onboarding.md @@ -61,4 +61,4 @@ Once the service is passing both Gitlab and ADO pipelines, it has to be properly - (Optional) Create a video walkthrough explaining the process of deploying the service. ## Release -**Coming soon** \ No newline at end of file +**Coming soon** -- GitLab From b8ccb5548a1da99d7a79c7e54bd10504f2feea73 Mon Sep 17 00:00:00 2001 From: Nicholas Karsky Date: Thu, 14 Jan 2021 16:39:20 -0500 Subject: [PATCH 2/2] Added service principal error section --- docs/faq.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/faq.md b/docs/faq.md index 10675314..3fa7d8b3 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -27,6 +27,10 @@ When you are deploying via terraform, once you pick a name for the terraform scr This is likely an issue with the `Application.ReadWrite.OwnedBy` permissions that is required by the service principal `osdu-mvp-[your unique here]-terraform`. Please verify that the service principal has been granted the permission and that the permission has recieved admin consent. +## My Service Principal is running into permission errors + +This is most likely a problem with the permission of the service principal that is running the deployment. The service principal that is running the deployment must have permissions to to create other service principals. If it doesn't have this permission, it might be a limitation of your AAD tenant configuration. Please discuss with your AAD tenant provider to see if permission can be granted. + # Infrastructure Provisioning Questions -- GitLab