Merge branch 'azure-helm-config-change' into 'master'

Azure - Changes to helm Config

See merge request !33

devops/azure/chart/helm-config.yaml

@@ -17,3 +17,18 @@ trajectory:
   repository: #{container-registry}#.azurecr.io/trajectory
   tag: v2
   pullPolicy: Always  
+
+service:
+  type: ClusterIP
+  port: 80
+  targetport: 8080
+  
+application:
+  port: 8080
+  
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
\ No newline at end of file

devops/azure/development-pipeline.yml

@@ -39,8 +39,8 @@ stages:
     parameters:
       mavenGoal: 'package'
       mavenPublishJUnitResults: true
-      serviceCoreMavenOptions: '-P crs-converter-core --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
-      mavenOptions: '-P crs-converter-azure --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+      serviceCoreMavenOptions: '-pl crs-converter-core --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+      mavenOptions: '-pl provider/crs-converter-azure/crs-converter-aks --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
       copyFileContents: |
         pom.xml
         provider/crs-converter-azure/crs-converter-aks/maven/settings.xml

devops/azure/pipeline.yml

@@ -39,8 +39,8 @@ stages:
     parameters:
       mavenGoal: 'package'
       mavenPublishJUnitResults: true
-      serviceCoreMavenOptions: '-P crs-converter-core --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
-      mavenOptions: '-P crs-converter-azure --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+      serviceCoreMavenOptions: '-P crs-conversion-service-core --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+      mavenOptions: '-P crs-conversion-service-azure --settings .mvn/community-maven.settings.xml -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
       copyFileContents: |
         pom.xml
         maven/settings.xml

testing/crs_converter_test_azure/pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>org.opengroup.osdu.crs-converter-service</groupId>
-        <artifactId>crs-converter-service</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <properties>
-        <app.version>1</app.version>
-        <app.id>crs-converter-aks</app.id>
-        <azure.version>2.3.2</azure.version>
-    </properties>
-
-    <prerequisites>
-        <maven>3.1.0</maven>
-    </prerequisites>
-
-    <artifactId>crs-converter-aks-test</artifactId>
-    <version>1.0.1.1-SNAPSHOT</version>
-    <name>crs-converter-aks-test</name>
-    <description>CRS converter service Azure Kubernetes Deployment for test</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opengroup.osdu.crs-converter-service</groupId>
-            <artifactId>crs-converter-core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-active-directory-spring-boot-starter</artifactId>
-            <version>${azure.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>