FDN-4233: revert sources order for argo cd UI visibility (#959)

Co-authored-by: Miguel Arias <[email protected]>

Author: arias-m

Jenkinsfile

@@ -1,8 +1,5 @@
 @Library('lib-jenkins-pipeline') _
 
-
-//  => Mandatory to use a definition before the node or Blue Ocean doesn't show the expected info
-def newTagEveryRunMainBranch = "yes" // Force a new version and deploy clicking on Build Now in Jenkins
 def sbtOnMain = "no"
 
 // we can remove the pod_template block if we end up having only one template
@@ -24,7 +21,7 @@ podTemplate(
 
       // => tagging function to identify what actions to take depending on the nature of the changes
       stage ('tagging') {
-        semversion = taggingv2(newTagEveryMainRun: "${newTagEveryRunMainBranch}")
+        semversion = taggingv2()
         println(semversion)
       }
 

deploy/apibuilder-api/app.yaml

@@ -4,68 +4,64 @@ metadata:
   name: apibuilder-api
   namespace: argocd
   finalizers:
-    - resources-finalizer.argocd.argoproj.io
+  - resources-finalizer.argocd.argoproj.io
+  labels:
+    team: foundation
 spec:
   destination:
     namespace: apicollective
     server: 'https://kubernetes.default.svc'
   ignoreDifferences:
-    - group: networking.istio.io
-      kind: VirtualService
-      jsonPointers:
-      - /spec/http/0
-    - group: datadoghq.com
-      kind: DatadogMonitor
-      jqPathExpressions:
-      - .spec.tags
-    # Required if enable KEDA autoscaler to avoid conflicts between 
-    # ArgoCD and HPA managing the number of replicas
-    - group: "apps"
-      kind: "Deployment"
-      jsonPointers:
-      - /spec/replicas
-    - group: argoproj.io
-      kind: Rollout
-      jsonPointers:
-      - /spec/replicas
+  - group: networking.istio.io
+    kind: VirtualService
+    jsonPointers:
+    - /spec/http/0
+  - group: "apps"
+    kind: "Deployment"
+    jsonPointers:
+    - /spec/replicas
+  - group: argoproj.io
+    kind: Rollout
+    jsonPointers:
+    - /spec/replicas
     # Ignore cluster IP changes
-    - group: ""
-      kind: Service
-      jsonPointers:
-      - /spec/clusterIP
+  - group: ""
+    kind: Service
+    jsonPointers:
+    - /spec/clusterIP
     #This is a common issue with Argo Rollouts and Istio DestinationRule resources. 
     #The rollouts-pod-template-hash label is automatically managed 
     #by the Argo Rollouts controller and gets added dynamically during rollout operations
-    - group: networking.istio.io
-      kind: DestinationRule
-      jqPathExpressions:
-      - .spec.subsets[].labels["rollouts-pod-template-hash"]
+  - group: networking.istio.io
+    kind: DestinationRule
+    jqPathExpressions:
+    - .spec.subsets[].labels["rollouts-pod-template-hash"]
     ###################################
   sources:
-    - repoURL: '[email protected]:flowcommerce/generic-charts.git'
-      path: charts/flow-generic
-      targetRevision: v2.0.0
-      helm:
-        parameters:
-          - name: deployments.live.version
-            value: "0.16.59"
-        valueFiles:
-          - $values/deploy/apibuilder-api/values.yaml
-    - repoURL: '[email protected]:apicollective/apibuilder.git'
-      targetRevision: main  
-      ref: values
+  - repoURL: '[email protected]:apicollective/apibuilder.git'
+    targetRevision: main
+    ref: values
 
+  - repoURL: '[email protected]:flowcommerce/generic-charts.git'
+    path: charts/flow-generic
+    targetRevision: v2.0.0
+    helm:
+      parameters:
+      - name: deployments.live.version
+        value: "Jenkins_will_update_the_version"
+      valueFiles:
+      - $values/deploy/apibuilder-api/values.yaml
   project: production
 
   ## Keep it commenting out during the transition process to avoid auto
   ## sync applying changes automatically until transition is completed.
   syncPolicy:
     syncOptions:
-      - RespectIgnoreDifferences=true
-      - CreateNamespace=false       # Namespace exists
-      - ApplyOutOfSyncOnly=true    # Only sync out-of-sync resources
-      - ServerSideApply=true       # Use server-side apply
-      - PruneLast=true            # Prune after successful sync
+    - RespectIgnoreDifferences=true
+    - CreateNamespace=false         # Namespace exists
+    - ApplyOutOfSyncOnly=true      # Only sync out-of-sync resources
+    - ServerSideApply=true         # Use server-side apply
+    - PruneLast=true              # Prune after successful sync
     automated:
       prune: true
       selfHeal: true

deploy/apibuilder-app/app.yaml

@@ -4,68 +4,64 @@ metadata:
   name: apibuilder-app
   namespace: argocd
   finalizers:
-    - resources-finalizer.argocd.argoproj.io
+  - resources-finalizer.argocd.argoproj.io
+  labels:
+    team: foundation
 spec:
   destination:
     namespace: apicollective
     server: 'https://kubernetes.default.svc'
   ignoreDifferences:
-    - group: networking.istio.io
-      kind: VirtualService
-      jsonPointers:
-      - /spec/http/0
-    - group: datadoghq.com
-      kind: DatadogMonitor
-      jqPathExpressions:
-      - .spec.tags
-    # Required if enable KEDA autoscaler to avoid conflicts between 
-    # ArgoCD and HPA managing the number of replicas
-    - group: "apps"
-      kind: "Deployment"
-      jsonPointers:
-      - /spec/replicas
-    - group: argoproj.io
-      kind: Rollout
-      jsonPointers:
-      - /spec/replicas
+  - group: networking.istio.io
+    kind: VirtualService
+    jsonPointers:
+    - /spec/http/0
+  - group: "apps"
+    kind: "Deployment"
+    jsonPointers:
+    - /spec/replicas
+  - group: argoproj.io
+    kind: Rollout
+    jsonPointers:
+    - /spec/replicas
     # Ignore cluster IP changes
-    - group: ""
-      kind: Service
-      jsonPointers:
-      - /spec/clusterIP
+  - group: ""
+    kind: Service
+    jsonPointers:
+    - /spec/clusterIP
     #This is a common issue with Argo Rollouts and Istio DestinationRule resources. 
     #The rollouts-pod-template-hash label is automatically managed 
     #by the Argo Rollouts controller and gets added dynamically during rollout operations
-    - group: networking.istio.io
-      kind: DestinationRule
-      jqPathExpressions:
-      - .spec.subsets[].labels["rollouts-pod-template-hash"]
+  - group: networking.istio.io
+    kind: DestinationRule
+    jqPathExpressions:
+    - .spec.subsets[].labels["rollouts-pod-template-hash"]
     ###################################
   sources:
-    - repoURL: '[email protected]:flowcommerce/generic-charts.git'
-      path: charts/flow-generic
-      targetRevision: v2.0.0
-      helm:
-        parameters:
-          - name: deployments.live.version
-            value: "0.16.59"
-        valueFiles:
-          - $values/deploy/apibuilder-app/values.yaml
-    - repoURL: '[email protected]:apicollective/apibuilder.git'
-      targetRevision: main  
-      ref: values
+  - repoURL: '[email protected]:apicollective/apibuilder.git'
+    targetRevision: main
+    ref: values
 
+  - repoURL: '[email protected]:flowcommerce/generic-charts.git'
+    path: charts/flow-generic
+    targetRevision: v2.0.0
+    helm:
+      parameters:
+      - name: deployments.live.version
+        value: "Jenkins_will_update_the_version"
+      valueFiles:
+      - $values/deploy/apibuilder-app/values.yaml
   project: production
 
   ## Keep it commenting out during the transition process to avoid auto
   ## sync applying changes automatically until transition is completed.
   syncPolicy:
     syncOptions:
-      - RespectIgnoreDifferences=true
-      - CreateNamespace=false       # Namespace exists
-      - ApplyOutOfSyncOnly=true    # Only sync out-of-sync resources
-      - ServerSideApply=true       # Use server-side apply
-      - PruneLast=true            # Prune after successful sync
+    - RespectIgnoreDifferences=true
+    - CreateNamespace=false         # Namespace exists
+    - ApplyOutOfSyncOnly=true      # Only sync out-of-sync resources
+    - ServerSideApply=true         # Use server-side apply
+    - PruneLast=true              # Prune after successful sync
     automated:
       prune: true
       selfHeal: true