Merge pull request #12 from peterrsongg/springboot

Update Terraform Files
oracle · Jun 13, 2022 · 3fcf559 · 3fcf559
2 parents 0582f3b + 90e479a
commit 3fcf559
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/MtdrSpring/backend/pom.xml b/MtdrSpring/backend/pom.xml
@@ -61,6 +61,36 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<!-- Keeps frontend and backend separate. -->
+			<plugin>
+				<groupId>com.github.eirslett</groupId>
+				<artifactId>frontend-maven-plugin</artifactId>
+				<!-- Use the latest released version:
+                https://repo1.maven.org/maven2/com/github/eirslett/frontend-maven-plugin/ -->
+				<version>1.9.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>.</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf
@@ -8,7 +8,7 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" {
     ]
     subnet_id = oci_core_subnet.endpoint.id
   }
-  kubernetes_version  = "v1.20.8"
+  kubernetes_version  = "v1.23.4"
   name                = "mtdrworkshopcluster"
   vcn_id              = oci_core_vcn.okevcn.id
   #optional
@@ -36,7 +36,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.mtdrworkshop_cluster.id
   compartment_id     = var.ociCompartmentOcid
-  kubernetes_version = "v1.20.8"
+  kubernetes_version = "v1.23.4"
   name               = "Pool"
   #  node_shape="VM.Standard2.4"
   #  node_shape         = "VM.Standard.B2.1"

diff --git a/MtdrSpring/terraform/database.tf b/MtdrSpring/terraform/database.tf
@@ -11,7 +11,7 @@ resource "random_password" "database_admin_password" {
   length  = 12
   upper   = true
   lower   = true
-  number  = true
+  numeric  = true
   special = false
   min_lower = "1"
   min_upper = "1"