Skip to content

Pass defaultServiceNetwork env variable #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Pass defaultServiceNetwork env variable #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b707e3
- pass defaultServiceNetwork env variable
Nov 16, 2023
b57c6b6
pass defaultServiceNetwork env variable
Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/deploy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,10 @@ Run through them again for a second cluster to use with the extended example sho
--set=clusterVpcId= \
--set=clusterName= \
--set=awsAccountId= \
--set=defaultServiceNetwork= \ # check environment.md for more its details
# latticeEndpoint is required for the case where the VPC Lattice endpoint is being overridden
--set=latticeEndpoint= \


```
9. Create the `amazon-vpc-lattice` GatewayClass:
Expand Down
1 change: 1 addition & 0 deletions helm/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ data:
clusterVpcId: {{ .Values.clusterVpcId | quote }}
clusterName: {{ .Values.clusterName | quote }}
latticeEndpoint: {{ .Values.latticeEndpoint | quote }}
defaultServiceNetwork: {{ .Values.defaultServiceNetwork | quote }}

5 changes: 5 additions & 0 deletions helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ spec:
configMapKeyRef:
name: env-config
key: latticeEndpoint
- name: DEFAULT_SERVICE_NETWORK
valueFrom:
configMapKeyRef:
name: env-config
key: defaultServiceNetwork

terminationGracePeriodSeconds: 10
nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
Expand Down
1 change: 1 addition & 0 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ awsRegion:
awsAccountId:
clusterVpcId:
clusterName:
defaultServiceNetwork:
latticeEndpoint:
4 changes: 2 additions & 2 deletions test/suites/integration/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ var _ = SynchronizedBeforeSuite(func() {

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

Expand Down