fix conflict

Signed-off-by: Griffin <prakritimandal611@gmail.com>
keptn · Mar 15, 2024 · bbeabcb · bbeabcb
1 parent 836a7d3
commit bbeabcb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -145,7 +145,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcontexts.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -265,7 +265,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcreationrequests.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2377,7 +2377,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnevaluations.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2445,6 +2445,8 @@ spec:
                 type: string
               evaluationDefinition:
                 type: string
+              failAction:
+                type: string
               retries:
                 default: 10
                 type: integer
@@ -2835,8 +2837,6 @@ spec:
                   The KeptnEvaluationDefinition can be
                   located in the same namespace as the KeptnEvaluation, or in the Keptn namespace.
                 type: string
-              failAction:
-                type: string
               retries:
                 default: 10
                 description: |-
@@ -6379,7 +6379,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptntasks.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh

diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -91,7 +91,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcontexts.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -211,7 +211,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcreationrequests.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2323,7 +2323,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnevaluations.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2391,6 +2391,8 @@ spec:
                 type: string
               evaluationDefinition:
                 type: string
+              failAction:
+                type: string
               retries:
                 default: 10
                 type: integer
@@ -2781,8 +2783,6 @@ spec:
                   The KeptnEvaluationDefinition can be
                   located in the same namespace as the KeptnEvaluation, or in the Keptn namespace.
                 type: string
-              failAction:
-                type: string
               retries:
                 default: 10
                 description: |-
@@ -6325,7 +6325,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptntasks.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh

diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -116,7 +116,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcontexts.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -237,7 +237,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnappcreationrequests.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2354,7 +2354,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptnevaluations.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
@@ -2422,6 +2422,8 @@ spec:
                 type: string
               evaluationDefinition:
                 type: string
+              failAction:
+                type: string
               retries:
                 default: 10
                 type: integer
@@ -2812,8 +2814,6 @@ spec:
                   The KeptnEvaluationDefinition can be
                   located in the same namespace as the KeptnEvaluation, or in the Keptn namespace.
                 type: string
-              failAction:
-                type: string
               retries:
                 default: 10
                 description: |-
@@ -6358,7 +6358,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
-    helm.sh/chart: lifecycle-operator-0.2.1
+    helm.sh/chart: lifecycle-operator-0.2.2
   name: keptntasks.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh