shortlink-common: fix work with env

Signed-off-by: Victor Login <batazor@evrone.com>
shortlink-org · Mar 18, 2023 · 9f87c6f · 9f87c6f
1 parent 33266e5
commit 9f87c6f
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 25 deletions.
diff --git a/ops/Helm/backstage/Chart.yaml b/ops/Helm/backstage/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/draft/chaos/Chart.yaml b/ops/Helm/draft/chaos/Chart.yaml
@@ -18,5 +18,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/draft/rook-ceph/Chart.yaml b/ops/Helm/draft/rook-ceph/Chart.yaml
@@ -14,7 +14,7 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../../../shortlink-common"
   - name: rook-ceph
     version: v1.11.1

diff --git a/ops/Helm/draft/teleport/Chart.yaml b/ops/Helm/draft/teleport/Chart.yaml
@@ -28,5 +28,5 @@ dependencies:
       - idp
       - teleport
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-api/Chart.yaml b/ops/Helm/shortlink-api/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-bot/Chart.yaml b/ops/Helm/shortlink-bot/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                         # It is the type of ch
 deprecated: false                                         # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-common/Chart.yaml b/ops/Helm/shortlink-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2                                   # The chart API version (requir
 appVersion: "1.0.0"                              # The version of the app that this contains (optional)
 name: shortlink-common                           # The name of the chart (required)
 description: Shortlink common templates          # A single-sentence description of this project (optional)
-version: 0.4.2                                   # A SemVer 2 version (required)
+version: 0.4.3                                   # A SemVer 2 version (required)
 kubeVersion: ">= 1.22.0 || >= v1.22.0-0"         # A SemVer range of compatible Kubernetes versions (optional)
 keywords:
   - shortlink

diff --git a/ops/Helm/shortlink-common/templates/deployment/_deployment_env.yaml b/ops/Helm/shortlink-common/templates/deployment/_deployment_env.yaml
@@ -3,14 +3,12 @@
 {{- define "shortlink-common.env" }}
   env:
     {{- range $key, $value := .env }}
-    {{- if and (eq $key "MQ_TYPE") (eq $value "true") }}
-    {{- if eq $value "rabbitmq" }}
-      {{- include "shortlink-common.env-rabbitmq" . | nindent 4 }}
-    {{- end }}
-    {{- end }}
     - name: {{ $key }}
       value: {{ $value | quote }}
     {{- end -}}
+    {{- if and (eq .env.MQ_ENABLED true) (eq .env.MQ_TYPE "rabbitmq") }}
+      {{- include "shortlink-common.env-rabbitmq" .env | nindent 4 }}
+    {{- end }}
 {{- end }}
 
 {{- define "shortlink-common.env-rabbitmq" }}

diff --git a/ops/Helm/shortlink-landing/Chart.yaml b/ops/Helm/shortlink-landing/Chart.yaml
@@ -20,5 +20,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-link/Chart.lock b/ops/Helm/shortlink-link/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: shortlink-common
   repository: file://../shortlink-common
-  version: 0.4.2
-digest: sha256:5798b3b0fb9090214e76615e46864aa610bf78991949157c165cd277b0f58eef
-generated: "2023-03-18T19:19:41.550716+01:00"
+  version: 0.4.3
+digest: sha256:bb7490c9365b7641b849d32ae7a4438812ce2dfe2e15b2195535ab3644d8aeba
+generated: "2023-03-18T21:58:23.108382+01:00"
diff --git a/ops/Helm/shortlink-link/Chart.yaml b/ops/Helm/shortlink-link/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-link/charts/shortlink-common-0.4.2.tgz b/ops/Helm/shortlink-link/charts/shortlink-common-0.4.2.tgz
diff --git a/ops/Helm/shortlink-link/charts/shortlink-common-0.4.3.tgz b/ops/Helm/shortlink-link/charts/shortlink-common-0.4.3.tgz
diff --git a/ops/Helm/shortlink-logger/Chart.yaml b/ops/Helm/shortlink-logger/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-metadata/Chart.yaml b/ops/Helm/shortlink-metadata/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                         # It is the type of ch
 deprecated: false                                         # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-next/Chart.yaml b/ops/Helm/shortlink-next/Chart.yaml
@@ -20,5 +20,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-notify/Chart.yaml b/ops/Helm/shortlink-notify/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-proxy/Chart.yaml b/ops/Helm/shortlink-proxy/Chart.yaml
@@ -19,5 +19,5 @@ type: application                                         # It is the type of ch
 deprecated: false                                         # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/shortlink-workflows/Chart.yaml b/ops/Helm/shortlink-workflows/Chart.yaml
@@ -18,5 +18,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/Helm/ui-kit/Chart.yaml b/ops/Helm/ui-kit/Chart.yaml
@@ -20,5 +20,5 @@ type: application                                # It is the type of chart (opti
 deprecated: false                                # Whether this chart is deprecated (optional, boolean)
 dependencies:
   - name: shortlink-common
-    version: 0.4.2
+    version: 0.4.3
     repository: "file://../shortlink-common"
diff --git a/ops/gitlab/pipelines/test/secret.yml b/ops/gitlab/pipelines/test/secret.yml
@@ -13,6 +13,7 @@ stages:
 # List of the variables: https://gitlab.com/gitlab-org/security-products/secret_detection#available-variables
 # How to set: https://docs.gitlab.com/ee/ci/yaml/#variables
 secret_detection:
+  stage: test
   needs: []
   artifacts:
     paths:

diff --git a/ops/gitlab/stages/test.yml b/ops/gitlab/stages/test.yml
@@ -21,7 +21,7 @@ DEPENDENCY:
   stage: test
   trigger:
     include:
-      - local: 'ops/gitlab/pipelines/test/dependency.yml'
+      - local: 'ops/gitlab/pipelines/test/security.yml'
     strategy: depend
   needs: []
   rules: