resolve conflict

eclipse-symphony · Jun 12, 2024 · 27eee25 · 27eee25
1 parent 3bdaa8c
commit 27eee25
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/k8s/config/oss/webhook/manifests.yaml b/k8s/config/oss/webhook/manifests.yaml
@@ -110,39 +110,39 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-workflow-symphony-v1-activation
+      path: /mutate-solution-symphony-v1-solutioncontainer
   failurePolicy: Fail
-  name: mactivation.kb.io
+  name: msolutioncontainer.kb.io
   rules:
   - apiGroups:
-    - workflow.symphony
+    - solution.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
     resources:
-    - activations
+    - solutioncontainers
   sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-solution-symphony-v1-solutioncontainer
+      path: /mutate-workflow-symphony-v1-activation
   failurePolicy: Fail
-  name: msolutioncontainer.kb.io
+  name: mactivation.kb.io
   rules:
   - apiGroups:
-    - solution.symphony
+    - workflow.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
     resources:
-    - solutioncontainers
+    - activations
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -338,40 +338,40 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-workflow-symphony-v1-activation
+      path: /validate-solution-symphony-v1-solutioncontainer
   failurePolicy: Fail
-  name: mactivation.kb.io
+  name: vsolutioncontainer.kb.io
   rules:
   - apiGroups:
-    - workflow.symphony
+    - solution.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
-    - activations
+    - solutioncontainers
   sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: webhook-service
       namespace: system
-      path: /validate-solution-symphony-v1-solutioncontainer
+      path: /validate-workflow-symphony-v1-activation
   failurePolicy: Fail
-  name: vsolutioncontainer.kb.io
+  name: mactivation.kb.io
   rules:
   - apiGroups:
-    - solution.symphony
+    - workflow.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
-    - DELETE
     resources:
-    - solutioncontainers
+    - activations
   sideEffects: None
 - admissionReviewVersions:
   - v1

diff --git a/packages/helm/symphony/templates/symphony-core/symphonyk8s.yaml b/packages/helm/symphony/templates/symphony-core/symphonyk8s.yaml
@@ -2751,39 +2751,39 @@ webhooks:
     service:
       name: '{{ include "symphony.fullname" . }}-webhook-service'
       namespace: '{{ .Release.Namespace }}'
-      path: /mutate-workflow-symphony-v1-activation
+      path: /mutate-solution-symphony-v1-solutioncontainer
   failurePolicy: Fail
-  name: mactivation.kb.io
+  name: msolutioncontainer.kb.io
   rules:
   - apiGroups:
-    - workflow.symphony
+    - solution.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
     resources:
-    - activations
+    - solutioncontainers
   sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: '{{ include "symphony.fullname" . }}-webhook-service'
       namespace: '{{ .Release.Namespace }}'
-      path: /mutate-solution-symphony-v1-solutioncontainer
+      path: /mutate-workflow-symphony-v1-activation
   failurePolicy: Fail
-  name: msolutioncontainer.kb.io
+  name: mactivation.kb.io
   rules:
   - apiGroups:
-    - solution.symphony
+    - workflow.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
     resources:
-    - solutioncontainers
+    - activations
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -2982,40 +2982,40 @@ webhooks:
     service:
       name: '{{ include "symphony.fullname" . }}-webhook-service'
       namespace: '{{ .Release.Namespace }}'
-      path: /validate-workflow-symphony-v1-activation
+      path: /validate-solution-symphony-v1-solutioncontainer
   failurePolicy: Fail
-  name: mactivation.kb.io
+  name: vsolutioncontainer.kb.io
   rules:
   - apiGroups:
-    - workflow.symphony
+    - solution.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
+    - DELETE
     resources:
-    - activations
+    - solutioncontainers
   sideEffects: None
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: '{{ include "symphony.fullname" . }}-webhook-service'
       namespace: '{{ .Release.Namespace }}'
-      path: /validate-solution-symphony-v1-solutioncontainer
+      path: /validate-workflow-symphony-v1-activation
   failurePolicy: Fail
-  name: vsolutioncontainer.kb.io
+  name: mactivation.kb.io
   rules:
   - apiGroups:
-    - solution.symphony
+    - workflow.symphony
     apiVersions:
     - v1
     operations:
     - CREATE
     - UPDATE
-    - DELETE
     resources:
-    - solutioncontainers
+    - activations
   sideEffects: None
 - admissionReviewVersions:
   - v1