Merge pull request validatedpatterns#247 from wolfganghuse/argo-pipel…

…ine-fix Fix ArgoCD pipelines
claudiol · Feb 16, 2024 · 0efbab4 · 0efbab4
2 parents ba15580 + 21ea588
commit 0efbab4
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/charts/datacenter/manuela-data-lake/templates/central-s3-store/kafka-to-s3-integration.yaml b/charts/datacenter/manuela-data-lake/templates/central-s3-store/kafka-to-s3-integration.yaml
@@ -116,4 +116,4 @@ spec:
                 return super.onCompletion();
             }
         }
-      name: Kafka2S3Route.java
+      name: Kafka2S3Route.java
diff --git a/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-anomaly-detection.yaml b/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-anomaly-detection.yaml
@@ -185,8 +185,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "{{ .Values.site.name }}-gitops-server.{{ .Values.global.pattern }}-{{ .Values.site.name }}.svc"
-
+      value: "{{ .Values.clusterGroup.name }}-gitops-server.{{ .Values.global.pattern }}-{{ .Values.clusterGroup.name }}.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-consumer.yaml b/charts/datacenter/pipelines/templates/pipelines/build-and-test-iot-consumer.yaml
@@ -186,8 +186,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "{{ .Values.site.name }}-gitops-server.{{ .Values.global.pattern }}-{{ .Values.site.name }}.svc"
-
+      value: "{{ .Values.clusterGroup.name }}-gitops-server.{{ .Values.global.pattern }}-{{ .Values.clusterGroup.name }}.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/tests/datacenter-pipelines-industrial-edge-factory.expected.yaml b/tests/datacenter-pipelines-industrial-edge-factory.expected.yaml
@@ -286,8 +286,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "factory-gitops-server.mypattern-factory.svc"
+      
   - name: test-all
     taskRef:
       name: tkn
@@ -518,8 +518,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "factory-gitops-server.mypattern-factory.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/tests/datacenter-pipelines-industrial-edge-hub.expected.yaml b/tests/datacenter-pipelines-industrial-edge-hub.expected.yaml
@@ -286,8 +286,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "datacenter-gitops-server.mypattern-datacenter.svc"
+      
   - name: test-all
     taskRef:
       name: tkn
@@ -518,8 +518,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "datacenter-gitops-server.mypattern-datacenter.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/tests/datacenter-pipelines-medical-diagnosis-hub.expected.yaml b/tests/datacenter-pipelines-medical-diagnosis-hub.expected.yaml
@@ -286,8 +286,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "hub-gitops-server.mypattern-hub.svc"
+      
   - name: test-all
     taskRef:
       name: tkn
@@ -518,8 +518,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.mypattern-example.svc"
-
+      value: "hub-gitops-server.mypattern-hub.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/tests/datacenter-pipelines-naked.expected.yaml b/tests/datacenter-pipelines-naked.expected.yaml
@@ -286,8 +286,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.industrial-edge-example.svc"
-
+      value: "testgroup-gitops-server.industrial-edge-testgroup.svc"
+      
   - name: test-all
     taskRef:
       name: tkn
@@ -518,8 +518,8 @@ spec:
       value: $(params.OPS_REVISION)
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
-      value: "example-gitops-server.industrial-edge-example.svc"
-
+      value: "testgroup-gitops-server.industrial-edge-testgroup.svc"
+      
   - name: test-all
     taskRef:
       name: tkn

diff --git a/tests/datacenter-pipelines-normal.expected.yaml b/tests/datacenter-pipelines-normal.expected.yaml
@@ -287,7 +287,7 @@ spec:
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
       value: "example-gitops-server.mypattern-example.svc"
-
+      
   - name: test-all
     taskRef:
       name: tkn
@@ -519,7 +519,7 @@ spec:
     - name: argocd-server
       #value: datacenter-gitops-server.industrial-edge-datacenter.svc
       value: "example-gitops-server.mypattern-example.svc"
-
+      
   - name: test-all
     taskRef:
       name: tkn