Preserve grpc port value from crd (#711)

* Release v1.12.1 * Preserve grpc match port value for crd value conversion --------- Co-authored-by: Bennett Sala <salabenn@amazon.com>
aws · Jun 27, 2023 · 472069b · 472069b
1 parent bf319eb
commit 472069b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/config/helm/appmesh-controller/Chart.yaml b/config/helm/appmesh-controller/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: appmesh-controller
 description: App Mesh controller Helm chart for Kubernetes
-version: 1.12.0
-appVersion: 1.12.0
+version: 1.12.1
+appVersion: 1.12.1
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

diff --git a/config/helm/appmesh-controller/ci/values.yaml b/config/helm/appmesh-controller/ci/values.yaml
@@ -5,5 +5,5 @@ accountId: 123456789
 region: us-west-2
 image:
   repository: public.ecr.aws/appmesh/appmesh-controller
-  tag: v1.12.0
+  tag: v1.12.1
   pullPolicy: IfNotPresent
diff --git a/config/helm/appmesh-controller/test.yaml b/config/helm/appmesh-controller/test.yaml
@@ -12,7 +12,7 @@ useAwsFIPSEndpoint: false
 
 image:
   repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
-  tag: v1.12.0
+  tag: v1.12.1
   pullPolicy: IfNotPresent
 
 sidecar:

diff --git a/config/helm/appmesh-controller/values.yaml b/config/helm/appmesh-controller/values.yaml
@@ -13,7 +13,7 @@ useAwsFIPSEndpoint: false
 
 image:
   repository: 840364872350.dkr.ecr.us-west-2.amazonaws.com/amazon/appmesh-controller
-  tag: v1.12.0
+  tag: v1.12.1
   pullPolicy: IfNotPresent
 
 sidecar:

diff --git a/pkg/conversions/virtualrouter_types_conversion.go b/pkg/conversions/virtualrouter_types_conversion.go
@@ -333,8 +333,8 @@ func Convert_CRD_GRPCRouteMatch_To_SDK_GrpcRouteMatch(crdObj *appmesh.GRPCRouteM
 	sdkObj.Metadata = sdkMetadataList
 	sdkObj.MethodName = crdObj.MethodName
 	sdkObj.ServiceName = crdObj.ServiceName
+	sdkObj.Port = crdObj.Port
 	return nil
-
 }
 
 func Convert_CRD_GRPCRouteAction_To_SDK_GrpcRouteAction(crdObj *appmesh.GRPCRouteAction,

diff --git a/pkg/conversions/virtualrouter_types_conversion_test.go b/pkg/conversions/virtualrouter_types_conversion_test.go
@@ -1453,8 +1453,8 @@ func TestConvert_CRD_GRPCRouteMatch_To_SDK_GrpcRouteMatch(t *testing.T) {
 					},
 					MethodName:  aws.String("stream"),
 					ServiceName: aws.String("foo.foodomain.local"),
+					Port:        aws.Int64(9090),
 				},
-
 				sdkObj: &appmeshsdk.GrpcRouteMatch{},
 				scope:  nil,
 			},
@@ -1491,6 +1491,7 @@ func TestConvert_CRD_GRPCRouteMatch_To_SDK_GrpcRouteMatch(t *testing.T) {
 				},
 				MethodName:  aws.String("stream"),
 				ServiceName: aws.String("foo.foodomain.local"),
+				Port:        aws.Int64(9090),
 			},
 		},
 		{