Open release/olive.master (#53)

* Olive version bumps and refactoring

* ci_openedx_actions_tutor_plugin_enable_k8s_deploy_tasks_version: v1

* only one NAT gateway

* print mongod service status

* EDX_PLATFORM_VERSION=open-release/olive.master

* version bumps

* bump to mysql8.0

cookiecutter.json

@@ -29,8 +29,8 @@
     "stack_add_remote_mongodb": ["Y", "N"],
     "stack_add_remote_redis":  ["Y", "N"],
     "environment_add_aws_ses":  ["Y", "N"],
-    "ci_build_tutor_version": "14.2.3",
-    "ci_build_tutor_mfe_version": "14.0.2",
+    "ci_build_tutor_version": "15.3.8",
+    "ci_build_tutor_mfe_version": "15.0.7",
     "ci_build_kubectl_version": "1.27",
     "kubernetes_cluster_version": "1.27",
     "ci_build_theme_repository": "edx-theme-example",
@@ -42,7 +42,7 @@
     "ci_build_xblock_org": "openedx",
     "ci_build_xblock_repository": "edx-ora2",
     "ci_build_xblock_ref": "master",
-    "ci_deploy_open_edx_version": "nutmeg.3",
+    "ci_deploy_open_edx_version": "olive.4",
     "ci_deploy_install_backup_plugin": ["N", "Y"],
     "ci_deploy_install_credentials_server": ["N", "Y"],
     "ci_deploy_install_discovery_service": ["Y", "N"],
@@ -58,36 +58,37 @@
     "ci_deploy_EMAIL_PORT": 587,
     "ci_deploy_EMAIL_USE_TLS": "true",
     "ci_actions_setup_build_action_version": "v2.5.0",
-    "ci_actions_amazon_ecr_login_version": "v1.5.3",
+    "ci_actions_amazon_ecr_login_version": "v1.6.0",
     "ci_actions_checkout_version": "v3",
     "ci_actions_configure_aws_credentials_version": "v2",
-    "ci_openedx_actions_tutor_k8s_init_version": "v1.0.8",
+    "ci_openedx_actions_tutor_k8s_init_version": "v1.0.9",
     "ci_openedx_actions_tutor_k8s_configure_autoscaling_version": "v0.0.1",
     "ci_openedx_actions_tutor_k8s_configure_edx_secret_version": "v1.0.0",
     "ci_openedx_actions_tutor_k8s_configure_edx_admin": "v1.0.2",
     "ci_openedx_actions_tutor_k8s_configure_edx_set_theme": "v0.1.1",
     "ci_openedx_actions_tutor_k8s_configure_jwt_version": "v1.0.0",
     "ci_openedx_actions_tutor_k8s_configure_mysql_version": "v1.0.2",
+    "ci_openedx_actions_tutor_k8s_configure_ses_version": "v1",
     "ci_openedx_actions_tutor_k8s_configure_mongodb_version": "v1.0.1",
     "ci_openedx_actions_tutor_k8s_configure_redis_version": "v1.0.0",
     "ci_openedx_actions_tutor_k8s_configure_smtp_version": "v1.0.0",
     "ci_openedx_actions_tutor_print_dump": "v1.0.4",
     "ci_openedx_actions_tutor_plugin_build_backup_version": "v0.1.7",
     "ci_openedx_actions_tutor_plugin_build_credentials_version": "v1.0.0",
     "ci_openedx_actions_tutor_plugin_build_license_manager_version": "v0.0.2",
-    "ci_openedx_actions_tutor_plugin_build_openedx_version": "v1.0.2",
+    "ci_openedx_actions_tutor_plugin_build_openedx_version": "v1.0.3",
     "ci_openedx_actions_tutor_plugin_build_openedx_add_requirement_version": "v1.0.7",
     "ci_openedx_actions_tutor_plugin_build_openedx_add_theme_version": "v1.0.2",
-    "ci_openedx_actions_tutor_plugin_enable_backup_version": "v0.0.10",
-    "ci_openedx_actions_tutor_plugin_enable_credentials_version": "v1.0.0",
-    "ci_openedx_actions_tutor_plugin_enable_discovery_version": "v1.0.1",
-    "ci_openedx_actions_tutor_plugin_enable_ecommerce_version": "v1.0.2",
+    "ci_openedx_actions_tutor_plugin_enable_backup_version": "v0.0.11",
+    "ci_openedx_actions_tutor_plugin_enable_credentials_version": "v1.0.1",
+    "ci_openedx_actions_tutor_plugin_enable_discovery_version": "v1.0.2",
+    "ci_openedx_actions_tutor_plugin_enable_ecommerce_version": "v1.0.4",
     "ci_openedx_actions_tutor_plugin_enable_forum_version": "v1.0.1",
-    "ci_openedx_actions_tutor_plugin_enable_k8s_deploy_tasks_version": "v0.0.1",
+    "ci_openedx_actions_tutor_plugin_enable_k8s_deploy_tasks_version": "v1",
     "ci_openedx_actions_tutor_plugin_enable_license_manager_version": "v0.0.3",
-    "ci_openedx_actions_tutor_plugin_enable_notes_version": "v1.0.2",
-    "ci_openedx_actions_tutor_plugin_enable_s3_version": "v1.0.2",
-    "ci_openedx_actions_tutor_plugin_enable_xqueue_version": "v1.0.0",
+    "ci_openedx_actions_tutor_plugin_enable_notes_version": "v1.0.4",
+    "ci_openedx_actions_tutor_plugin_enable_s3_version": "v1.0.7",
+    "ci_openedx_actions_tutor_plugin_enable_xqueue_version": "v1.0.2",
     "eks_hosting_group_instance_type": "t3.large",
     "eks_create_kms_key": ["Y", "N"],
     "eks_hosting_group_min_size": 0,
@@ -104,9 +105,9 @@
     "mysql_username": "root",
     "mysql_port": 3306,
     "mysql_engine": "mysql",
-    "mysql_family": "mysql5.7",
-    "mysql_major_engine_version": "5.7",
-    "mysql_engine_version": "5.7.38",
+    "mysql_family": "mysql8.0",
+    "mysql_major_engine_version": "8.0",
+    "mysql_engine_version": "8.0.33",
     "mysql_allocated_storage": 10,
     "mysql_create_random_password": "true",
     "mysql_iam_database_authentication_enabled": "false",
@@ -127,7 +128,7 @@
     "terraform_aws_modules_eks": "19.4",
     "terraform_aws_modules_iam": "~> 5.9",
     "terraform_aws_modules_iam_assumable_role_with_oidc": "5.10",
-    "terraform_aws_modules_rds": "5.2",
+    "terraform_aws_modules_rds": "5.9",
     "terraform_aws_modules_s3": "3.6",
     "terraform_aws_modules_sg": "4.16",
     "terraform_aws_modules_vpc": "3.18",

{{cookiecutter.github_repo_name}}/.github/workflows/deploy-{{cookiecutter.environment_name}}.yml

@@ -121,7 +121,6 @@ jobs:
           echo "AWS_ECR_REPOSITORY_CREDENTIALS=${AWS_ECR_URI}/openedx_credentials:latest" >> $GITHUB_ENV
           echo "AWS_ECR_REPOSITORY_LICENSE_MANAGER=${AWS_ECR_URI}/license_manager:latest" >> $GITHUB_ENV
           echo "AWS_ECR_REPOSITORY_OPENEDX=${AWS_ECR_URI}/openedx:latest" >> $GITHUB_ENV
-          echo "AWS_ECR_REPOSITORY_MFE=${AWS_ECR_URI}/mfe:latest" >> $GITHUB_ENV
 
       - name: Load environment specific settings (direct)
         shell: bash
@@ -130,14 +129,20 @@ jobs:
           cat ci/tutor-deploy/environments/{% raw %}${{ env.ENVIRONMENT_ID }}{% endraw %}/config.yml >> $GITHUB_ENV
 
       # note that values like $LMS_HOSTNAME come from this repo
-      # in /ci/tutor-deploy/environments/{{ cookiecutter.environment_name }}/config.yml
-      - name: Load additional environment specific settings
+      # in /ci/tutor-deploy/environments/staging/config.yml
+      #
+      - name: Set the Open edX runtime version and base domains
         shell: bash
         run: |-
           echo "TUTOR_LMS_HOST=$LMS_HOSTNAME" >> $GITHUB_ENV
           echo "TUTOR_CMS_HOST=$CMS_HOSTNAME" >> $GITHUB_ENV
           echo "TUTOR_DOCKER_IMAGE_OPENEDX=${AWS_ECR_REPOSITORY_OPENEDX}" >> $GITHUB_ENV
-          echo "TUTOR_MFE_DOCKER_IMAGE=${AWS_ECR_REPOSITORY_MFE}" >> $GITHUB_ENV
+
+      # see: https://docs.tutor.overhang.io/configuration.html
+      - name: Override backend service versions
+        shell: bash
+        run: |-
+          echo "TUTOR_DOCKER_IMAGE_ELASTICSEARCH=docker.io/elasticsearch:7.17.9" >> $GITHUB_ENV
 
       #------------------------------------------------------------------------
       # un-comment this to pin your deployment to a specific open edx release.
@@ -181,7 +186,7 @@ jobs:
         if: {% raw %}${{ env.ENABLE_DISCOVERY == 'true' }}{% endraw %}
         with:
           namespace: {% raw %}${{ env.NAMESPACE }}{% endraw %}
-          tutor-discovery-version: "14.0.2"
+          tutor-discovery-version: "15.0.0"
 
       - name: Enable tutor plugin - Credentials
         uses: openedx-actions/tutor-plugin-enable-credentials@{{ cookiecutter.ci_openedx_actions_tutor_plugin_enable_credentials_version }}
@@ -197,18 +202,21 @@ jobs:
         if: {% raw %}${{ env.ENABLE_XQUEUE == 'true' }}{% endraw %}
         with:
           namespace: {% raw %}${{ env.NAMESPACE }}{% endraw %}
+          tutor-xqueue-version: latest
 
       - name: Enable tutor plugin - Notes
         uses: openedx-actions/tutor-plugin-enable-notes@{{ cookiecutter.ci_openedx_actions_tutor_plugin_enable_notes_version }}
         if: {% raw %}${{ env.ENABLE_NOTES == 'true' }}{% endraw %}
         with:
           namespace: {% raw %}${{ env.NAMESPACE }}{% endraw %}
+          tutor-notes-version: "15.0.4"
 
       - name: Enable tutor plugin - Ecommerce
         uses: openedx-actions/tutor-plugin-enable-ecommerce@{{ cookiecutter.ci_openedx_actions_tutor_plugin_enable_ecommerce_version }}
         if: {% raw %}${{ env.ENABLE_ECOMMERCE == 'true' }}{% endraw %}
         with:
           namespace: {% raw %}${{ env.NAMESPACE }}{% endraw %}
+          tutor-ecommerce-version: latest
           secrets-s3-bucket-name: {% raw %}${{ env.S3_BUCKET_PREFIX }}{% endraw %}-secrets
           currency: USD
           enabled-payment-processors: '["stripe", "paypal"]'
@@ -226,7 +234,7 @@ jobs:
         uses: openedx-actions/tutor-plugin-enable-forum@{{ cookiecutter.ci_openedx_actions_tutor_plugin_enable_forum_version }}
         if: {% raw %}${{ env.ENABLE_FORUM == 'true' }}{% endraw %}
         with:
-          tutor-forum-version: "14.0.0"
+          tutor-forum-version: "15.1.1"
 
       - name: Enable tutor plugin - License Manager
         uses: openedx-actions/tutor-enable-plugin-license-manager@{{ cookiecutter.ci_openedx_actions_tutor_plugin_enable_license_manager_version }}
@@ -262,7 +270,7 @@ jobs:
 
       - name: Configure AWS SES
         if: {% raw %}${{ env.ENABLE_SMTP == 'true' }}{% endraw %}
-        uses: openedx-actions/tutor-k8s-configure-ses@v1
+        uses: openedx-actions/tutor-k8s-configure-ses@{{ cookiecutter.ci_openedx_actions_tutor_k8s_configure_ses_version }}
         with:
           namespace: {% raw %}${{ env.NAMESPACE }}{% endraw %}
 

{{cookiecutter.github_repo_name}}/terraform/stacks/modules/ec2_bastion/scripts/openedx-install-venv.sh

@@ -17,7 +17,7 @@ echo "*-------------------------------------------------------------------------
 
 PYTHON_VERSION=3.8.12
 EDX_PLATFORM_REPOSITORY=https://github.com/openedx/edx-platform
-EDX_PLATFORM_VERSION=open-release/nutmeg.master
+EDX_PLATFORM_VERSION=open-release/olive.master
 
 sudo apt update && sudo apt upgrade -y
 

{{cookiecutter.github_repo_name}}/terraform/stacks/modules/mongodb/scripts/install.sh

@@ -61,5 +61,6 @@ sudo chgrp -R mongodb /var/log/mongodb
 
 sudo systemctl enable mongod.service
 sudo systemctl start mongod.service
+sudo systemctl status mongod.service
 
 # install anything else we need

{{cookiecutter.github_repo_name}}/terraform/stacks/{{cookiecutter.global_platform_shared_resource_identifier}}/vpc/terragrunt.hcl

@@ -71,8 +71,8 @@ inputs = {
   # additional inter-AZ data transfer charges. We recommend choosing a
   # maintenance window for architecture changes in your Amazon VPC.
   enable_nat_gateway      = true
-  single_nat_gateway      = false
-  one_nat_gateway_per_az  = true
+  single_nat_gateway      = true
+  one_nat_gateway_per_az  = false
 
   # a bit of foreshadowing:
   # AWS EKS uses tags for identifying resources which it interacts.