Skip to content

Commit a50ab17

Browse files
zijun726911Zijun Wang
andauthored
Pass defaultServiceNetwork env variable (#512)
* - pass defaultServiceNetwork env variable - fix e2e test issue * pass defaultServiceNetwork env variable --------- Co-authored-by: Zijun Wang <zijunw@amazon.com>
1 parent de47ec1 commit a50ab17

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

docs/deploy.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ Run through them again for a second cluster to use with the extended example sho
9494
--set=clusterVpcId= \
9595
--set=clusterName= \
9696
--set=awsAccountId= \
97+
--set=defaultServiceNetwork= \ # check environment.md for more its details
9798
# latticeEndpoint is required for the case where the VPC Lattice endpoint is being overridden
9899
--set=latticeEndpoint= \
100+
99101
100102
```
101103
9. Create the `amazon-vpc-lattice` GatewayClass:

helm/templates/configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ data:
88
clusterVpcId: {{ .Values.clusterVpcId | quote }}
99
clusterName: {{ .Values.clusterName | quote }}
1010
latticeEndpoint: {{ .Values.latticeEndpoint | quote }}
11+
defaultServiceNetwork: {{ .Values.defaultServiceNetwork | quote }}
1112

helm/templates/deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ spec:
9292
configMapKeyRef:
9393
name: env-config
9494
key: latticeEndpoint
95+
- name: DEFAULT_SERVICE_NETWORK
96+
valueFrom:
97+
configMapKeyRef:
98+
name: env-config
99+
key: defaultServiceNetwork
95100

96101
terminationGracePeriodSeconds: 10
97102
nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}

helm/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,5 @@ awsRegion:
7575
awsAccountId:
7676
clusterVpcId:
7777
clusterName:
78+
defaultServiceNetwork:
7879
latticeEndpoint:

test/suites/integration/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ var _ = SynchronizedBeforeSuite(func() {
4949

5050
testFramework.Log.Infof("Expecting VPC %s and service network %s association", vpcId, *testServiceNetwork.Id)
5151
Eventually(func(g Gomega) {
52-
associated, _, _ := testFramework.IsVpcAssociatedWithServiceNetwork(ctx, vpcId, testServiceNetwork)
52+
associated, snva, _ := testFramework.IsVpcAssociatedWithServiceNetwork(ctx, vpcId, testServiceNetwork)
5353
g.Expect(associated).To(BeTrue())
54-
managed, _ := testFramework.Cloud.IsArnManaged(ctx, *testServiceNetwork.Arn)
54+
managed, _ := testFramework.Cloud.IsArnManaged(ctx, *snva.Arn)
5555
g.Expect(managed).To(BeTrue())
5656
}).Should(Succeed())
5757

0 commit comments

Comments
 (0)