diff --git a/devops/azure/chart/helm-config.yaml b/devops/azure/chart/helm-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..dedc3dbf8b63a948d7d2fb2b6e907644367837b2 --- /dev/null +++ b/devops/azure/chart/helm-config.yaml @@ -0,0 +1,19 @@ +# This file contains the essential configs for the osdu on azure helm chart +global: + + # Service(s) Replica Count + replicaCount: 2 + +################################################################################ +# Specify the Gitlab branch being used for image creation +# ie: community.opengroup.org:5555/osdu/platform/system/storage/{{ .Values.global.branch }}/storage:latest +# +image: + repository: #{container-registry}#.azurecr.io + branch: #{ENVIRONMENT_NAME}# + tag: #{Build.SourceVersion}# + +trajectory: + repository: #{container-registry}#.azurecr.io/trajectory + tag: v2 + pullPolicy: Always diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index ea6c67677a87b6ac4f8759885fc58f8bfd060bc5..194b9728cbd5cd393f1b9b40bdafe909794f7b95 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -23,12 +23,10 @@ spec: secretProviderClass: azure-keyvault - name: shared-data emptyDir: {} - imagePullSecrets: - - name: {{ .Values.image.imagePullSecrets }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.app.repository }}:{{ .Values.app.tag }}" - imagePullPolicy: {{ .Values.app.pullPolicy }} + image: {{ .Values.image.repository }}/{{ .Chart.Name }}-{{ .Values.image.branch }}:{{ .Values.image.tag | default .Chart.AppVersion }} + imagePullPolicy: Always ports: - containerPort: 8080 readinessProbe: @@ -54,30 +52,30 @@ spec: name: osdu-svc-properties key: ENV_KEYVAULT - name: AZURE_TENANT_ID - valueFrom: - configMapKeyRef: - name: osdu-svc-properties - key: ENV_TENANT_ID - - name: client-id valueFrom: secretKeyRef: - name: clientid - key: clientid - - name: AZURE_CLIENT_SECRET + name: active-directory + key: tenantid + - name: AZURE_CLIENT_ID valueFrom: secretKeyRef: - name: clientpassword - key: clientpassword - - name: aad_client_id + name: active-directory + key: principal-clientid + - name: AZURE_CLIENT_SECRET valueFrom: secretKeyRef: - name: appid - key: appid + name: active-directory + key: principal-clientpassword - name: appinsights_key valueFrom: secretKeyRef: - name: appinsights + name: central-logging key: appinsights + - name: aad_client_id + valueFrom: + secretKeyRef: + name: active-directory + key: application-appid - name: ENTITLEMENT_URL value: http://entitlements-azure/entitlements/v1 - name: azure_istioauth_enabled diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml index 18c5693370962cd0fb5b971feab312d635d5336c..69862f83b33ea3122246c8666301b305b6359db5 100644 --- a/devops/azure/chart/values.yaml +++ b/devops/azure/chart/values.yaml @@ -2,11 +2,7 @@ global: replicaCount: 1 image: - imagePullSecrets: acr - -app: - repository: community.opengroup.org:5555/osdu/platform/ref-and-helper/crs-conversion-app - branch: master + repository: ${CONTAINER_REGISTRY_NAME}.azurecr.io/crs-conversion-app tag: latest pullPolicy: Always diff --git a/devops/azure/pipeline.yml b/devops/azure/pipeline.yml new file mode 100644 index 0000000000000000000000000000000000000000..d9ed2a2f89f047abf877dac731e50da74f05521c --- /dev/null +++ b/devops/azure/pipeline.yml @@ -0,0 +1,68 @@ + +trigger: + batch: true + branches: + include: + - master + paths: + exclude: + - /**/*.md + - .gitignore + - /docs + +resources: + repositories: + - repository: FluxRepo + type: git + name: gitops-manifests + - repository: TemplateRepo + type: git + name: infra-azure-provisioning + +variables: + - group: 'Azure - OSDU' + - group: 'Azure - OSDU Secrets' + + - name: serviceName + value: "crs-conversion-service" + - name: chartPath + value: "devops/azure/chart" + - name: valuesFile + value: "devops/azure/chart/helm-config.yaml" + - name: 'MANIFEST_REPO' + value: $[ resources.repositories['FluxRepo'].name ] + - name: dockerFile + value: "devops/azure/Dockerfile" + +stages: + - template: /devops/build-stage.yml@TemplateRepo + parameters: + mavenGoal: 'package' + mavenPublishJUnitResults: true + serviceCoreMavenOptions: '' + mavenOptions: '' + copyFileContents: | + pom.xml + provider/crs-converter-azure/crs-converter-aks/pom.xml + provider/crs-converter-azure/crs-converter-aks/target/*.jar + devops/azure/Dockerfile + EsriCatalog/** + copyFileContentsToFlatten: '' + mavenSettingsFile: './maven/settings.xml' + serviceBase: ${{ variables.serviceName }} + testingRootFolder: 'testing' + chartPath: ${{ variables.chartPath }} + + - template: /devops/deploy-stages.yml@TemplateRepo + parameters: + serviceName: ${{ variables.serviceName }} + chartPath: ${{ variables.chartPath }} + valuesFile: ${{ variables.valuesFile }} + dockerFile: ${{ variables.dockerFile }} + testCoreMavenPomFile: '' + testCoreMavenOptions: '' + skipDeploy: ${{ variables.SKIP_DEPLOY }} + skipTest: 'true' + providers: + - name: Azure + environments: ['dev'] diff --git a/provider/crs-converter-azure/crs-converter-aks/pom.xml b/provider/crs-converter-azure/crs-converter-aks/pom.xml index 4ddc545bab5586c8d90971e86a30b6774d9ba69c..352b31671daab17f2674634f603891561e39fd66 100644 --- a/provider/crs-converter-azure/crs-converter-aks/pom.xml +++ b/provider/crs-converter-azure/crs-converter-aks/pom.xml @@ -22,7 +22,7 @@ </prerequisites> <artifactId>crs-converter-aks</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <name>crs-converter-aks</name> <description>CRS converter service Azure Kubernetes Deployment</description>