fix: nsmd gRPC health memory leakage (networkservicemesh#2229)

* fix: nsmd gRPC health memory leakage Fix the issue networkservicemesh#2228 Signed-off-by: Anatoly Loskutnikov <[email protected]> * ci: add apt-get update Signed-off-by: Anatoly Loskutnikov <[email protected]> * fix: change AWS kubernetes version to 1.18 Signed-off-by: Anatoly Loskutnikov <[email protected]> * fix: change Azure Kubernetes version to 1.18.14 Signed-off-by: Anatoly Loskutnikov <[email protected]> * add pattern for retest on sync configmap cache fail Signed-off-by: Anatoly Loskutnikov <[email protected]>
zhaohuabing · Feb 8, 2021 · 104e735 · 104e735
1 parent cb2e62e
commit 104e735
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,6 +36,7 @@ jobs:
       - skip_on_pattern
       - run:
           command: |
+            sudo apt-get update
             sudo apt-get install python-pip python3-pkg-resources
             pip install --user yamllint
       - run: yamllint -c .yamllint.yml --strict .

diff --git a/.cloudtest.yaml b/.cloudtest.yaml
@@ -27,6 +27,7 @@ retest:  # Allow to do test re-run if some kind of failures are detected, line C
     - "Error response from daemon: Get https://.*docker.io/.*: dial tcp: lookup registry"
     - "Error response from daemon: Get https://.*docker.io/.*: net/http: request canceled while waiting for connection"
     - "Failed create pod sandbox"
+    - "failed to sync configmap cache: timed out waiting for the condition"
 reporting:
   junit-report: "results/junit.xml"
 health-check:

diff --git a/pkg/probes/health/grpc_health.go b/pkg/probes/health/grpc_health.go
@@ -19,7 +19,10 @@ func NewGrpcHealth(s *grpc.Server, addr net.Addr, timeout time.Duration, opts ..
 		func() error {
 			ctx, closeFn := context.WithTimeout(context.Background(), timeout)
 			defer closeFn()
+
 			conn, err := tools.DialContext(ctx, addr, opts...)
+			defer func() { _ = conn.Close() }()
+
 			if err != nil {
 				return err
 			}

diff --git a/scripts/aws/create-kubernetes-cluster.go b/scripts/aws/create-kubernetes-cluster.go
@@ -149,7 +149,7 @@ func (ac *AWSCluster) createEksCluster(eksClient *eks.EKS, clusterName, eksRoleA
 			EndpointPrivateAccess: aws.Bool(true),
 			EndpointPublicAccess:  aws.Bool(true),
 		},
-		Version: aws.String("1.14"),
+		Version: aws.String("1.18"),
 	})
 	ac.checkError(err)
 

diff --git a/scripts/azure/create-aks-cluster.sh b/scripts/azure/create-aks-cluster.sh
@@ -44,13 +44,13 @@ else
                 \"location\": \"centralus\",
                 \"properties\":
                 {
-                    \"kubernetesVersion\": \"1.17.9\",
+                    \"kubernetesVersion\": \"1.18.14\",
                     \"dnsPrefix\": \"${AZURE_CLUSTER_NAME::10}-${AZURE_RESOURCE_GROUP}\",
                     \"agentPoolProfiles\":
                     [{
                         \"name\": \"nodepool1\",
                         \"count\": 2,
-                        \"orchestratorVersion\": \"1.17.9\",
+                        \"orchestratorVersion\": \"1.18.14\",
                         \"vmSize\": \"Standard_B2s\",
                         \"osType\": \"Linux\",
                         \"enableNodePublicIP\": true,