Merge branch 'master' of gitlab.sarex.io:infra/terraform

.gitlab-ci.yml

@@ -30,33 +30,6 @@ generate-pipeline:
     - if: '$CI_COMMIT_BRANCH == "master"'
     - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/'
 
-# Stage environment
-trigger-downstream-stage:
-  stage: trigger
-  needs:
-    - generate-pipeline
-  trigger:
-    include:
-      - artifact: .gitlab-ci.generated.yml
-        job: generate-pipeline
-    strategy: depend
-  variables:
-    TERRAFORM_IMAGE_NAME: cr.yandex/crp3ccidau046kdj8g9q/terraform/terragrunt:v9.10
-    YC_SERVICE_ACCOUNT_KEY_FILE: ${YC_SERVICE_ACCOUNT_KEY_FILE}
-    YC_CLOUD_ID: ${YC_CLOUD_ID}
-    YC_STAGE_FOLDER_ID: ${YC_STAGE_FOLDER_ID}
-    YC_PROD_FOLDER_ID: ${YC_PROD_FOLDER_ID}
-    YC_PREPROD_FOLDER_ID: ${YC_PREPROD_FOLDER_ID}
-    S3_ACCESS_KEY: ${S3_ACCESS_KEY}
-    S3_SECRET_KEY: ${S3_SECRET_KEY}
-    S3_STATE_BUCKET: ${S3_STATE_BUCKET}
-    AWS_ACCESS_KEY_ID: ${S3_ACCESS_KEY}
-    AWS_SECRET_ACCESS_KEY: ${S3_SECRET_KEY}
-    TARGET_ENV: "stage"
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_BRANCH == "stage"'
-    - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/'
 
 # Prod environment
 trigger-downstream-prod:
@@ -82,4 +55,8 @@ trigger-downstream-prod:
     AWS_SECRET_ACCESS_KEY: ${S3_PROD_SECRET_KEY}
     TARGET_ENV: "prod"
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: '$CI_COMMIT_BRANCH =~ /^feature\/.*/'
+
+##

infrastructure.yaml

@@ -44,6 +44,30 @@ environments:
         lifecycle:
           ignore_changes: true
 
+      - name: valkey-secret
+        namespace: documentations-prod
+        type: opaque
+        custom_keys:
+          url: "host:port"
+        random_keys:
+          host:
+            length: 5
+            special: false
+          port:
+            length: 5
+            special: false
+          cert:
+            length: 5
+            special: false
+          login:
+            length: 5
+            special: false   
+          password:
+            length: 5
+            special: false   
+        lifecycle:
+          ignore_changes: true          
+
       # # Пример секрета для другой базы данных (test_db/test)
       # - name: test-db-secret
       #   namespace: pulse