From be9fcb653bf97669b16042d4d6829310ccb88af5 Mon Sep 17 00:00:00 2001 From: treddy08 Date: Sat, 12 Oct 2024 08:48:37 +1000 Subject: [PATCH] update --- .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../gateway-vertx/manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../inventory-quarkus/manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../web-nodejs/manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../vote-api-go/manifests/helm/build/templates/route.yaml | 1 + .../manifests/helm/build/templates/cm-create-webhook.yaml | 2 +- .../vote-ui-python/manifests/helm/build/templates/route.yaml | 1 + 14 files changed, 14 insertions(+), 7 deletions(-) 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 index 82eac03..ccebc62 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index 82eac03..ccebc62 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index 82eac03..ccebc62 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index 82eac03..ccebc62 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index 82eac03..ccebc62 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index f60ccd4..7b9e6b3 100644 --- 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 index 787563b..8666ffb 100644 --- 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 index f60ccd4..7b9e6b3 100644 --- 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 index 787563b..8666ffb 100644 --- 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