Merge pull request #13 from redhat-gpte-devopsautomation/master

treddy08 · web-flow · commit 16a5b1d9bcd9 · 2024-10-12T08:52:06.000+10:00
update
diff --git a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.app.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/coolstore/catalog-spring-boot/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.app.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/coolstore/gateway-vertx/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.app.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/coolstore/inventory-quarkus/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.app.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/coolstore/web-nodejs/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/quinoa-wind-turbine/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/quinoa-wind-turbine/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.app.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/quinoa-wind-turbine/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/quinoa-wind-turbine/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/vote-api-go/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/vote-api-go/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.git.org }}/{{ .Values.git.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/vote-api-go/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/vote-api-go/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
diff --git a/scaffolder-templates/gitlab/vote-ui-python/manifests/helm/build/templates/cm-create-webhook.yaml b/scaffolder-templates/gitlab/vote-ui-python/manifests/helm/build/templates/cm-create-webhook.yaml
@@ -9,7 +9,7 @@ data:
         git_host: {{ .Values.git.host }}
         git_project: {{ .Values.git.org }}/{{ .Values.git.name }}
         git_token: {{ .Values.git.token }}
-        webhook_url: https://webhook-{{ .Values.app.name }}-el-{{ .Values.app.namespace }}{{ .Values.app.cluster }}
+        webhook_url: https://webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
         webhook_secret: {{ .Values.git.webhookSecret }}
       tasks:
         - name: Get gitlab projects
diff --git a/scaffolder-templates/gitlab/vote-ui-python/manifests/helm/build/templates/route.yaml b/scaffolder-templates/gitlab/vote-ui-python/manifests/helm/build/templates/route.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/part-of: Triggers
     eventlistener: {{ .Values.app.name }}-el
 spec:
+  host: webhook-{{ .Values.app.name }}{{ .Values.app.cluster }}
   to:
     kind: Service
     name: el-{{ .Values.app.name }}-el
