From 1165ccc3ba8b71bd5150336b7ca82e09639aa911 Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <71768+gionn@users.noreply.github.com>
Date: Thu, 18 Jan 2024 09:32:09 +0100
Subject: [PATCH] OPSEXP-2444 Cleanup search services updatecli pipeline (#197)

---
 .github/workflows/updatecli.yaml         |  2 +-
 updatecli.d/alfresco-search-service.yaml | 54 ------------------------
 updatecli.d/default.yaml                 | 14 ------
 updatecli.d/helm-autodiscovery.yaml      | 18 ++++++++
 4 files changed, 19 insertions(+), 69 deletions(-)
 delete mode 100644 updatecli.d/alfresco-search-service.yaml
 delete mode 100644 updatecli.d/default.yaml
 create mode 100644 updatecli.d/helm-autodiscovery.yaml

diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
index 171535ad..20c4398c 100644
--- a/.github/workflows/updatecli.yaml
+++ b/.github/workflows/updatecli.yaml
@@ -44,7 +44,7 @@ jobs:
         with:
           version: ${{ env.UPDATE_CLI_VERSION }}
 
-      - run: updatecli apply --experimental
+      - run: updatecli apply
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
diff --git a/updatecli.d/alfresco-search-service.yaml b/updatecli.d/alfresco-search-service.yaml
deleted file mode 100644
index eb07f3d5..00000000
--- a/updatecli.d/alfresco-search-service.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: Alfresco Search Service pipeline
-
-sources:
-  alfresco-insight-zeppelin-subchart:
-    name: Alfresco Insight Zeppelin subchart
-    kind: yaml
-    spec:
-      file: >-
-        charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml
-      key: $.version
-  alfresco-search-service-image:
-    name: Alfresco Search Search Image
-    kind: dockerimage
-    spec:
-      image: quay.io/alfresco/search-services
-      versionfilter:
-        kind: semver
-        pattern: ">=2.0.3"
-  alfresco-insight-engine-image:
-    name: Alfresco Insight Engine Image
-    kind: dockerimage
-    spec:
-      image: quay.io/alfresco/insight-engine
-      versionfilter:
-        kind: semver
-        pattern: ">=2.0.3"
-
-targets:
-  alfresco-search-service-image:
-    name: Alfresco Search Services Image tags
-    kind: helmchart
-    sourceid: alfresco-search-service-image
-    spec:
-      name: charts/alfresco-search-service
-      file: values.yaml
-      key: $.searchServicesImage.tag
-  alfresco-insight-engine-image:
-    name: Alfresco Insight Engine Image tags
-    kind: helmchart
-    sourceid: alfresco-insight-engine-image
-    spec:
-      name: charts/alfresco-search-service
-      file: values.yaml
-      key: $.insightEngineImage.tag
-  alfresco-search-service-depcharts:
-    name: Alfresco Search Services Chart dependency (Insight Zeppelin)
-    kind: helmchart
-    sourceid: alfresco-insight-zeppelin-subchart
-    spec:
-      appversion: true
-      name: charts/alfresco-search-service
-      file: Chart.yaml
-      key: $.dependencies[0].version
diff --git a/updatecli.d/default.yaml b/updatecli.d/default.yaml
deleted file mode 100644
index 0f8c1ff5..00000000
--- a/updatecli.d/default.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: "Helm autodiscovery using git scm"
-
-autodiscovery:
-  crawlers:
-    helm:
-      # we have an alternate pipeline for image tags bumping
-      ignorecontainer: true
-      # disable automatic bump given that sometimes bump too much
-      # and we have chart testing checking against missed increments
-      versionincrement: none
-      ignore:
-        #  Search Service do not follow the usual image.repo & image.tag path
-        - path: charts/alfresco-search-service/*
diff --git a/updatecli.d/helm-autodiscovery.yaml b/updatecli.d/helm-autodiscovery.yaml
new file mode 100644
index 00000000..62dae0ce
--- /dev/null
+++ b/updatecli.d/helm-autodiscovery.yaml
@@ -0,0 +1,18 @@
+---
+name: "Helm autodiscovery for charts dependencies"
+
+autodiscovery:
+  crawlers:
+    helm:
+      # we have an alternate pipeline for image tags bumping
+      ignorecontainer: true
+      # Disable automatic chart version bump given that sometimes bump too much
+      # and we have chart testing checking against missed increments
+      versionincrement: none
+      ignore:
+        - dependencies:
+            # https://github.com/updatecli/updatecli/issues/1876
+            alfresco-insight-zeppelin: ""
+            common: ""
+            postgresql: ""
+            elasticsearch: ""