Merge pull request #76 from nasa/develop

Develop
nasa · Apr 10, 2022 · 33abb58 · 33abb58
2 parents bded3b4 + 3cfa512
commit 33abb58
Show file tree

Hide file tree

Showing 45 changed files with 769 additions and 547 deletions.
diff --git a/.gitignore b/.gitignore
@@ -203,7 +203,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-.idea/
+#.idea/
 
 ######################################################################
 # JetBrains IDEs

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/opera-pcm.iml b/.idea/opera-pcm.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/cluster_provisioning/death-valley/versions.tf b/cluster_provisioning/death-valley/versions.tf
@@ -1,12 +1,12 @@
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.0.11"
 
   required_providers {
     # TODO: remove this pin once this ticket is resolved:
     #   https://github.com/hashicorp/terraform-provider-aws/issues/10297
     aws = {
-      source = "hashicorp/aws"
-      version = "2.63"
+      source  = "hashicorp/aws"
+      version = "2.70.1"
     }
     null = {
       source = "hashicorp/null"

diff --git a/cluster_provisioning/dev-e2e-baseline-pge/variables.tf b/cluster_provisioning/dev-e2e-baseline-pge/variables.tf
@@ -354,11 +354,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220318-R1.0.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "R1.0.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev-e2e-baseline-pge/versions.tf b/cluster_provisioning/dev-e2e-baseline-pge/versions.tf
diff --git a/cluster_provisioning/dev-e2e-baseline-pge/versions.tf b/cluster_provisioning/dev-e2e-baseline-pge/versions.tf
@@ -0,0 +1 @@
+../modules/common/versions.tf
diff --git a/cluster_provisioning/dev-e2e-event-misfire/variables.tf b/cluster_provisioning/dev-e2e-event-misfire/variables.tf
@@ -346,11 +346,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220318-R1.0.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "R1.0.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev-e2e-event-misfire/versions.tf b/cluster_provisioning/dev-e2e-event-misfire/versions.tf
diff --git a/cluster_provisioning/dev-e2e-event-misfire/versions.tf b/cluster_provisioning/dev-e2e-event-misfire/versions.tf
@@ -0,0 +1 @@
+../modules/common/versions.tf
diff --git a/cluster_provisioning/dev-e2e-pge/variables.tf b/cluster_provisioning/dev-e2e-pge/variables.tf
@@ -392,11 +392,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220318-R1.0.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "R1.0.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev-e2e-pge/versions.tf b/cluster_provisioning/dev-e2e-pge/versions.tf
diff --git a/cluster_provisioning/dev-e2e-pge/versions.tf b/cluster_provisioning/dev-e2e-pge/versions.tf
@@ -0,0 +1 @@
+../modules/common/versions.tf
diff --git a/cluster_provisioning/dev-e2e/variables.tf b/cluster_provisioning/dev-e2e/variables.tf
@@ -346,11 +346,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220318-R1.0.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "R1.0.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev-releaser/versions.tf b/cluster_provisioning/dev-releaser/versions.tf
diff --git a/cluster_provisioning/dev-releaser/versions.tf b/cluster_provisioning/dev-releaser/versions.tf
@@ -0,0 +1 @@
+../modules/common/versions.tf
diff --git a/cluster_provisioning/dev-restore-snapshot/variables.tf b/cluster_provisioning/dev-restore-snapshot/variables.tf
@@ -346,11 +346,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220208-develop-ER2.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "1.0.0-er.2.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev/.terraform.lock.hcl b/cluster_provisioning/dev/.terraform.lock.hcl
diff --git a/cluster_provisioning/dev/variables.tf b/cluster_provisioning/dev/variables.tf
@@ -346,11 +346,11 @@ variable "lambda_log_retention_in_days" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220208-develop-ER2.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "1.0.0-er.2.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "crid" {

diff --git a/cluster_provisioning/dev/versions.tf b/cluster_provisioning/dev/versions.tf
diff --git a/cluster_provisioning/dev/versions.tf b/cluster_provisioning/dev/versions.tf
@@ -0,0 +1 @@
+../modules/common/versions.tf
diff --git a/cluster_provisioning/ebs-snapshot/variables.tf b/cluster_provisioning/ebs-snapshot/variables.tf
@@ -13,7 +13,7 @@ variable "profile" {
 }
 
 variable "verdi_release" {
-  #default = "v4.0.1-beta.8"
+  #default = "v4.0.1-beta.8-oraclelinux"
 }
 
 variable "registry_release" {
@@ -25,11 +25,11 @@ variable "logstash_release" {
 }
 
 variable "pge_snapshots_date" {
-  default = "20220208-develop-ER2.0"
+  default = "20220401-1.0.0-er.3.0"
 }
 
 variable "pge_release" {
-  default = "v1.0.0-er.2.0"
+  default = "1.0.0-er.3.0"
 }
 
 variable "private_key_file" {