diff --git a/apps/prod/tekton/configs/triggers/event-listeners/event-listener-internal.yaml b/apps/prod/tekton/configs/triggers/event-listeners/event-listener-internal.yaml index 9ac2332ef..55793436e 100644 --- a/apps/prod/tekton/configs/triggers/event-listeners/event-listener-internal.yaml +++ b/apps/prod/tekton/configs/triggers/event-listeners/event-listener-internal.yaml @@ -26,31 +26,3 @@ spec: labelSelector: matchLabels: type: image-push ---- -apiVersion: triggers.tekton.dev/v1beta1 -kind: EventListener -metadata: - name: internal-debug -spec: - serviceAccountName: tekton-trigger-eventlistener - triggerGroups: - - name: harbor-image-pushed-debug - interceptors: - - name: filter on image push events on inner container repositories. - ref: - name: "cel" - params: - - name: filter - value: >- - body.type == 'PUSH_ARTIFACT' - && - body.event_data.repository.namespace in ['pingcap', 'tikv'] - && - ! body.event_data.resources[0].tag.startsWith('sha256:') - triggerSelector: - namespaceSelector: - matchNames: - - ee-cd - labelSelector: - matchLabels: - type: image-push-debug diff --git a/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml b/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml index 7413a5c26..d70ab8426 100644 --- a/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml +++ b/apps/prod/tekton/configs/triggers/triggers/_/ctl/artifact-push-on-harbor.yaml @@ -21,6 +21,8 @@ spec: 'tikv/tikv/package' ] && body.event_data.resources[0].tag.matches('^(master|main)(-[0-9a-f]{7,10})_(darwin|linux)_(amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') - name: overlays value: - key: git-url @@ -68,6 +70,8 @@ spec: 'tikv/tikv/package' ] && body.event_data.resources[0].tag.matches('^release-[0-9]+[.][0-9]+(-[0-9a-f]{7,10})_(darwin|linux)_(amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') - name: overlays value: - key: git-url diff --git a/apps/prod/tekton/configs/triggers/triggers/_/harbor/artifact-push-on-harbor.yaml b/apps/prod/tekton/configs/triggers/triggers/_/harbor/artifact-push-on-harbor.yaml index 218a3263d..e0637e42a 100644 --- a/apps/prod/tekton/configs/triggers/triggers/_/harbor/artifact-push-on-harbor.yaml +++ b/apps/prod/tekton/configs/triggers/triggers/_/harbor/artifact-push-on-harbor.yaml @@ -17,6 +17,8 @@ spec: body.event_data.repository.repo_full_name.matches('/package(s)?') && body.event_data.resources[0].tag.matches('^(master|main)_(darwin|linux)_(amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') bindings: - ref: harbor-image-push - { name: nightly, value: "true" } @@ -42,6 +44,8 @@ spec: body.event_data.repository.repo_full_name.matches('/package(s)?') && body.event_data.resources[0].tag.matches('^(release-[0-9]+[.][0-9]+)_(linux|darwin)_(amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') bindings: - ref: harbor-image-push template: @@ -66,6 +70,8 @@ spec: body.event_data.repository.repo_full_name.matches('/package(s)?') && body.event_data.resources[0].tag.matches('^v[0-9]+[.][0-9]+[.][0-9]+_(linux|darwin)_(amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') bindings: - ref: harbor-image-push template: diff --git a/apps/prod/tekton/configs/triggers/triggers/_/harbor/image-push-on-harbor.yaml b/apps/prod/tekton/configs/triggers/triggers/_/harbor/image-push-on-harbor.yaml index 3d3e3c733..b71e8c9cc 100644 --- a/apps/prod/tekton/configs/triggers/triggers/_/harbor/image-push-on-harbor.yaml +++ b/apps/prod/tekton/configs/triggers/triggers/_/harbor/image-push-on-harbor.yaml @@ -19,6 +19,8 @@ spec: ) && body.event_data.resources[0].tag.matches('[-_](amd64|arm64)$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') bindings: - ref: harbor-image-push template: @@ -46,6 +48,8 @@ spec: body.event_data.repository.repo_full_name.matches('/package(s)?') ) && body.event_data.resources[0].tag.matches('^(master|main|release-[0-9]+[.][0-9]+|v[0-9]+[.][0-9]+[.][0-9]+(-pre)?)(-[0-9a-f]+)?(-(enterprise|failpoint))?$') + && + body.event_data.resources[0].resource_url.startsWith('hub.pingcap.net/') bindings: - ref: harbor-image-push