diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml index f322c48..0c2e552 100644 --- a/.github/workflows/ci-dev.yml +++ b/.github/workflows/ci-dev.yml @@ -5,7 +5,7 @@ on: branches: ["dev"] env: - VERSION: v0.2.3 + VERSION: v0.2.4 REPO: vcr.vngcloud.vn/60108-annd2-ingress jobs: diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index c628b6d..c891565 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -5,7 +5,7 @@ on: branches: ["main"] env: - VERSION: v0.2.3 + VERSION: v0.2.4 REPO: vcr.vngcloud.vn/81-vks-public jobs: diff --git a/Makefile b/Makefile index 80a5fb0..aa5ebc3 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ TAR_FILE ?= rootfs.tar GOOS ?= $(shell go env GOOS) GOPROXY ?= $(shell go env GOPROXY) -VERSION ?= v0.2.3 +VERSION ?= v0.2.4 GOARCH := GOFLAGS := TAGS := diff --git a/pkg/utils/vngcloud/loadbalancer_utils.go b/pkg/utils/vngcloud/loadbalancer_utils.go index 82798a3..cc8a0f2 100644 --- a/pkg/utils/vngcloud/loadbalancer_utils.go +++ b/pkg/utils/vngcloud/loadbalancer_utils.go @@ -237,8 +237,8 @@ func CompareListenerOptions(ilis *lObjects.Listener, lisOptions *listener.Create CertificateAuthorities: lisOptions.CertificateAuthorities, // not support update these fields - Headers: ilis.Headers, // L7: if this field is nil, it will update empty ? => set it nil in L4 - ClientCertificate: nil, + Headers: ilis.Headers, // L7: if this field is nil, it will update empty ? => set it nil in L4 + ClientCertificate: ilis.ClientCertificateAuthentication, // L7: if this field is nil, it will update empty ? => set it nil in L4 } if ilis.AllowedCidrs != lisOptions.AllowedCidrs || ilis.TimeoutClient != lisOptions.TimeoutClient || diff --git a/pkg/vngcloud/vlb.go b/pkg/vngcloud/vlb.go index 3af67b1..5d49be9 100644 --- a/pkg/vngcloud/vlb.go +++ b/pkg/vngcloud/vlb.go @@ -117,6 +117,7 @@ func (c *vLB) Init() { return } + time.Sleep(60 * time.Second) go wait.Until(c.nodeSyncLoop, 60*time.Second, c.stopCh) <-c.stopCh } @@ -876,6 +877,10 @@ func (c *vLB) ensureListenerV2(lbID, lisName string, listenerOpts listener.Creat updateOpts := vngcloudutil.CompareListenerOptions(lis, &listenerOpts) if updateOpts != nil { updateOpts.Headers = nil + updateOpts.ClientCertificate = nil + updateOpts.DefaultCertificateAuthority = nil + updateOpts.CertificateAuthorities = nil + err := vngcloudutil.UpdateListener(c.vLBSC, c.getProjectID(), lbID, lis.UUID, updateOpts) if err != nil { klog.Error("error when update listener: ", err)