Merge pull request #6 from belodetek/ab77/operational

Unzoner 2023 updates
belodetek · Apr 23, 2023 · 5582b82 · 5582b82
2 parents 8da871d + c57ba1e
commit 5582b82
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 18 deletions.
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
@@ -10,7 +10,7 @@ jobs:
     name: Flowzone
     uses: product-os/flowzone/.github/workflows/flowzone.yml@master
     secrets:
-      FLOWZONE_TOKEN: ${{ secrets.FLOWZONE_TOKEN }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
     with:

diff --git a/README.md b/README.md
@@ -123,21 +123,21 @@
       FrontendAppBundle=${frontend_app_bundle} \
       AppIds=${RESIN_APP_ID} \
       DomainName=${DNS_DOMAIN} \
-      VPCTemplate=true \
-      KMSTemplate=true \
-      PasswordTemplate=true \
       SecretsTemplate=true \
-      LambdaTemplate=true \
-      AlertTemplate=true \
-      R53Template=true \
-      S3Template=true \
-      IAMTemplate=true \
-      CloudWatchTemplate=true \
-      ACMTemplate=true \
-      SGTemplate=true \
-      RDSTemplate=true \
-      ECTemplate=true \
-      EBSTemplate=true \
+      S3Template=false \
+      IAMTemplate=false \
+      VPCTemplate=false \
+      KMSTemplate=false \
+      LambdaTemplate=false \
+      PasswordTemplate=false \
+      R53Template=false \
+      AlertTemplate=false \
+      CloudWatchTemplate=false \
+      SGTemplate=false \
+      ACMTemplate=false \
+      RDSTemplate=false \
+      ECTemplate=false \
+      EBSTemplate=false \
       --tags \
       Name=${stack_name} \
       --no-execute-changeset

diff --git a/aws-cf-templates b/aws-cf-templates
diff --git a/main-template.yml b/main-template.yml
@@ -654,7 +654,7 @@ Resources:
         DBBackupRetentionPeriod: !Sub '${RetentionInDays}'
         DBMasterUsername: 'admin'
         DBMasterUserPassword: !Sub '${RDSPassword.Secret}'
-        EngineVersion: 8.0.30
+        EngineVersion: 8.0.32
         SubDomainNameWithDot: !Sub 'mysql-${AWS::StackName}.'
         DBMultiAZ: false
       NotificationARNs:
@@ -853,7 +853,7 @@ Resources:
         - HasAlert
         - !GetAtt [ AlertStack, Outputs.StackName ]
         - !Ref 'AWS::NoValue'
-        EngineVersion: '5.0.0'
+        EngineVersion: '7.0'
         NumReplicas: 0
         CacheNodeType: !Ref 'CacheNodeType'
         TransitEncryption: !Sub '${TransitEncryption}'

diff --git a/patch/aws-cf-templates/state/rds-mysql.yaml b/patch/aws-cf-templates/state/rds-mysql.yaml
@@ -0,0 +1,13 @@
+diff --git a/state/rds-mysql.yaml b/state/rds-mysql.yaml
+index df840b9..a77bebc 100644
+--- a/state/rds-mysql.yaml
++++ b/state/rds-mysql.yaml
+@@ -133,7 +133,7 @@ Parameters:
+   EngineVersion:
+     Description: 'MySQL version.'
+     Type: String
+-    AllowedValues: ['8.0.32', '8.0.28', '8.0.27', '8.0.26', '8.0.25', '8.0.23', '5.7.41', '5.7.38', '5.7.37', '5.7.34', '5.7.33'] # aws rds describe-db-engine-versions --engine mysql --query "DBEngineVersions[].EngineVersion"
++    #AllowedValues: ['8.0.32', '8.0.28', '8.0.27', '8.0.26', '8.0.25', '8.0.23', '5.7.41', '5.7.38', '5.7.37', '5.7.34', '5.7.33'] # aws rds describe-db-engine-versions --engine mysql --query "DBEngineVersions[].EngineVersion"
+   EnableIAMDatabaseAuthentication:
+     Description: 'Enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.IAMDBAuth.html).'
+     Type: String
diff --git a/patch/eb-python-flask/.ebextensions/python.config b/patch/eb-python-flask/.ebextensions/python.config
@@ -0,0 +1,20 @@
+diff --git a/.ebextensions/python.config b/.ebextensions/python.config
+index e74278c..ce45984 100644
+--- a/.ebextensions/python.config
++++ b/.ebextensions/python.config
+@@ -1,6 +1,6 @@
+ option_settings:
+-  aws:elasticbeanstalk:container:python:staticfiles:
+-    /static/: static/
++  aws:ec2:vpc:
++    AssociatePublicIpAddress: true
+   aws:elasticbeanstalk:application:environment:
+     FLASK_DEBUG: true
+     APP_VERSION: v1.2.0
+diff --git a/.ts b/.ts
+new file mode 100644
+index 0000000..7c80faf
+--- /dev/null
++++ b/.ts
+@@ -0,0 +1 @@
++1682179533