Skip to content
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

upgrade(hyperledger-indy): ambassador to ambassador edge stack #2410

Merged
merged 2 commits into from
Nov 6, 2023
Merged

upgrade(hyperledger-indy): ambassador to ambassador edge stack #2410

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
2ba9eed
This PR will provide the support of using latest ambassador edge-stack
saikumarbommakanti Nov 1, 2023
669f3fd
Merge branch 'develop' into indy-2359
suvajit-sarkar Nov 6, 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
56 changes: 50 additions & 6 deletions platforms/hyperledger-indy/charts/indy-node/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ kind: Service
metadata:
name: "{{ $.Values.metadata.name }}"
namespace: "{{ $.Values.metadata.namespace }}"
{{ if $.Values.ambassador.annotations }}
annotations:
getambassador.io/config: |
{{ $.Values.ambassador.annotations | nindent 6 }}
{{ end }}
spec:
type: {{ $.Values.service.type }}
ports:
Expand All @@ -30,4 +25,53 @@ spec:
nodePort: {{ $.Values.service.ports.clientTargetPort }}
{{ end }}
selector:
app: "{{ $.Values.metadata.name }}"
app: "{{ $.Values.metadata.name }}"

{{- if eq $.Values.proxy.provider "ambassador" }}
---
apiVersion: getambassador.io/v3alpha1
kind: Listener
metadata:
name: "{{ .Values.node.name }}-node-listener"
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.node.ambassadorPort }}
protocol: TCP
securityModel: XFP
hostBinding:
namespace:
from: SELF
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: "{{ .Values.node.name }}-node-mapping"
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.node.ambassadorPort }}
service: "{{ .Values.node.name }}.{{ .Values.metadata.namespace }}:{{ .Values.node.targetPort }}"

---
apiVersion: getambassador.io/v3alpha1
kind: Listener
metadata:
name: "{{ .Values.node.name }}-client-listener"
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.client.ambassadorPort }}
protocol: TCP
securityModel: XFP
hostBinding:
namespace:
from: SELF
---
apiVersion: getambassador.io/v3alpha1
kind: TCPMapping
metadata:
name: "{{ .Values.node.name }}-client-mapping"
namespace: {{ .Values.metadata.namespace }}
spec:
port: {{ .Values.client.ambassadorPort }}
service: "{{ .Values.client.name }}.{{ .Values.metadata.namespace }}:{{ .Values.client.targetPort }}"
{{- end }}

19 changes: 4 additions & 15 deletions platforms/hyperledger-indy/configuration/roles/create/helm_component/node/templates/node.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ spec:
metadata:
name: {{ component_name }}
namespace: {{ component_ns }}
proxy:
provider: {{ network.env.proxy }}
network:
name: {{ network.name }}
organization:
Expand Down Expand Up @@ -80,21 +82,7 @@ spec:
# Directory to store node info.
NODE_INFO_DIR = '/var/lib/indy/data'
ambassador:
{% if organizationItem.cloud_provider != 'minikube' and network.env.proxy == 'ambassador' %}
annotations: |-
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ component_name|e }}-node-mapping
port: {{ stewardItem.node.ambassador }}
service: {{ component_name|e }}.{{ component_ns }}:{{ stewardItem.node.targetPort }}
---
apiVersion: ambassador/v2
kind: TCPMapping
name: {{ component_name|e }}-client-mapping
port: {{ stewardItem.client.ambassador }}
service: {{ component_name|e }}.{{ component_ns }}:{{ stewardItem.client.targetPort }}
{% else %}
{% if organizationItem.cloud_provider == 'minikube' and network.env.proxy != 'ambassador' %}
disabled: true
{% endif %}
vault:
Expand All @@ -111,3 +99,4 @@ spec:
keys:
storagesize: 3Gi
storageClassName: {{ sc_name }}

26 changes: 0 additions & 26 deletions platforms/shared/charts/ambassador/Chart.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading