Merge branch 'tests43' into tests42

SocialGouv · Jul 24, 2023 · 7c666f6 · 7c666f6
2 parents 56a883c + e925d99
commit 7c666f6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1,11 +1,12 @@
-sonar.issue.ignore.multicriteria.e1.ruleKey=javascript:S1117
-sonar.issue.ignore.multicriteria.e2.ruleKey=javascript:S4624
-sonar.issue.ignore.multicriteria.e3.ruleKey=javascript:S1126
-sonar.issue.ignore.multicriteria.e4.ruleKey=javascript:S2310
-sonar.issue.ignore.multicriteria.e5.ruleKey=javascript:S1488
-sonar.issue.ignore.multicriteria.e6.ruleKey=javascript:S1301
-sonar.issue.ignore.multicriteria.e7.ruleKey=javascript:S3776
-sonar.issue.ignore.multicriteria.e8.ruleKey=javascript:S125
-sonar.issue.ignore.multicriteria.e9.ruleKey=javascript:S6353
-sonar.issue.ignore.multicriteria.e10.ruleKey=javascript:S1481
-sonar.issue.ignore.multicriteria.e11.ruleKey=docker:S6476
+sonar.issue.ignore.multicriteria=S1117,S4624,S1126,S2310,S1488,S1301,S3776,S125,S6353,S1481,S6476
+sonar.issue.ignore.multicriteria.S1117.ruleKey=javascript:S1117
+sonar.issue.ignore.multicriteria.S4624.ruleKey=javascript:S4624
+sonar.issue.ignore.multicriteria.S1126.ruleKey=javascript:S1126
+sonar.issue.ignore.multicriteria.S2310.ruleKey=javascript:S2310
+sonar.issue.ignore.multicriteria.S1488.ruleKey=javascript:S1488
+sonar.issue.ignore.multicriteria.S1301.ruleKey=javascript:S1301
+sonar.issue.ignore.multicriteria.S3776.ruleKey=javascript:S3776
+sonar.issue.ignore.multicriteria.S125.ruleKey=javascript:S125
+sonar.issue.ignore.multicriteria.S6353.ruleKey=javascript:S6353
+sonar.issue.ignore.multicriteria.S1481.ruleKey=javascript:S1481
+sonar.issue.ignore.multicriteria.S6476.ruleKey=docker:S6476
diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.dev.yaml
@@ -557,7 +557,7 @@ kind: Cluster
 metadata:
   name: pg-hasura
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-hasura
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -619,7 +619,7 @@ kind: Cluster
 metadata:
   name: pg-keycloak
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-keycloak
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -681,7 +681,7 @@ kind: Pooler
 metadata:
   name: pg-hasura-rw
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-hasura
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -716,7 +716,7 @@ kind: Pooler
 metadata:
   name: pg-keycloak-rw
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-keycloak
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6

diff --git a/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml b/packages/kontinuous/tests/__snapshots__/extends-ovh.prod.yaml
@@ -558,7 +558,7 @@ kind: Cluster
 metadata:
   name: pg-hasura
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-hasura
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -620,7 +620,7 @@ kind: Cluster
 metadata:
   name: pg-keycloak
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-keycloak
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -736,7 +736,7 @@ kind: Pooler
 metadata:
   name: pg-hasura-rw
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-hasura
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6
@@ -771,7 +771,7 @@ kind: Pooler
 metadata:
   name: pg-keycloak-rw
   labels:
-    helm.sh/chart: cnpg-cluster-1.7.3
+    helm.sh/chart: cnpg-cluster-1.8.0
     app.kubernetes.io/name: pg-keycloak
     app.kubernetes.io/instance: release-name
     app.kubernetes.io/version: 14.5-6

diff --git a/plugins/contrib/patches/00.0-values-patches.js b/plugins/contrib/patches/00.0-values-patches.js
@@ -29,7 +29,7 @@ module.exports = (manifests, _options, { values }) => {
       if (!key.startsWith("~")) {
         continue
       }
-      let value = scopedValues[key]
+      let value
       let match
       if (
         typeof scopedValues[key] === "object" &&