Skip to content

Commit

Permalink
🚀 [release] v0.2.2 + enable proxy protocol value *
Browse files Browse the repository at this point in the history
  • Loading branch information
anngdinh committed Jun 18, 2024
1 parent f5aee64 commit 487b3cc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: ["dev"]

env:
VERSION: v0.2.1
VERSION: v0.2.2
REPO: vcr.vngcloud.vn/60108-annd2-ingress

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: ["main"]

env:
VERSION: v0.2.1
VERSION: v0.2.2
REPO: vcr.vngcloud.vn/81-vks-public

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ TAR_FILE ?= rootfs.tar

GOOS ?= $(shell go env GOOS)
GOPROXY ?= $(shell go env GOPROXY)
VERSION ?= v0.2.1
VERSION ?= v0.2.2
GOARCH :=
GOFLAGS :=
TAGS :=
Expand Down
4 changes: 2 additions & 2 deletions pkg/vngcloud/annotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ func (s *ServiceConfig) CreatePoolOptions(pPort apiv1.ServicePort) *pool.CreateO
Members: []*pool.Member{},
}
for _, name := range s.EnableProxyProtocol {
if name == pPort.Name && pPort.Protocol == apiv1.ProtocolTCP {
if (name == "*" || name == pPort.Name) && pPort.Protocol == apiv1.ProtocolTCP {
opt.PoolProtocol = pool.CreateOptsProtocolOptProxy
break
}
Expand All @@ -328,7 +328,7 @@ func (s *ServiceConfig) CreatePoolOptions(pPort apiv1.ServicePort) *pool.CreateO

func (s *ServiceConfig) MappingProtocol(pPort apiv1.ServicePort) string {
for _, name := range s.EnableProxyProtocol {
if name == pPort.Name && pPort.Protocol == apiv1.ProtocolTCP {
if (name == "*" || name == pPort.Name) && pPort.Protocol == apiv1.ProtocolTCP {
return string(pool.CreateOptsProtocolOptProxy)
}
}
Expand Down

0 comments on commit 487b3cc

Please sign in to comment.