diff --git a/Makefile b/Makefile index 47cbd83..82058a2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= v0.6.3 +VERSION ?= v0.6.4 REGISTRY ?= tmaxcloudck # Image URL to use all building/pushing image targets diff --git a/config/release.yaml b/config/release.yaml index d5f4446..255931b 100644 --- a/config/release.yaml +++ b/config/release.yaml @@ -84,7 +84,7 @@ spec: containers: - command: - /controller - image: docker.io/tmaxcloudck/cicd-operator:v0.6.3 + image: docker.io/tmaxcloudck/cicd-operator:v0.6.4 imagePullPolicy: Always name: manager env: @@ -171,7 +171,7 @@ spec: containers: - command: - /blocker - image: docker.io/tmaxcloudck/cicd-blocker:v0.6.3 + image: docker.io/tmaxcloudck/cicd-blocker:v0.6.4 imagePullPolicy: Always name: manager resources: @@ -231,7 +231,7 @@ spec: containers: - command: - /webhook - image: docker.io/tmaxcloudck/cicd-webhook:v0.6.3 + image: docker.io/tmaxcloudck/cicd-webhook:v0.6.4 imagePullPolicy: Always name: manager resources: @@ -291,7 +291,7 @@ spec: containers: - command: - /apiserver - image: docker.io/tmaxcloudck/cicd-api-server:v0.6.3 + image: docker.io/tmaxcloudck/cicd-api-server:v0.6.4 imagePullPolicy: Always name: manager resources: diff --git a/pkg/dispatcher/dispatcher.go b/pkg/dispatcher/dispatcher.go index 2df024a..29752fd 100644 --- a/pkg/dispatcher/dispatcher.go +++ b/pkg/dispatcher/dispatcher.go @@ -19,6 +19,7 @@ package dispatcher import ( "context" "fmt" + "regexp" "strings" cicdv1 "github.com/tmax-cloud/cicd-operator/api/v1" @@ -362,5 +363,13 @@ func applyNotification(jobs []cicdv1.Job, noti *cicdv1.Notification) []cicdv1.Jo } func matchString(incoming, target string) bool { - return incoming == target + if strings.ContainsAny(target, "*^?") { + re, err := regexp.Compile(target) + if err != nil { + return false + } + return re.MatchString(incoming) + } else { + return incoming == target + } }