From 9ccdc64d517521bf9fa1dd9ff6c5f911c406ff02 Mon Sep 17 00:00:00 2001 From: Miguel Arias Date: Wed, 10 Dec 2025 14:12:42 +0000 Subject: [PATCH 1/3] FDN-4233: revert sources order for argo cd UI visibility --- deploy/apibuilder-api/app.yaml | 82 ++++++++++++++++------------------ deploy/apibuilder-app/app.yaml | 82 ++++++++++++++++------------------ 2 files changed, 76 insertions(+), 88 deletions(-) diff --git a/deploy/apibuilder-api/app.yaml b/deploy/apibuilder-api/app.yaml index 9f531021a..a67fe9889 100644 --- a/deploy/apibuilder-api/app.yaml +++ b/deploy/apibuilder-api/app.yaml @@ -4,68 +4,62 @@ metadata: name: apibuilder-api namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io 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: 'git@github.com: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: 'git@github.com:apicollective/apibuilder.git' - targetRevision: main - ref: values + - repoURL: 'git@github.com:apicollective/apibuilder.git' + targetRevision: main + ref: values + - repoURL: 'git@github.com: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 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 diff --git a/deploy/apibuilder-app/app.yaml b/deploy/apibuilder-app/app.yaml index 8f22f8a44..4329dcabc 100644 --- a/deploy/apibuilder-app/app.yaml +++ b/deploy/apibuilder-app/app.yaml @@ -4,68 +4,62 @@ metadata: name: apibuilder-app namespace: argocd finalizers: - - resources-finalizer.argocd.argoproj.io + - resources-finalizer.argocd.argoproj.io 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: 'git@github.com: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: 'git@github.com:apicollective/apibuilder.git' - targetRevision: main - ref: values + - repoURL: 'git@github.com:apicollective/apibuilder.git' + targetRevision: main + ref: values + - repoURL: 'git@github.com: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 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 From dadb09e7e4d12c391e049d1c20937ecfe6731876 Mon Sep 17 00:00:00 2001 From: Miguel Arias Date: Wed, 10 Dec 2025 14:13:40 +0000 Subject: [PATCH 2/3] FDN-4233: small fixes --- Jenkinsfile | 5 +---- deploy/apibuilder-api/app.yaml | 2 +- deploy/apibuilder-app/app.yaml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 48e5d67e0..dfc25043a 100755 --- a/Jenkinsfile +++ b/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) } diff --git a/deploy/apibuilder-api/app.yaml b/deploy/apibuilder-api/app.yaml index a67fe9889..616b27a0a 100644 --- a/deploy/apibuilder-api/app.yaml +++ b/deploy/apibuilder-api/app.yaml @@ -46,7 +46,7 @@ spec: helm: parameters: - name: deployments.live.version - value: "0.16.59" + value: "Jenkins_will_update_the_version" valueFiles: - $values/deploy/apibuilder-api/values.yaml project: production diff --git a/deploy/apibuilder-app/app.yaml b/deploy/apibuilder-app/app.yaml index 4329dcabc..642cb75f6 100644 --- a/deploy/apibuilder-app/app.yaml +++ b/deploy/apibuilder-app/app.yaml @@ -46,7 +46,7 @@ spec: helm: parameters: - name: deployments.live.version - value: "0.16.59" + value: "Jenkins_will_update_the_version" valueFiles: - $values/deploy/apibuilder-app/values.yaml project: production From 02938ccbe36cb3cd697db4d84f68da755747866a Mon Sep 17 00:00:00 2001 From: Miguel Arias Date: Wed, 10 Dec 2025 15:34:07 +0000 Subject: [PATCH 3/3] FDN-4233: small fixes --- deploy/apibuilder-api/app.yaml | 2 ++ deploy/apibuilder-app/app.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deploy/apibuilder-api/app.yaml b/deploy/apibuilder-api/app.yaml index 616b27a0a..3f79f8635 100644 --- a/deploy/apibuilder-api/app.yaml +++ b/deploy/apibuilder-api/app.yaml @@ -5,6 +5,8 @@ metadata: namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io + labels: + team: foundation spec: destination: namespace: apicollective diff --git a/deploy/apibuilder-app/app.yaml b/deploy/apibuilder-app/app.yaml index 642cb75f6..1805f4f6d 100644 --- a/deploy/apibuilder-app/app.yaml +++ b/deploy/apibuilder-app/app.yaml @@ -5,6 +5,8 @@ metadata: namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io + labels: + team: foundation spec: destination: namespace: apicollective